Merge branch '2.9'

LinuxCNC · Aug 3, 2023 · 50e1841 · 50e1841
2 parents fb41b07 + 0ef5d86
commit 50e1841
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py
@@ -1,4 +1,4 @@
-VERSION = '1.236.278'
+VERSION = '1.236.279'
 
 '''
 qtplasmac_handler.py

diff --git a/share/qtvcp/screens/qtplasmac/versions.html b/share/qtvcp/screens/qtplasmac/versions.html
@@ -30,25 +30,30 @@ <h2>QtPlasmaC Version History</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
-<br><b><u>v1.236.278 2023 June 26</u></b>
+<br><b><u>v1.236.279 2023 Aug 03</u></b>
 <ul style="margin:0;">
-  <li>rework-material-file-handling</li>
-  <li>enable-user-defined-default-material</li>
-  <li>rework-gcode-filter</li>
+  <li>fix multi g/m codes in line in gcode filter</li>
+</ul>
+
+<br><b><u>v1.236.278 2023 Jun 26</u></b>
+<ul style="margin:0;">
+  <li>rework material file handling</li>
+  <li>enable user defined default material</li>
+  <li>rework gcode filter</li>
   <li>make sample ngc files more consistant</li>
 </ul>
 
-<br><b><u>v1.236.277 2023 June 18</u></b>
+<br><b><u>v1.236.277 2023 Jun 18</u></b>
 <ul style="margin:0;">
   <li>restyle origin_offsetview</li>
 </ul>
 
-<br><b><u>v1.236.276 2023 June 15</u></b>
+<br><b><u>v1.236.276 2023 Jun 15</u></b>
 <ul style="margin:0;">
   <li>fix cut recovery z axis bump from laser</li>
 </ul>
 
-<br><b><u>v1.235.276 2023 June 14</u></b>
+<br><b><u>v1.235.276 2023 Jun 14</u></b>
 <ul style="margin:0;">
   <li>change updater to only unlink qtplasmac symlink</li>
   <li>disable tabs by hiding them</li>

diff --git a/src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py b/src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py
@@ -244,8 +244,17 @@ def parse_code(self, data):
         if data[0] in 'XYZAB':
             data = f'G{self.lastG} {data}'
         # add leading 0's to G & M codes < 10
-        if data[0] in 'GM' and (len(data) < 3 or not data[2].isdigit()):
-            data = data[0] + '0' + data[1:]
+        tmp = ''
+        while data:
+            tmp += data[0]
+            if data[0] in 'GM' and data[1].isdigit():
+                if len(data) == 2:
+                    tmp += '0'
+                elif len(data) > 2:
+                    if not data[2].isdigit():
+                        tmp += '0'
+            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):
             data = self.fix_overburn_incremental_coordinates(data)