Improved handling of G43 some more - can now be used in the same block as M6 when the internal workflow for tool change is enabled or M6 is ignored.

2026-08-17 16:41:45 +08:00 · 2026-02-27 09:33:05 +01:00
parent aa3a80f47f
commit 9ad064bebf
5 changed files with 76 additions and 70 deletions
@@ -636,9 +636,7 @@ typedef struct {
 #endif
    uint32_t line_number;           //!< Last line number sent
    tool_id_t tool_pending;         //!< Tool to be selected on next M6
-#if NGC_EXPRESSIONS_ENABLE
-    tool_id_t g43_pending;          //!< Tool offset to be selected on next M6, for macro ATC
-#endif
+    tool_id_t g43_pending;          //!< Tool offset from tool in tool table to be applied on M6 completed, set when G43 is in block with M6
    bool file_run;                  //!< Tracks % command
    bool file_stream;               //!< Tracks streaming from file
    bool is_laser_ppi_mode;