Merge pull request #2742 from mozmck/2.9-g64fix

Fix G64 tolerance getting reset on E-stop
LinuxCNC · Dec 26, 2023 · a94f732 · a94f732
2 parents 30661cf + f01fa81
commit a94f732
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/emc/tp/tp.c b/src/emc/tp/tp.c
@@ -464,8 +464,6 @@ int tpClear(TP_STRUCT * const tp)
     struct state_tag_t tag = {{0}};
     tp->execTag = tag;
     tp->motionType = 0;
-    tp->termCond = TC_TERM_COND_PARABOLIC;
-    tp->tolerance = 0.0;
     tp->done = 1;
     tp->depth = tp->activeDepth = 0;
     tp->aborting = 0;
@@ -515,6 +513,8 @@ int tpInit(TP_STRUCT * const tp)
     tp->spindle.waiting_for_atspeed = MOTION_INVALID_ID;
 
     tp->reverse_run = TC_DIR_FORWARD;
+    tp->termCond = TC_TERM_COND_PARABOLIC;
+    tp->tolerance = 0.0;
 
     ZERO_EMC_POSE(tp->currentPos);