qtplasmac: fix gcode filter spotting coordinates when overburn is active

Author: phillc54

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -1,4 +1,4 @@
-VERSION = '237.305'
+VERSION = '237.306'
 LCNCVER = '2.9'
 DOCSVER = LCNCVER
 

share/qtvcp/screens/qtplasmac/versions.html

@@ -26,6 +26,11 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.9</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>237.305 2024 Feb 25</u></b>
+<ul style="margin:0;">
+  <li>fix gcode filter spotting coordinates when overburn is active</li>
+</ul>
+
 <br><b><u>237.305 2024 Feb 24</u></b>
 <ul style="margin:0;">
   <li>allow Z DRO to display torch height in manual cut</li>

src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py

@@ -2,8 +2,8 @@
 '''
 plasmac_gcode.py
 
-Copyright (C) 2019, 2020, 2021, 2022, 2023  Phillip A Carter
-Copyright (C)       2020, 2021, 2022, 2023  Gregory D Carl
+Copyright (C) 2019 - 2024  Phillip A Carter
+Copyright (C) 2020 - 2024  Gregory D Carl
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -235,7 +235,7 @@ def process_file(self):
                         code = self.parse_code(both[0])
                         cmnt = both[1]
                         if code:
-                            line = f'{code} {tag}{cmnt}'
+                            line = f'{code}{tag}{cmnt}'
                         else:
                             line = f'{tag}{cmnt}'
                 # code only - parse the code
@@ -279,7 +279,7 @@ def parse_code(self, data):
             data = data[1:]
         data = tmp
         # if incremental distance mode fix overburn coordinates
-        if data[:3] in ['G00', 'G01'] and self.distMode == 91 and (self.oBurnX or self.oBurnY):
+        if data[:3] in ['G00', 'G01'] and self.distMode == 91 and (self.oBurnX or self.oBurnY) and not self.spotting:
             data = self.fix_overburn_incremental_coordinates(data)
         # set path blending
         if 'G64' in data:
@@ -313,6 +313,9 @@ def parse_code(self, data):
         # is this a scribe
         if data.startswith('M03 $1 S'):
             self.set_scribing()
+        # is this a spot
+        if data.startswith('M03 $2 S') and not self.pierceOnly:
+            self.spotting = True
         # test for pierce only mode
         elif data.replace(' ','').startswith('#<pierce-only>=1') or self.cutType == 1:
             self.set_pierce_mode()
@@ -734,6 +737,9 @@ def spindle_off(self, data):
                 self.lineNum += 1
                 data = f'{data}\nM65 P3 (enable torch)'
                 self.torchEnable = True
+            # if not pierce mode reset spotting flag
+            if not self.pierceOnly:
+                self.spotting = False
         return data
 
     def program_end(self, data):