Browse Source

most things work now

xhcb04
ton, LinuxCNCMESA 3 years ago
parent
commit
a3f6b98c88
  1. 26
      custom.hal
  2. 2
      io.hal
  3. 3
      mesa_2019.hal
  4. 13
      mesa_2019.ini
  5. 4
      mesa_2019.var
  6. 4
      mesa_2019.var.bak
  7. 24
      postgui.hal

26
custom.hal

@ -3,20 +3,11 @@
# Spindle
setp hm2_7i96.0.pwmgen.00.output-type 1
#setp hm2_7i96.0.pwmgen.00.scale [SPINDLE]MAX_RPM
#setp hm2_7i96.0.pwmgen.pwm_frequency [SPINDLE]PWM_FREQUENCY
setp hm2_7i96.0.pwmgen.pwm_frequency 1100
setp hm2_7i96.0.pwmgen.00.scale 12000
####setp hm2_7i96.0.pwmgen.00.offset 0.157142857143
####setp hm2_7i96.0.pwmgen.00.dither-pwm true
net spindle-cmd-rpm => hm2_7i96.0.pwmgen.00.value
net spindle-on <= spindle.0.on => hm2_7i96.0.pwmgen.00.enable
net spindle-on <= spindle.0.on => hm2_7i96.0.ssr.00.out-02
#net spindle-pwm <= hm2_7i96.0.pwmgen.00.pwm
net spindle-cmd-rpm <= spindle.0.speed-out
net spindle-cmd-rpm-abs <= spindle.0.speed-out-abs
net spindle-cmd-rps <= spindle.0.speed-out-rps
@ -24,25 +15,8 @@ net spindle-cmd-rps-abs <= spindle.0.speed-out-rps-abs
net spindle-at-speed => spindle.0.at-speed
# Standard I/O Block - EStop, Etc
# create a signal for the estop loopback
net estop-loop iocontrol.0.user-enable-out => iocontrol.0.emc-enable-in
net estop-ext <= hm2_7i96.0.gpio.010.in_not
#net estop-out <= iocontrol.0.user-enable-out
#net estop-ext => iocontrol.0.emc-enable-in
# external estop
####loadrt estop_latch
####addf estop-latch.0 servo-thread
#net estop-loopout iocontrol.0.emc-enable-in <= estop-latch.0.ok-out
#net estop-loopin iocontrol.0.user-enable-out => estop-latch.0.ok-in
####net estop-reset iocontrol.0.user-request-enable => estop-latch.0.reset
####net remote-estop estop-latch.0.fault-in <= hm2_7i96.0.gpio.010.in
####net estop-out <= iocontrol.0.user-enable-out
####net estop-ext => iocontrol.0.emc-enable-in

2
io.hal

@ -6,5 +6,5 @@ net home-joint-1 joint.1.home-sw-in <= hm2_7i96.0.gpio.001.in
net home-joint-2 joint.2.home-sw-in <= hm2_7i96.0.gpio.002.in
net home-joint-3 joint.3.home-sw-in <= hm2_7i96.0.gpio.003.in
net probe-input motion.probe-input <= hm2_7i96.0.gpio.009.in
net estop-loop hm2_7i96.0.ssr.00.out-01

3
mesa_2019.hal

@ -166,6 +166,3 @@ setp pid.3.maxoutput [JOINT_3]MAX_OUTPUT
setp pid.3.maxerror [JOINT_3]MAX_ERROR
# 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

13
mesa_2019.ini

@ -24,6 +24,15 @@ INTRO_GRAPHIC = emc2.gif
INTRO_TIME = 0
OPEN_FILE = ""
EMBED_TAB_NAME=Probe Screen
EMBED_TAB_LOCATION = ntb_preview
EMBED_TAB_COMMAND = gladevcp -x {XID} -u python/probe_screen.py probe_icons/probe_screen.glade
EMBED_TAB_NAME = Camera
EMBED_TAB_LOCATION = ntb_preview
EMBED_TAB_COMMAND = mplayer -wid {XID} tv://0 -vf rectangle=-1:2:-1:240,rectangle=2:-1:320:-1
[KINS]
KINEMATICS = trivkins coordinates=XYYZ kinstype=BOTH
JOINTS = 4
@ -206,8 +215,8 @@ BIAS = 0
MAX_OUTPUT = 0
MAX_ERROR = 0.0127
HOME = 11
HOME_OFFSET = 40
HOME_SEARCH_VEL = -2
HOME_OFFSET = 0
HOME_SEARCH_VEL = -15
HOME_LATCH_VEL = -1
HOME_SEQUENCE = 0
HOME_USE_INDEX = False

4
mesa_2019.var

@ -27,8 +27,8 @@
5218 0.000000
5219 0.000000
5220 1.000000
5221 270.000000
5222 290.000000
5221 71.663185
5222 575.711380
5223 11.000000
5224 0.000000
5225 0.000000

4
mesa_2019.var.bak

@ -27,8 +27,8 @@
5218 0.000000
5219 0.000000
5220 1.000000
5221 270.000000
5222 290.000000
5221 71.663185
5222 575.711380
5223 11.000000
5224 0.000000
5225 0.000000

24
postgui.hal

@ -2,3 +2,27 @@
# GUI HAL pins are not visible until after the GUI loads.
# This file will not be written over by the configuration tool.
# create a signal for the estop loopback
##net estop-loop hm2_7i96.0.ssr.00.out-01
##net estop-loop iocontrol.0.user-enable-out => iocontrol.0.emc-enable-in
##net estop-ext <= hm2_7i96.0.gpio.010.in
# external estop
loadrt estop_latch
addf estop-latch.0 servo-thread
net estop-loopout iocontrol.0.emc-enable-in <= estop-latch.0.ok-out
net estop-loopin iocontrol.0.user-enable-out => estop-latch.0.ok-in
net estop-reset iocontrol.0.user-request-enable => estop-latch.0.reset
net remote-estop estop-latch.0.fault-in <= hm2_7i96.0.gpio.010.in
net estop-loop hm2_7i96.0.ssr.00.out-01
# 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
loadusr -W hal_manualtoolchange
net tool-change iocontrol.0.tool-change => hal_manualtoolchange.change
net tool-changed iocontrol.0.tool-changed <= hal_manualtoolchange.changed
net tool-number iocontrol.0.tool-prep-number => hal_manualtoolchange.number
net tool-prepare-loopback iocontrol.0.tool-prepare => iocontrol.0.tool-prepared

Loading…
Cancel
Save