Skip to content

Commit f15826f

Browse files
committed
qtplasmac: fix cut recovery z axis bump from laser
1 parent 9369e71 commit f15826f

3 files changed

Lines changed: 11 additions & 6 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 = '1.235.276'
1+
VERSION = '1.236.276'
22

33
'''
44
qtplasmac_handler.py

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,16 @@ <h2>QtPlasmaC Version History</h2>
3030
</table>
3131
<br>
3232
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
33+
<br><b><u>v1.236.276 2023 June 15</u></b>
34+
<ul style="margin:0;">
35+
<li>fix cut recovery z axis bump from laser</li>
36+
</ul>
37+
3338
<br><b><u>v1.235.276 2023 June 14</u></b>
3439
<ul style="margin:0;">
3540
<li>change updater to only unlink qtplasmac symlink</li>
36-
</li>disable tabs by hiding them</li>
37-
</li>enhance button interlocking and preview stack behavior</li>
41+
<li>disable tabs by hiding them</li>
42+
<li>enhance button interlocking and preview stack behavior</li>
3843
</ul>
3944
<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
4045

src/hal/components/plasmac.comp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ A plasma cutting table control component for use with the LinuxCNC V2.8 or later
77

88
.I VERSION:
99
.br
10-
1.235
10+
1.236
1111

1212
.I SUMMARY:
1313
.br
@@ -2240,9 +2240,9 @@ FUNCTION(_) {
22402240
}
22412241
if(x_offset_counts == 0 && y_offset_counts == 0){
22422242
if((int)(x_offset_current * offset_res) == 0 && (int)(y_offset_current * offset_res) == 0){
2243-
cut_recovering = FALSE;
22442243
laser_recovery_state = OFF;
2245-
if(cut_recovery){
2244+
if(cut_recovering){
2245+
cut_recovering = FALSE;
22462246
feed_hold = FALSE;
22472247
thc_delay_timer = thc_delay;
22482248
if(mode < 2){

0 commit comments

Comments
 (0)