From 09b5f6e0d5f0b60efad7513a959c93ebdc4c375c Mon Sep 17 00:00:00 2001 From: zz912 <96618597+zz912@users.noreply.github.com> Date: Thu, 6 Jul 2023 17:33:15 +0200 Subject: [PATCH] Gmoccapy - new HAL pin disable_automatic_G43 Make a new HAL pin to disable automatic run command "G43" after toolchange. --- src/emc/usr_intf/gmoccapy/gmoccapy.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py index 77206acb871..a121046f7b9 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.py +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py @@ -3537,11 +3537,14 @@ def _update_toolinfo(self, tool): self.on_hal_status_interp_idle(None) return + # automatic run command "G43" if "G43" in self.active_gcodes and self.stat.task_mode != linuxcnc.MODE_AUTO: - self.command.mode(linuxcnc.MODE_MDI) - self.command.wait_complete() - self.command.mdi("G43") - self.command.wait_complete() + if not hal.get_value("gmoccapy.disable_automatic_G43"): + self.command.mode(linuxcnc.MODE_MDI) + self.command.wait_complete() + self.command.mdi("G43") + self.command.wait_complete() + LOG.debug("automatic run command G43 was executed ") def _set_enable_tooltips(self, value): LOG.debug("_set_enable_tooltips = {0}".format(value)) @@ -5686,6 +5689,10 @@ def _make_hal_pins(self): hal_glib.GPin(pin).connect('value_changed', self.on_tool_change) self.halcomp.newpin('toolchange-confirm', hal.HAL_BIT, hal.HAL_IN) + # make a pin to disable automatic run command "G43" after toolchange + # automatic run command "G43" can cause run condition + self.halcomp.newpin("disable_automatic_G43", hal.HAL_BIT, hal.HAL_IN) + # make a pin to confirm a warning dialog self.halcomp.newpin('warning-confirm', hal.HAL_BIT, hal.HAL_IN)