merge work in progress

motor.h

@@ -40,6 +40,9 @@ typedef struct __Motor {
   int stopReported;
   int errorCount;
   int running;
+  int moving;
+  double last_report_time;
+  ObjectFunc pActionRoutine;
   ObPar *ParArray;
   void *pPrivate;
   void (*KillPrivate) (void *);
@@ -78,4 +81,6 @@ int MotorAction(SConnection * pCon, SicsInterp * pSics, void *pData,
                 int argc, char *argv[]);
 pMotor FindMotor(SicsInterp * pSics, char *name);
 
+/* Made available to oscillate.c to generate MOTEND event. Ferdi */
+void finishDriving(pMotor self, SConnection *pCon);
 #endif