Skip to content

Commit

Permalink
Corrected internal Axis widget name of Coolant label
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
petterreinholdtsen committed Jun 21, 2023
1 parent 7b4d5f6 commit 8652ca8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions configs/sim/axis/axis.ini
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ HALFILE = sim_spindle_encoder.hal
HALFILE = axis_manualtoolchange.hal
HALFILE = simulated_home.hal
HALFILE = check_xyz_constraints.hal
HALFILE = cooling.hal

# list of halcmd commands to execute
# commands are executed in the order in which they appear
Expand Down
1 change: 1 addition & 0 deletions configs/sim/axis/axis_mm.ini
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ HALFILE = core_sim.hal
HALFILE = sim_spindle_encoder.hal
HALFILE = axis_manualtoolchange.hal
HALFILE = simulated_home.hal
HALFILE = cooling.hal

# list of halcmd commands to execute
# commands are executed in the order in which they appear
Expand Down
7 changes: 7 additions & 0 deletions configs/sim/axis/cooling.hal
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Fake the existance of coolant options
loadrt and2 count=3
addf and2.0 servo-thread
addf and2.1 servo-thread
net flood iocontrol.0.coolant-flood => and2.0.in0
net mist iocontrol.0.coolant-mist => and2.0.in1
net lube iocontrol.0.lube => and2.1.in0
1 change: 1 addition & 0 deletions configs/sim/axis/historical_lathe.ini
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ HALFILE = core_sim.hal
HALFILE = axis_manualtoolchange.hal
HALFILE = simulated_home.hal
HALFILE = lathe.hal
HALFILE = cooling.hal
POSTGUI_HALFILE = lathe_postgui.hal

[TRAJ]
Expand Down
4 changes: 2 additions & 2 deletions src/emc/usr_intf/axis/scripts/axis.py
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,7 @@ def open_file_guts(f, filtered=False, addrecent=True):

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

("lubel", Label, tabs_manual + ".coolant"),
("coolant", Label, tabs_manual + ".coolant"),
("flood", Checkbutton, tabs_manual + ".flood"),
("mist", Checkbutton, tabs_manual + ".mist"),

Expand Down Expand Up @@ -4198,7 +4198,7 @@ def forget(widget, *pins):

forget(widgets.mist, "iocontrol.0.coolant-mist")
forget(widgets.flood, "iocontrol.0.coolant-flood")
forget(widgets.lubel, "iocontrol.0.coolant-flood", "iocontrol.0.coolant-mist")
forget(widgets.coolant, "iocontrol.0.coolant-flood", "iocontrol.0.coolant-mist")

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

4 comments on commit 8652ca8

@d2inventory
Copy link
Contributor

@d2inventory d2inventory commented on 8652ca8 Jul 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit broke my axis_mm simulation.

Error:
./cooling.hal:7: Pin 'iocontrol.0.lube' does not exist

@petterreinholdtsen
Copy link
Collaborator Author

@petterreinholdtsen petterreinholdtsen commented on 8652ca8 Jul 15, 2023 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@d2inventory
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works on branch 2.9 but not in master branch. I'll have a look later on why this is, I guess iocontrol changed.

@d2inventory
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed iocontrol got changed and lube was removed.
There is already an issue open where this is kinda discussed:

#2532

So imma watch there what the result is going to be.

Please sign in to comment.