sims: fix plasmac2 z axis mapping

LinuxCNC · Jun 16, 2023 · 65ff3ef · 65ff3ef
1 parent b4719ae
commit 65ff3ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/configs/sim/axis/plasma/plasmac2/lib/sim/sim_no_stepgen.tcl b/configs/sim/axis/plasma/plasmac2/lib/sim/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

diff --git a/configs/sim/axis/plasma/plasmac2/lib/sim/sim_stepgen.tcl b/configs/sim/axis/plasma/plasmac2/lib/sim/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