Merge pull request #1333 from bdring/dymk/dollar-command-flow-control

Flow control: skip dollar commands if parser is skipping blocks
bdring · Sep 26, 2024 · 83787c3 · 83787c3
2 parents 6d51b89 + 6abc914
commit 83787c3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/FluidNC/src/ProcessSettings.cpp b/FluidNC/src/ProcessSettings.cpp
@@ -1033,6 +1033,9 @@ Error execute_line(char* line, Channel& channel, AuthenticationLevel auth_level)
     }
     // User '$' or WebUI '[ESPxxx]' command
     if (line[0] == '$' || line[0] == '[') {
+        if (gc_state.skip_blocks) {
+            return Error::Ok;
+        }
         return settings_execute_line(line, channel, auth_level);
     }
     // Everything else is gcode. Block if in alarm or jog mode.

diff --git a/fixture_tests/fixtures/flow_control_alarm.nc b/fixture_tests/fixtures/flow_control_alarm.nc
@@ -0,0 +1,12 @@
+-> $X
+<~ [MSG:INFO: Caution: Unlocked]
+<- ok
+-> o100 if [1 NE 1]
+-> $Alarm/Send = 1
+-> o100 else
+-> (print, success)
+<- ok
+-> o100 endif
+<- ok
+<- ok
+<- [MSG:INFO: PRINT, success]