Skip to content

Commit a6bcc32

Browse files
committed
qtplasmac g-code filter: do a little less filtering of z moves with <keep-z-motion>
Previously we would remove things like: G53 G0 Z[#<_ini[axis_z]max_limit> - 0.19685] even when #<keep-z-motion> was active. Also, if #<keep-z-motion> is turned off, the g-code filter wil ensure the next rapid move gets a Z move up for safety.
1 parent 542324f commit a6bcc32

3 files changed

Lines changed: 15 additions & 11 deletions

File tree

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '009.071'
1+
VERSION = '009.072'
22
LCNCVER = '2.10'
33

44
'''

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,40 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.10</h2>
2626
</table>
2727
<br>
2828
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
29-
<br><b><u>009.070 2025 August 07</u></b>
29+
<br><b><u>009.072 2025 Oct 26</u></b>
30+
<ul style="margin:0;">
31+
<li>do a little less filtering of z moves with keep-z-motion</li>
32+
33+
<br><b><u>009.071 2025 Aug 07</u></b>
3034
<ul style="margin:0;">
3135
<li>add newlines between codes in conversational pre and postamble</li>
3236

33-
<br><b><u>009.070 2025 August 07</u></b>
37+
<br><b><u>009.070 2025 Aug 07</u></b>
3438
<ul style="margin:0;">
3539
<li>add M52P1 to conversational pre and postamble</li>
3640

37-
<br><b><u>009.069 2025 July 28</u></b>
41+
<br><b><u>009.069 2025 Jul 28</u></b>
3842
<ul style="margin:0;">
3943
<li>enhance cutcritical dialog with checkboxes for each untoggled button</li>
4044

41-
<br><b><u>009.068 2025 July 25</u></b>
45+
<br><b><u>009.068 2025 Jul 25</u></b>
4246
<ul style="margin:0;">
4347
<li>"VEL:" label now indicates active velocity reduction and shows commanded feed rate percentage</li>
4448
<li>suppress gcode filter warnings when material feed rate is 0</li>
4549
<li>prevent material selector from opening when velocity label or indicator is clicked</li>
4650
<li>allow velocity reduction between 1-100, fix documentation inconsistency</li>
4751

48-
<br><b><u>008.067 2025 June 28</u></b>
52+
<br><b><u>008.067 2025 Jun 28</u></b>
4953
<ul style="margin:0;">
5054
<li>allow clicking error notification background to stop error blinking</li>
5155
<li>add dialog-error icon to error notification box</li>
5256

53-
<br><b><u>008.066 2025 June 19</u></b>
57+
<br><b><u>008.066 2025 Jun 19</u></b>
5458
<ul style="margin:0;">
5559
<li>fix misshaped conversational internal angled rectangles</li>
5660
</ul>
5761

58-
<br><b><u>008.065 2025 June 06</u></b>
62+
<br><b><u>008.065 2025 Jun 06</u></b>
5963
<ul style="margin:0;">
6064
<li>start conversational shapes at origin</li>
6165
<li>uppercase conversational</li>
@@ -168,7 +172,7 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.10</h2>
168172
<li>fix file load after single cut</li>
169173
</ul>
170174

171-
<br><b><u>008.046 2024 June 5</u></b>
175+
<br><b><u>008.046 2024 Jun 5</u></b>
172176
<ul style="margin:0;">
173177
<li>add control buttons to conversational preview</li>
174178
</ul>

src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,10 +368,10 @@ def parse_code(self, data):
368368
if data.replace(' ', '').startswith('#<keep-z-motion>='):
369369
self.set_keep_z_motion(data)
370370
# remove any existing z max moves
371-
if '[#<_ini[axis_z]max_limit>' in data: # and self.zSetup:
371+
if '[#<_ini[axis_z]max_limit>' in data and not self.zBypass: # and self.zSetup:
372372
return(None)
373373
# set first movement flag
374-
if not self.firstMove and (('G00' in data or 'G01' in data) and ('X' in data or 'Y' in data)):
374+
if not self.firstMove and not self.zBypass and (('G00' in data or 'G01' in data) and ('X' in data or 'Y' in data)):
375375
self.set_first_move()
376376
# is there an m3 before motion started
377377
if not self.firstMove and 'M03' in data:

0 commit comments

Comments
 (0)