Merge branch '2.9'

Author: phillc54

configs/sim/qtplasmac/sim_no_stepgen.tcl

@@ -2,7 +2,7 @@
 
 # ---SET CONSTANTS---
 set numJoints $::KINS(JOINTS)
-set z-axis [expr $numJoints - 1]
+set zAxis [string first "z" [string tolower $::TRAJ(COORDINATES)]]
 
 # ---LOAD COMPONENTS---
 loadrt $::KINS(KINEMATICS)
@@ -59,7 +59,7 @@ addf db_breakaway servo-thread
 addf db_arc-ok    servo-thread
 
 # ---Z JOINT CONNECTION---
-net plasmac:axis-position joint.${z-axis}.pos-fb => plasmac.axis-z-position
+net plasmac:axis-position joint.${zAxis}.pos-fb => plasmac.axis-z-position
 
 # ---TOOL CHANGE PASSTHROUGH
 net sim:tool-number                                    <= iocontrol.0.tool-prep-number

configs/sim/qtplasmac/sim_stepgen.tcl

@@ -2,7 +2,7 @@
 
 # ---SET CONSTANTS---
 set numJoints $::KINS(JOINTS)
-set z-axis [string first "z" [string tolower $::TRAJ(COORDINATES)]]
+set zAxis [string first "z" [string tolower $::TRAJ(COORDINATES)]]
 
 # ---LOAD COMPONENTS---
 loadrt $::KINS(KINEMATICS)
@@ -50,7 +50,7 @@ addf db_breakaway servo-thread
 addf db_arc-ok    servo-thread
 
 # ---Z JOINT CONNECTION---
-net plasmac:axis-position joint.${z-axis}.pos-fb => plasmac.axis-z-position
+net plasmac:axis-position joint.${zAxis}.pos-fb => plasmac.axis-z-position
 
 # ---TOOL CHANGE PASSTHROUGH
 net sim:tool-number                                    <= iocontrol.0.tool-prep-number

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -1,4 +1,4 @@
-VERSION = '1.235.276'
+VERSION = '1.236.276'
 
 '''
 qtplasmac_handler.py

share/qtvcp/screens/qtplasmac/versions.html

@@ -30,11 +30,16 @@ <h2>QtPlasmaC Version History</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>v1.236.276 2023 June 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>
 <ul style="margin:0;">
   <li>change updater to only unlink qtplasmac symlink</li>
-  </li>disable tabs by hiding them</li>
-  </li>enhance button interlocking and preview stack behavior</li>
+  <li>disable tabs by hiding them</li>
+  <li>enhance button interlocking and preview stack behavior</li>
 </ul>
 <i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
 

src/hal/components/plasmac.comp

@@ -7,7 +7,7 @@ A plasma cutting table control component for use with the LinuxCNC V2.8 or later
 
 .I VERSION:
 .br
-1.235
+1.236
 
 .I SUMMARY:
 .br
@@ -2240,9 +2240,9 @@ FUNCTION(_) {
                 }
                 if(x_offset_counts == 0 && y_offset_counts == 0){
                     if((int)(x_offset_current * offset_res) == 0 && (int)(y_offset_current * offset_res) == 0){
-                        cut_recovering = FALSE;
                         laser_recovery_state = OFF;
-                        if(cut_recovery){
+                        if(cut_recovering){
+                            cut_recovering = FALSE;
                             feed_hold = FALSE;
                             thc_delay_timer = thc_delay;
                             if(mode < 2){