Skip to content

Commit 5e69430

Browse files
committed
Multispindle: update xhc-hb04.tcl and sim configs
1 parent 04d8d1d commit 5e69430

4 files changed

Lines changed: 18 additions & 12 deletions

File tree

configs/sim/axis/xhc-hb04/README

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,16 @@ joint jogging will occur for that switch position when LinuxCNC is in joint
244244
motion mode.
245245

246246
----------------------------------
247-
Note: in earlier versions of xhc-hb04.tcl, mpg_accels used a helper
248-
script (xhc-hb04-accels) to multiplex reduced accel values during
249-
world mode jogging.
250-
The current implementation uses pins now provided by the motion
251-
module:
247+
Notes:
248+
249+
1) In earlier versions of xhc-hb04.tcl, mpg_accels used a helper
250+
script (xhc-hb04-accels) to multiplex reduced accel values during
251+
world mode jogging.
252+
The current implementation uses pins now provided by the motion
253+
module:
252254
axis.L.jog-accel-fraction
253255
joint.N.jog-accel-fraction
256+
257+
2) Support for spindle override is supported using the
258+
halui pins: halui.spindle.0.override.* as applicable to
259+
default single spindle usage.

configs/sim/axis/xhc-hb04/xhc-hb04-layout1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ The other buttons can be connected to hal pins -- typically halui provided pins.
3434

3535
MDI commands can be executed using halui.mdi-command-nn pins defined in the ini file with entries like: [HALUI]MDI_COMMAND = mdi_command
3636

37-
The rotary switch selects the axis, spindle, or feedoverride for control by the jogwheel.
37+
The rotary switch selects the axis, spindle.0, or feedoverride for control by the jogwheel.
3838

3939
The switch positions (xyza) can be defined to any available axis (xyzc for instance).

configs/sim/axis/xhc-hb04/xhc-hb04-layout2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ The other buttons can be connected to hal pins -- typically halui provided pins.
3434

3535
MDI commands can be executed using halui.mdi-command-nn pins defined in the ini file with entries like: [HALUI]MDI_COMMAND = mdi_command
3636

37-
The rotary switch selects the axis, spindle, or feedoverride for control by the jogwheel.
37+
The rotary switch selects the axis, spindle.0, or feedoverride for control by the jogwheel.
3838

3939
The switch positions (xyza) can be defined to any available axis (xyzc for instance).

lib/hallib/xhc-hb04.tcl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -320,13 +320,13 @@ proc wheel_setup {jogmode} {
320320
setp halui.feed-override.scale 0.01
321321
makenet pendant:wheel-counts => halui.feed-override.counts
322322

323-
setp halui.spindle-override.scale 0.01
324-
makenet pendant:wheel-counts => halui.spindle-override.counts
323+
setp halui.spindle.0.override.scale 0.01
324+
makenet pendant:wheel-counts => halui.spindle.0.override.counts
325325

326326
makenet pendant:feed-override-enable => halui.feed-override.count-enable \
327327
<= xhc-hb04.jog.enable-feed-override
328328

329-
makenet pendant:spindle-override-enable => halui.spindle-override.count-enable \
329+
makenet pendant:spindle-override-enable => halui.spindle.0.override.count-enable \
330330
<= xhc-hb04.jog.enable-spindle-override
331331

332332

@@ -347,8 +347,8 @@ proc wheel_setup {jogmode} {
347347
<= halui.feed-override.value \
348348
=> xhc-hb04.feed-override
349349

350-
makenet [existing_outpin_signame halui.spindle-override.value pendant:spindle-override] \
351-
<= halui.spindle-override.value \
350+
makenet [existing_outpin_signame halui.spindle.0.override.value pendant:spindle-override] \
351+
<= halui.spindle.0.override.value \
352352
=> xhc-hb04.spindle-override
353353

354354
} ;# wheel_setup

0 commit comments

Comments
 (0)