Skip to content

Commit 8652ca8

Browse files
Corrected internal Axis widget name of Coolant label
The label 'Coolant:' was misnamed lubel. It is not related to lubing, but to cooling, so rename to 'coolantl' instead. Adjusted Axis simulation configs to also simulate coolant to get the label to show up during simulation.
1 parent 7b4d5f6 commit 8652ca8

5 files changed

Lines changed: 12 additions & 2 deletions

File tree

configs/sim/axis/axis.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ HALFILE = sim_spindle_encoder.hal
118118
HALFILE = axis_manualtoolchange.hal
119119
HALFILE = simulated_home.hal
120120
HALFILE = check_xyz_constraints.hal
121+
HALFILE = cooling.hal
121122

122123
# list of halcmd commands to execute
123124
# commands are executed in the order in which they appear

configs/sim/axis/axis_mm.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ HALFILE = core_sim.hal
109109
HALFILE = sim_spindle_encoder.hal
110110
HALFILE = axis_manualtoolchange.hal
111111
HALFILE = simulated_home.hal
112+
HALFILE = cooling.hal
112113

113114
# list of halcmd commands to execute
114115
# commands are executed in the order in which they appear

configs/sim/axis/cooling.hal

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Fake the existance of coolant options
2+
loadrt and2 count=3
3+
addf and2.0 servo-thread
4+
addf and2.1 servo-thread
5+
net flood iocontrol.0.coolant-flood => and2.0.in0
6+
net mist iocontrol.0.coolant-mist => and2.0.in1
7+
net lube iocontrol.0.lube => and2.1.in0

configs/sim/axis/historical_lathe.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ HALFILE = core_sim.hal
4545
HALFILE = axis_manualtoolchange.hal
4646
HALFILE = simulated_home.hal
4747
HALFILE = lathe.hal
48+
HALFILE = cooling.hal
4849
POSTGUI_HALFILE = lathe_postgui.hal
4950

5051
[TRAJ]

src/emc/usr_intf/axis/scripts/axis.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,7 +1359,7 @@ def open_file_guts(f, filtered=False, addrecent=True):
13591359

13601360
("ajogspeed", Entry, pane_top + ".ajogspeed"),
13611361

1362-
("lubel", Label, tabs_manual + ".coolant"),
1362+
("coolant", Label, tabs_manual + ".coolant"),
13631363
("flood", Checkbutton, tabs_manual + ".flood"),
13641364
("mist", Checkbutton, tabs_manual + ".mist"),
13651365

@@ -4198,7 +4198,7 @@ def forget(widget, *pins):
41984198

41994199
forget(widgets.mist, "iocontrol.0.coolant-mist")
42004200
forget(widgets.flood, "iocontrol.0.coolant-flood")
4201-
forget(widgets.lubel, "iocontrol.0.coolant-flood", "iocontrol.0.coolant-mist")
4201+
forget(widgets.coolant, "iocontrol.0.coolant-flood", "iocontrol.0.coolant-mist")
42024202

42034203
rcfile = "~/.axisrc"
42044204
user_command_file = inifile.find("DISPLAY", "USER_COMMAND_FILE") or ""

0 commit comments

Comments
 (0)