From 3b3daaf0c5fe7bed275d655c382a23eb0a1ac1d7 Mon Sep 17 00:00:00 2001 From: paukstelis Date: Fri, 11 Oct 2024 17:36:55 -0400 Subject: [PATCH] tweaking RTCM control commands..was not activated in one case --- octoprint_latheengraver/__init__.py | 9 +++++++-- setup.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/octoprint_latheengraver/__init__.py b/octoprint_latheengraver/__init__.py index fc98476..422c4df 100644 --- a/octoprint_latheengraver/__init__.py +++ b/octoprint_latheengraver/__init__.py @@ -740,6 +740,11 @@ def hook_script_onresume(self, comm, script_type, script_name, *args, **kwargs): #these need to be in queuing to extend def hook_gcode_queuing(self, comm_instance, phase, cmd, cmd_type, gcode, tags, *args, **kwargs): + if cmd.upper() == "RTCM": + self.RTCM = True + self._logger.info("Real-time coordinate modification activated") + return cmd + #if terminate has started, we aren't going to queue or send any more gcode, all commands are skipped if self.TERMINATE and cmd.upper() != "M30": cmd = None, @@ -1104,8 +1109,6 @@ def hook_gcode_sending(self, comm_instance, phase, cmd, cmd_type, gcode, *args, if cmd.upper() == "STOPBANGLE": self.do_bangle = False - #turn off RTCM LOOK AT THIS AGAIN IF WANT THIS HERE - self.RTCM = False self._logger.info('B angle matrix transformation off') return (None, ) @@ -1189,10 +1192,12 @@ def hook_gcode_sending(self, comm_instance, phase, cmd, cmd_type, gcode, *args, if cmd.upper() == "RTCM": self.RTCM = True + self._logger.info("Real-time coordinate modification activated") return (None, ) if cmd.upper() == "STOPRTCM": self.RTCM = False + self._logger.info("Real-time coordinate modification not activated") return (None, ) # Grbl 1.1 Realtime Commands (requires Octoprint 1.8.0+) diff --git a/setup.py b/setup.py index b4ec22d..8b9f5a9 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ plugin_name = "LatheEngraver Support" # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module -plugin_version = "1.0.15" +plugin_version = "1.0.16" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module