From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Thu, 12 Nov 2020 00:23:46 +0000 (-0800)
Subject: Override M30 as well as M2 with program-end override.
X-Git-Url: https://git.buildbotics.com/?a=commitdiff_plain;h=cb1f05dd8b3b9a9561dcf697d06b95c05d45fc8b;p=bbctrl-firmware

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 405a65c..69f2678 100644
--- 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 a6b441a..1dbb74d 100644
--- 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 72e553a..c4eaa0d 100644
--- 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"
     }
   },