From cb1f05dd8b3b9a9561dcf697d06b95c05d45fc8b Mon Sep 17 00:00:00 2001 From: Joseph Coffland Date: Wed, 11 Nov 2020 16:23:46 -0800 Subject: [PATCH] Override M30 as well as M2 with program-end override. --- CHANGELOG.md | 1 + src/py/bbctrl/Planner.py | 4 +++- src/resources/config-template.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) 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" } }, -- 2.27.0