Skip to content

Commit db55cea

Browse files
committed
Multispindle: update some broken sim configs
(lightly tested to ensure startup)
1 parent 63dbfda commit db55cea

6 files changed

Lines changed: 42 additions & 17 deletions

File tree

configs/sim/axis/halui_pyvcp/pyvcp.hal

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ net mode-manual pyvcp.mode.manual halui.mode.manual
3030
net mode-auto pyvcp.mode.auto halui.mode.auto
3131
net mode-mdi pyvcp.mode.mdi halui.mode.mdi
3232

33-
net spindle-start pyvcp.spindle.on halui.spindle.start
34-
net spindle-stop pyvcp.spindle.off halui.spindle.stop
35-
net spindle-forward pyvcp.spindle.forward halui.spindle.forward
36-
net spindle-reverse pyvcp.spindle.reverse halui.spindle.reverse
37-
net spindle-increase pyvcp.spindle.increase halui.spindle.increase
38-
net spindle-decrease pyvcp.spindle.decrease halui.spindle.decrease
33+
net spindle-start pyvcp.spindle.on halui.spindle.0.start
34+
net spindle-stop pyvcp.spindle.off halui.spindle.0.stop
35+
net spindle-forward pyvcp.spindle.forward halui.spindle.0.forward
36+
net spindle-reverse pyvcp.spindle.reverse halui.spindle.0.reverse
37+
net spindle-increase pyvcp.spindle.increase halui.spindle.0.increase
38+
net spindle-decrease pyvcp.spindle.decrease halui.spindle.0.decrease
3939

4040
net mode-is-manual pyvcp.mode.is-manual halui.mode.is-manual
4141
net mode-is-auto pyvcp.mode.is-auto halui.mode.is-auto
4242
net mode-is-mdi pyvcp.mode.is-mdi halui.mode.is-mdi
4343

44-
net spindle-is-on pyvcp.spindle.is-on halui.spindle.is-on
45-
net spindle-is-forward pyvcp.spindle.is-forward halui.spindle.runs-forward
46-
net spindle-is-backward pyvcp.spindle.is-reverse halui.spindle.runs-backward
44+
net spindle-is-on pyvcp.spindle.is-on halui.spindle.0.is-on
45+
net spindle-is-forward pyvcp.spindle.is-forward halui.spindle.0.runs-forward
46+
net spindle-is-backward pyvcp.spindle.is-reverse halui.spindle.0.runs-backward
4747

4848
net j0-home pyvcp.x.home halui.joint.0.home
4949
net j0-is-homed pyvcp.x.is-homed halui.joint.0.is-homed
@@ -79,9 +79,9 @@ net fo-increase pyvcp.feed-override+ halui.feed-override.increase
7979
net fo-decrease pyvcp.feed-override- halui.feed-override.decrease
8080
net fo-value pyvcp.feed-override.value halui.feed-override.value
8181

82-
net so-increase pyvcp.spindle-override+ halui.spindle-override.increase
83-
net so-decrease pyvcp.spindle-override- halui.spindle-override.decrease
84-
net so-value pyvcp.spindle-override.value halui.spindle-override.value
82+
net so-increase pyvcp.spindle-override+ halui.spindle.0.override.increase
83+
net so-decrease pyvcp.spindle-override- halui.spindle.0.override.decrease
84+
net so-value pyvcp.spindle-override.value halui.spindle.0.override.value
8585

8686
net os-on pyvcp.optional-stop.on halui.program.optional-stop.on
8787
net os-off pyvcp.optional-stop.off halui.program.optional-stop.off

configs/sim/axis/ja_tests/xyzx_mpg/xhc-hb04.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ rewind = halui.program.step
4545
probe-z = motion.probe-input
4646
macro-3 = halui.mdi-command-03
4747

48-
half = halui.spindle.stop
48+
half = halui.spindle.0.stop
4949
# synthesized per-axis buttons for half button:
5050
half-x = ""
5151
half-y = ""
@@ -64,7 +64,7 @@ safe-z = halui.mdi-command-10
6464
home = halui.home-all
6565
macro-1 = halui.mdi-command-01
6666
macro-2 = halui.mdi-command-02
67-
spindle = halui.spindle.start
67+
spindle = halui.spindle.0.start
6868
step = xhc-hb04.stepsize-up
6969
mode = ""
7070
macro-6 = halui.mdi-command-06
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
#INCLUDE xyzx_base.inc
22
#INCLUDE xhc-hb04.inc
33

4+
[APPLICATIONS]
5+
APP = halshow xyzx.halshow
6+
7+
[HAL]
8+
HALUI = halui
9+
HALFILE = LIB:basic_sim.tcl
10+
HALFILE = LIB:xhc-hb04.tcl
11+
12+
# optional, use to support jogging of joint_3:
13+
POSTGUI_HALFILE = ./xhc-hb04-postgui.hal
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,17 @@
11
#INCLUDE xyzx_base.inc
22

3+
[APPLICATIONS]
4+
# wheel jog simulation:
5+
APP = sim_pin \
6+
jog:x-0 \
7+
jog:y-1 \
8+
jog:z-2 \
9+
jog:3 \
10+
>/dev/null
11+
APP = halshow xyzx.halshow
12+
13+
[HAL]
14+
HALUI = halui
15+
HALFILE = LIB:basic_sim.tcl
16+
HALFILE = ./xyzx_jog.hal
17+

configs/sim/axis/ja_tests/xyzx_mpg/xyzx_base.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[EMC]
2-
VERSION = 1.0
2+
VERSION = 1.1
33
MACHINE = trivkins xyzx KINEMATICS_BOTH
44
DEBUG = 0
55

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rewind = halui.program.step
1717
probe-z = motion.probe-input
1818
macro-3 = halui.mdi-command-03
1919

20-
half = halui.spindle.stop
20+
half = halui.spindle.0.stop
2121
# synthesized per-axis buttons for half button:
2222
half-x = ""
2323
half-y = ""
@@ -36,7 +36,7 @@ safe-z = halui.mdi-command-10
3636
home = halui.home-all
3737
macro-1 = halui.mdi-command-01
3838
macro-2 = halui.mdi-command-02
39-
spindle = halui.spindle.start
39+
spindle = halui.spindle.0.start
4040
step = xhc-hb04.stepsize-up
4141
mode = ""
4242
macro-6 = halui.mdi-command-06

0 commit comments

Comments
 (0)