diff --git a/configs/probe_basic/custom_hal.hal b/configs/probe_basic/custom_hal.hal new file mode 100644 index 0000000..6df450b --- /dev/null +++ b/configs/probe_basic/custom_hal.hal @@ -0,0 +1,5 @@ +net tool-change-request <= iocontrol.0.tool-change +net tool-change-confirmed => iocontrol.0.tool-changed +net tool-number <= iocontrol.0.tool-prep-number +net tool-prepare-loopback iocontrol.0.tool-prepare => iocontrol.0.tool-prepared + diff --git a/configs/probe_basic/hallib/core_sim_3.hal b/configs/probe_basic/hallib/core_sim_3.hal index d8a769d..b892c8e 100644 --- a/configs/probe_basic/hallib/core_sim_3.hal +++ b/configs/probe_basic/hallib/core_sim_3.hal @@ -55,8 +55,8 @@ net estop-loop iocontrol.0.user-enable-out iocontrol.0.emc-enable-in net probe-in => motion.probe-input # create signals for tool loading loopback -net tool-prep-loop iocontrol.0.tool-prepare iocontrol.0.tool-prepared -net tool-change-loop iocontrol.0.tool-change iocontrol.0.tool-changed +#net tool-prep-loop iocontrol.0.tool-prepare iocontrol.0.tool-prepared +#net tool-change-loop iocontrol.0.tool-change iocontrol.0.tool-changed net spindle-fwd spindle.0.forward net spindle-rev spindle.0.reverse diff --git a/configs/probe_basic/hallib/probe_basic_postgui.hal b/configs/probe_basic/hallib/probe_basic_postgui.hal index ba918ee..ddd3bc9 100644 --- a/configs/probe_basic/hallib/probe_basic_postgui.hal +++ b/configs/probe_basic/hallib/probe_basic_postgui.hal @@ -18,8 +18,11 @@ net tool-change-confirmed <= qtpyvcp_manualtoolchange.changed net tool-number => qtpyvcp_manualtoolchange.number # *** Probe graphic simulation trigger push probe tip *** -net probe-in => qtpyvcp.probe-in.out +#net probe-in => qtpyvcp.probe-in.out net probe-in <= qtpyvcp.probe-led.on # *** Set line below for actual spindle readout from your hal file *** net spindle-rpm-filtered scale_to_rpm.out => qtpyvcp.spindle-encoder-rpm.in + +loadusr -W hal_input -K 0e8f +net probe-in <= input.0.key-rightctrl \ No newline at end of file diff --git a/configs/probe_basic/probe_basic.ini b/configs/probe_basic/probe_basic.ini index 5ef555b..a37d7d5 100644 --- a/configs/probe_basic/probe_basic.ini +++ b/configs/probe_basic/probe_basic.ini @@ -29,7 +29,7 @@ INTRO_GRAPHIC = pbsplash.png INTRO_TIME = 5 INCREMENTS = JOG .01in .001in .0001in GEOMETRY = xyz -#USER_TABS_PATH = user_tabs/ +USER_TABS_PATH = user_tabs/ USER_BUTTONS_PATH = user_buttons/ USER_DROS_PATH = user_dro_display/ DRO_DISPLAY = XYZ @@ -92,6 +92,7 @@ HALFILE = hallib/core_sim_3.hal HALFILE = hallib/spindle_sim.hal HALFILE = hallib/simulated_home_probe_basic.hal HALFILE = hallib/sim_cannon.hal +HALFILE = custom_hal.hal HALUI = halui POSTGUI_HALFILE = hallib/probe_basic_postgui.hal TWOPASS = on