Override M30 as well as M2 with program-end override.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 405a65cf7cc830bfc3f2bcbd87da9a647a067cd6..69f2678c77f90cf1da6426eda6a07686424974d1 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ Buildbotics CNC Controller Firmware Changelog
  - Fix web disconnect problem when downloading a bug report.
  - Fix for jogging on touch screens.
  - Allow disabling the internal WiFi so a USB dongle can be used.
+ - Override M30 as well as M2 with ``program-end`` override.
 
 ## v0.4.14
  - Handle file uploads with '#' or '?' in the name.

diff --git a/src/py/bbctrl/Planner.py b/src/py/bbctrl/Planner.py
index a6b441ab1b8cc825d4f868a5a932a3035fbb64a3..1dbb74da2cb68f3f1261ae563f7d1891608f04fb 100644 (file)
--- a/src/py/bbctrl/Planner.py
+++ b/src/py/bbctrl/Planner.py
@@ -118,7 +118,9 @@ class Planner():
         if tool_change: overrides['M6'] = tool_change
 
         program_end = config.get('program-end')
-        if program_end: overrides['M2'] = program_end
+        if program_end:
+            overrides['M2'] = program_end
+            overrides['M30'] = program_end
 
         if overrides: cfg['overrides'] = overrides
 

diff --git a/src/resources/config-template.json b/src/resources/config-template.json
index 72e553a74d06e234599ebc42c2cfbf4e2844f6a7..c4eaa0df576fb9b71733a24fae10db8dd2826cba 100644 (file)
--- a/src/resources/config-template.json
+++ b/src/resources/config-template.json
@@ -473,7 +473,7 @@
     },
     "program-end": {
       "type": "text",
-      "default": "(Runs on M2, program end)\nM2"
+      "default": "(Runs on M2 or M30, program end)\nM2"
     }
   },