Merge pull request #937 from Paciente8159/fix-cnc-store-restore-bug

Paciente8159 · web-flow · commit 8cf6b4e07ac3 · 2026-03-20T11:57:47.000Z
fix cnc motion store and restore build error
diff --git a/uCNC/src/cnc.c b/uCNC/src/cnc.c
@@ -314,8 +314,10 @@ void cnc_store_motion(void)
 		cnc_clear_exec_state(EXEC_HOLD);
 	}
 
+#ifndef ENABLE_ITP_FEED_TASK
 	cnc_lock_itp = 0;
 #endif
+#endif
 }
 
 void cnc_restore_motion(void)
@@ -347,8 +349,10 @@ void cnc_restore_motion(void)
 	{
 		cnc_clear_exec_state(EXEC_HOLD);
 	}
+#ifndef ENABLE_ITP_FEED_TASK
 	cnc_lock_itp = 0;
 #endif
+#endif
 }
 
 // this function is executed every millisecond

Original file line number	Diff line number	Diff line change
`@@ -314,8 +314,10 @@ void cnc_store_motion(void)`
`314`	`314`	`cnc_clear_exec_state(EXEC_HOLD);`
`315`	`315`	`}`
`316`	`316`
	`317`	`+#ifndef ENABLE_ITP_FEED_TASK`
`317`	`318`	`cnc_lock_itp = 0;`
`318`	`319`	`#endif`
	`320`	`+#endif`
`319`	`321`	`}`
`320`	`322`
`321`	`323`	`void cnc_restore_motion(void)`
`@@ -347,8 +349,10 @@ void cnc_restore_motion(void)`
`347`	`349`	`{`
`348`	`350`	`cnc_clear_exec_state(EXEC_HOLD);`
`349`	`351`	`}`
	`352`	`+#ifndef ENABLE_ITP_FEED_TASK`
`350`	`353`	`cnc_lock_itp = 0;`
`351`	`354`	`#endif`
	`355`	`+#endif`
`352`	`356`	`}`
`353`	`357`
`354`	`358`	`// this function is executed every millisecond`