[Emc-commit] master: Move task delayLeft value to correct place

[Michael G. <gi...@gi...>]

Move task delayLeft value to correct place

Signed-off-by: Michael Geszkiewicz <mi...@wp...>


http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=f4f0ed8

---
 src/emc/nml_intf/emc_nml.hh                   |    2 +-
 src/emc/nml_intf/emcops.cc                    |    2 +-
 src/emc/task/emctaskmain.cc                   |   10 +++++-----
 src/emc/usr_intf/axis/extensions/emcmodule.cc |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/emc/nml_intf/emc_nml.hh b/src/emc/nml_intf/emc_nml.hh
index 2b12868..c90830a 100644
--- a/src/emc/nml_intf/emc_nml.hh
+++ b/src/emc/nml_intf/emc_nml.hh
@@ -993,7 +993,6 @@ class EMC_TRAJ_STAT:public EMC_TRAJ_STAT_MSG {
     int spindle_override_enabled;
     int adaptive_feed_enabled;
     int feed_hold_enabled;
-    double delayLeft;           // delay time left of G4, M66..
 };
 
 // emc_MOTION is aggregate of all EMC motion-related status classes
@@ -1400,6 +1399,7 @@ class EMC_TASK_STAT:public EMC_TASK_STAT_MSG {
     int interpreter_errcode;	// return value from rs274ngc function 
     // (only useful for new interpreter.)
     int task_paused;		// non-zero means task is paused
+    double delayLeft;           // delay time left of G4, M66..
 };
 
 // declarations for EMC_TOOL classes
diff --git a/src/emc/nml_intf/emcops.cc b/src/emc/nml_intf/emcops.cc
index c8ea52a..beb3912 100644
--- a/src/emc/nml_intf/emcops.cc
+++ b/src/emc/nml_intf/emcops.cc
@@ -86,7 +86,6 @@ EMC_TRAJ_STAT_MSG(EMC_TRAJ_STAT_TYPE, sizeof(EMC_TRAJ_STAT))
     spindle_override_enabled = 0;
     adaptive_feed_enabled = 0;
     feed_hold_enabled = 0;
-    delayLeft = 0.0;
 }
 
 EMC_MOTION_STAT::EMC_MOTION_STAT():
@@ -137,6 +136,7 @@ EMC_TASK_STAT_MSG(EMC_TASK_STAT_TYPE, sizeof(EMC_TASK_STAT))
     programUnits = CANON_UNITS_MM;
     interpreter_errcode = 0;
     task_paused = 0;
+    delayLeft = 0.0;
 }
 
 EMC_TOOL_STAT::EMC_TOOL_STAT():
diff --git a/src/emc/task/emctaskmain.cc b/src/emc/task/emctaskmain.cc
index 72b8aba..5f62b4d 100644
--- a/src/emc/task/emctaskmain.cc
+++ b/src/emc/task/emctaskmain.cc
@@ -2361,10 +2361,10 @@ static int emcTaskExecute(void)
     case EMC_TASK_EXEC_WAITING_FOR_DELAY:
 	STEPPING_CHECK();
 	// check if delay has passed
-	emcStatus->motion.traj.delayLeft = taskExecDelayTimeout - etime();
+	emcStatus->task.delayLeft = taskExecDelayTimeout - etime();
 	if (etime() >= taskExecDelayTimeout) {
 	    emcStatus->task.execState = EMC_TASK_EXEC_DONE;
-	    emcStatus->motion.traj.delayLeft = 0;
+	    emcStatus->task.delayLeft = 0;
 	    if (emcStatus->task.input_timeout != 0)
 		emcStatus->task.input_timeout = 1; // timeout occured
 	    emcTaskEager = 1;
@@ -2378,7 +2378,7 @@ static int emcTaskExecute(void)
 			emcStatus->task.input_timeout = 0; // clear timeout flag
 			emcAuxInputWaitIndex = -1;
 			emcStatus->task.execState = EMC_TASK_EXEC_DONE;
-			emcStatus->motion.traj.delayLeft = 0;
+			emcStatus->task.delayLeft = 0;
 		    }
 		    break;
 
@@ -2393,7 +2393,7 @@ static int emcTaskExecute(void)
 			emcStatus->task.input_timeout = 0; // clear timeout flag
 			emcAuxInputWaitIndex = -1;
 			emcStatus->task.execState = EMC_TASK_EXEC_DONE;
-			emcStatus->motion.traj.delayLeft = 0;
+			emcStatus->task.delayLeft = 0;
 		    }
 		    break;
 
@@ -2407,7 +2407,7 @@ static int emcTaskExecute(void)
 		    emcStatus->task.input_timeout = 0; // clear timeout flag
 		    emcAuxInputWaitIndex = -1;
 		    emcStatus->task.execState = EMC_TASK_EXEC_DONE;
-		    emcStatus->motion.traj.delayLeft = 0;
+		    emcStatus->task.delayLeft = 0;
 		    break;
 		
 		default:
diff --git a/src/emc/usr_intf/axis/extensions/emcmodule.cc b/src/emc/usr_intf/axis/extensions/emcmodule.cc
index 0597610..8ef7e11 100644
--- a/src/emc/usr_intf/axis/extensions/emcmodule.cc
+++ b/src/emc/usr_intf/axis/extensions/emcmodule.cc
@@ -313,6 +313,7 @@ static PyMemberDef Stat_members[] = {
     {"tlo_is_along_w", T_BOOL, O(task.tloIsAlongW), READONLY},
     {"input_timeout", T_BOOL, O(task.input_timeout), READONLY},
     {"rotation_xy", T_DOUBLE, O(task.rotation_xy), READONLY},
+    {"delay_left", T_DOUBLE, O(task.delayLeft), READONLY},
 
 // motion
 //   EMC_TRAJ_STAT traj
@@ -343,7 +344,6 @@ static PyMemberDef Stat_members[] = {
     {"motion_type", T_INT, O(motion.traj.motion_type), READONLY},
     {"distance_to_go", T_DOUBLE, O(motion.traj.distance_to_go), READONLY},
     {"current_vel", T_DOUBLE, O(motion.traj.current_vel), READONLY},
-    {"delay_left", T_DOUBLE, O(motion.traj.delayLeft), READONLY},
     {"feed_override_enabled", T_INT, O(motion.traj.feed_override_enabled), READONLY},
     {"spindle_override_enabled", T_INT, O(motion.traj.spindle_override_enabled), READONLY},
     {"adaptive_feed_enabled", T_INT, O(motion.traj.adaptive_feed_enabled), READONLY},