Skip to content

Commit 04d8d1d

Browse files
committed
Multispindle: Revert base sim configs to single spindle.
Update lathe_multispindle README to use $ for spindle choice. Signed-off-by: andy pugh <andy@bodgesoc.org>
1 parent 1fc0637 commit 04d8d1d

3 files changed

Lines changed: 10 additions & 17 deletions

File tree

configs/sim/axis/axis_mm.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ MAX_LINEAR_VELOCITY = 53.34
130130
DEFAULT_LINEAR_ACCEL = 508
131131
MAX_LINEAR_ACCEL = 508
132132
POSITION_FILE = position_mm.txt
133-
SPINDLES = 2
134133

135134
[KINS]
136135
KINEMATICS = trivkins
Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
This is a simulation of a 2-spindle lathe to demonstrate the multispindle patch.
22

3-
up to 8 spindles are supported, set by [TRAJ]SPINDLES in the INI and a
4-
num_spindles modparam to motmod. These _must_ agree with each other.
3+
up to 8 spindles are supported, set by [TRAJ]SPINDLES in the INI and a
4+
num_spindles modparam to motmod. These _must_ agree with each other.
55

6-
There are still some things to shake-down regarding default behaviours if no
7-
spindle is selected.
8-
9-
Most spindle-related commands now take an extra "E" word to say which spindle
10-
to apply them to. The exception is G76 which already used E, so now uses D for
11-
spindle.
12-
13-
The docs in this branch have not been updated to reflect new behaviour.
6+
Most spindle-related commands now take an extra "$" word to say which spindle
7+
to apply them to.
148

159
Examples
1610

17-
S1000 E1 - set the speed of spindle 1 to 1000
18-
M3 S100 E0 - set the speed of spindle 0 to 100
11+
S1000 $1 - set the speed of spindle 1 to 1000
12+
M3 S100 $0 - set the speed of spindle 0 to 100
1913

20-
G33 X10 K1.5 E1 - make a move synchronised to spindle 1
21-
G33.2 Z-1 K1 E0 - rigid tap synchronised to spindle 0.
14+
G33 X10 K1.5 $1 - make a move synchronised to spindle 1.
15+
G33.2 Z-1 K1 $0 - rigid tap synchronised to spindle 0.
2216

23-
M51 P0 E6 - disable speed override on spindle 6. M48 and M49 operate on all.
17+
M51 P0 $6 - disable speed override on spindle 6. M48 and M49 operate on all.
2418

lib/hallib/core_sim.hal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# kinematics
55
loadrt [KINS]KINEMATICS
66
# motion controller, get name and thread periods from ini file
7-
loadrt [EMCMOT]EMCMOT base_period_nsec=[EMCMOT]BASE_PERIOD servo_period_nsec=[EMCMOT]SERVO_PERIOD num_joints=[KINS]JOINTS num_spindles=2
7+
loadrt [EMCMOT]EMCMOT base_period_nsec=[EMCMOT]BASE_PERIOD servo_period_nsec=[EMCMOT]SERVO_PERIOD num_joints=[KINS]JOINTS
88
# load 6 differentiators (for velocity and accel signals
99
loadrt ddt names=ddt_x,ddt_xv,ddt_y,ddt_yv,ddt_z,ddt_zv
1010
# load additional blocks

0 commit comments

Comments
 (0)