Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions configs/apps/gladevcp/complex/complex.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ def _hal_setup(self,halcomp, builder):
self.led1 = self.builder.get_object("hal_led1")

# standard hal pins not associated with any widget
self.halcomp.newpin("example-out", hal.HAL_BIT, hal.HAL_OUT)
self.halcomp.newpin("example-in", hal.HAL_S32, hal.HAL_IN)
self.halcomp.newpin("example-out", hal.Type.BOOL, hal.Dir.OUT)
self.halcomp.newpin("example-in", hal.HAL_S32, hal.Dir.IN)

# hal pins with change callback. Also unrelated to any HAL widget.
# When the pin's value changes the callback is executed.
self.example_trigger = hal_glib.GPin(halcomp.newpin('example-trigger', hal.HAL_BIT, hal.HAL_IN))
self.example_trigger = hal_glib.GPin(halcomp.newpin('example-trigger', hal.Type.BOOL, hal.Dir.IN))
self.example_trigger.connect('value-changed', self._on_example_trigger_change)

def __init__(self, halcomp,builder,useropts):
Expand Down
66 changes: 33 additions & 33 deletions configs/sim/axis/plasma/plasmac2/plasmac2.py
Original file line number Diff line number Diff line change
Expand Up @@ -3503,17 +3503,17 @@ def ext_hal_create():
global extHalPins
for pin in ['abort', 'power', 'run', 'pause', 'run-pause', 'touchoff',
'probe','pulse', 'frame-job']:
comp.newpin(f"ext.{pin}", hal.HAL_BIT, hal.HAL_IN)
comp.newpin(f"ext.{pin}", hal.Type.BOOL, hal.Dir.IN)
extHalPins[pin] = {'state': False, 'last': False}
# external pins for user button toggle and pulse
for pin in range(3):
comp.newpin(f"ext.out_{pin}", hal.HAL_BIT, hal.HAL_OUT)
comp.newpin(f"ext.out_{pin}", hal.Type.BOOL, hal.Dir.OUT)
# pins for pierce only offsets
for pin in 'xy':
comp.newpin(f"{pin}-pierce-offset", hal.HAL_FLOAT, hal.HAL_OUT)
comp.newpin(f"{pin}-pierce-offset", hal.Type.REAL, hal.Dir.OUT)
# pins for pierce coordinate extents
for pin in ['x_min', 'y_min', 'x_max', 'y_max']:
comp.newpin(f"{pin}_pierce_extent", hal.HAL_FLOAT, hal.HAL_IN)
comp.newpin(f"{pin}_pierce_extent", hal.Type.REAL, hal.Dir.IN)

# called every cycle by user_live_update
def ext_hal_watch():
Expand Down Expand Up @@ -5674,33 +5674,33 @@ def user_hal_pins():
if firstRun == 'invalid':
return
# create new hal pins
comp.newpin('arc-voltage', hal.HAL_FLOAT, hal.HAL_IN)
comp.newpin('led-arc-ok', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('led-torch', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('led-thc-enabled', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('led-ohmic', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('led-float', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('led-breakaway', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('led-thc-active', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('led-up', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('led-down', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('led-corner-locked', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('led-void-locked', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('refresh', hal.HAL_S32, hal.HAL_IN)
comp.newpin('material-change-number', hal.HAL_S32, hal.HAL_IN)
comp.newpin('material-change', hal.HAL_S32, hal.HAL_IN)
comp.newpin('material-change-timeout', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('material-reload', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('material-temp', hal.HAL_S32, hal.HAL_IN)
comp.newpin('cut-type', hal.HAL_S32, hal.HAL_IN)
comp.newpin('thc-enable-out', hal.HAL_BIT, hal.HAL_OUT)
comp.newpin('program-is-idle', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('laser-on', hal.HAL_BIT, hal.HAL_OUT)
comp.newpin('preview-tab', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('development', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('conv-block-loaded', hal.HAL_BIT, hal.HAL_IN)
comp.newpin('offset-set-probe', hal.HAL_BIT, hal.HAL_OUT)
comp.newpin('offset-set-scribe', hal.HAL_BIT, hal.HAL_OUT)
comp.newpin('arc-voltage', hal.Type.REAL, hal.Dir.IN)
comp.newpin('led-arc-ok', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('led-torch', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('led-thc-enabled', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('led-ohmic', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('led-float', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('led-breakaway', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('led-thc-active', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('led-up', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('led-down', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('led-corner-locked', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('led-void-locked', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('refresh', hal.HAL_S32, hal.Dir.IN)
comp.newpin('material-change-number', hal.HAL_S32, hal.Dir.IN)
comp.newpin('material-change', hal.HAL_S32, hal.Dir.IN)
comp.newpin('material-change-timeout', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('material-reload', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('material-temp', hal.HAL_S32, hal.Dir.IN)
comp.newpin('cut-type', hal.HAL_S32, hal.Dir.IN)
comp.newpin('thc-enable-out', hal.Type.BOOL, hal.Dir.OUT)
comp.newpin('program-is-idle', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('laser-on', hal.Type.BOOL, hal.Dir.OUT)
comp.newpin('preview-tab', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('development', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('conv-block-loaded', hal.Type.BOOL, hal.Dir.IN)
comp.newpin('offset-set-probe', hal.Type.BOOL, hal.Dir.OUT)
comp.newpin('offset-set-scribe', hal.Type.BOOL, hal.Dir.OUT)
ext_hal_create()
# create some new signals and connect pins
hal_data = [[0,'plasmac:arc-voltage-out','plasmac.arc-voltage-out','axisui.arc-voltage'],\
Expand All @@ -5722,9 +5722,9 @@ def user_hal_pins():
]
for line in hal_data:
if line[0] < 7:
hal.new_sig(line[1],hal.HAL_FLOAT)
hal.new_sig(line[1],hal.Type.REAL)
else:
hal.new_sig(line[1],hal.HAL_BIT)
hal.new_sig(line[1],hal.Type.BOOL)
hal.connect(line[2],line[1])
hal.connect(line[3],line[1])
# connect pins to some existing signals
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,10 @@ def init_utils(self):
#############################
def init_pins(self):
# spindle control pins
pin = QHAL.newpin("spindle-amps", QHAL.HAL_FLOAT, QHAL.HAL_IN)
pin = QHAL.newpin("spindle-amps", QHAL.HAL_REAL, QHAL.HAL_IN)
pin.value_changed.connect(self.spindle_pwr_changed)

pin = QHAL.newpin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN)
pin = QHAL.newpin("spindle-volts", QHAL.HAL_REAL, QHAL.HAL_IN)
pin.value_changed.connect(self.spindle_pwr_changed)

pin = QHAL.newpin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN)
Expand All @@ -338,24 +338,24 @@ def init_pins(self):
pin = QHAL.newpin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN)
pin.value_changed.connect(self.mb_errors_changed)

pin = QHAL.newpin("spindle-modbus-connection", QHAL.HAL_BIT, QHAL.HAL_IN)
pin = QHAL.newpin("spindle-modbus-connection", QHAL.HAL_BOOL, QHAL.HAL_IN)
pin.value_changed.connect(self.mb_connection_changed)

QHAL.newpin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
QHAL.newpin("spindle-inhibit", QHAL.HAL_BOOL, QHAL.HAL_OUT)

pin = QHAL.newpin("external-pause", QHAL.HAL_BIT, QHAL.HAL_IN)
pin = QHAL.newpin("external-pause", QHAL.HAL_BOOL, QHAL.HAL_IN)
pin.value_changed.connect(self.btn_pause_clicked)

# external offset control pins
QHAL.newpin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
QHAL.newpin("eoffset-clear", QHAL.HAL_BIT, QHAL.HAL_OUT)
QHAL.newpin("eoffset-enable", QHAL.HAL_BOOL, QHAL.HAL_OUT)
QHAL.newpin("eoffset-clear", QHAL.HAL_BOOL, QHAL.HAL_OUT)
self.h['eoffset-clear'] = True
QHAL.newpin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT)
pin = QHAL.newpin("eoffset-is-active", QHAL.HAL_BIT, QHAL.HAL_IN)
pin = QHAL.newpin("eoffset-is-active", QHAL.HAL_BOOL, QHAL.HAL_IN)
pin.value_changed.connect(self.external_offset_state_changed)

# total external offset
pin = QHAL.newpin("eoffset-value", QHAL.HAL_FLOAT, QHAL.HAL_IN)
pin = QHAL.newpin("eoffset-value", QHAL.HAL_REAL, QHAL.HAL_IN)

self.pin_mpg_in = QHAL.newpin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN)
self.pin_mpg_in.value_changed.connect(lambda s: self.external_mpg(s))
Expand Down
38 changes: 19 additions & 19 deletions configs/sim/woodpecker/1280x1024_5axis/woodpecker_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,18 +271,18 @@ def init_utils(self):
#############################
def init_pins(self):
# spindle control pins
pin = QHAL.newpin("spindle-amps", QHAL.HAL_FLOAT, QHAL.HAL_IN)
pin = QHAL.newpin("spindle-amps", QHAL.HAL_REAL, QHAL.HAL_IN)
pin.value_changed.connect(self.spindle_pwr_changed)
pin = QHAL.newpin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN)
pin = QHAL.newpin("spindle-volts", QHAL.HAL_REAL, QHAL.HAL_IN)
pin.value_changed.connect(self.spindle_pwr_changed)
pin = QHAL.newpin("spindle-fault", QHAL.HAL_U32, QHAL.HAL_IN)
pin.value_changed.connect(self.spindle_fault_changed)
pin = QHAL.newpin("spindle-modbus-errors", QHAL.HAL_U32, QHAL.HAL_IN)
pin.value_changed.connect(self.mb_errors_changed)
QHAL.newpin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
QHAL.newpin("spindle-inhibit", QHAL.HAL_BOOL, QHAL.HAL_OUT)
# external offset control pins
QHAL.newpin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
QHAL.newpin("eoffset-clear", QHAL.HAL_BIT, QHAL.HAL_OUT)
QHAL.newpin("eoffset-enable", QHAL.HAL_BOOL, QHAL.HAL_OUT)
QHAL.newpin("eoffset-clear", QHAL.HAL_BOOL, QHAL.HAL_OUT)
QHAL.newpin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT)
QHAL.newpin("eoffset-count", QHAL.HAL_S32, QHAL.HAL_OUT)

Expand All @@ -293,25 +293,25 @@ def init_pins(self):
pin.value_changed.connect(self.comp_count_changed)
pin = QHAL.newpin("comp-count", QHAL.HAL_S32, QHAL.HAL_IN)
pin.value_changed.connect(self.compensate_count_changed)
pin = QHAL.newpin("map-ready", Qhal.HAL_BIT, Qhal.HAL_IN)
pin = QHAL.newpin("map-ready", QHAL.HAL_BOOL, QHAL.HAL_IN)
pin.value_changed.connect(self.map_ready_changed)
QHAL.newpin("comp-on", Qhal.HAL_BIT, Qhal.HAL_OUT)
QHAL.newpin("comp-on", QHAL.HAL_BOOL, QHAL.HAL_OUT)

self.pin_mpg_in = self.h.newpin('mpg-in',hal.HAL_S32, hal.HAL_IN)
self.pin_mpg_in = self.h.newpin('mpg-in',hal.HAL_S32, hal.Dir.IN)
self.pin_mpg_in.value_changed.connect(lambda s: self.external_mpg(s))
self.wheel_x = self.h.newpin('jog.wheel.x',hal.HAL_BIT, hal.HAL_OUT)
self.wheel_y = self.h.newpin('jog.wheel.y',hal.HAL_BIT, hal.HAL_OUT)
self.wheel_z = self.h.newpin('jog.wheel.z',hal.HAL_BIT, hal.HAL_OUT)
self.wheel_a = self.h.newpin('jog.wheel.a',hal.HAL_BIT, hal.HAL_OUT)
self.wheel_b = self.h.newpin('jog.wheel.b',hal.HAL_BIT, hal.HAL_OUT)
self.jog_increment = self.h.newpin('jog.wheel.incement',hal.HAL_FLOAT, hal.HAL_OUT)
self.wheel_x = self.h.newpin('jog.wheel.x',hal.Type.BOOL, hal.Dir.OUT)
self.wheel_y = self.h.newpin('jog.wheel.y',hal.Type.BOOL, hal.Dir.OUT)
self.wheel_z = self.h.newpin('jog.wheel.z',hal.Type.BOOL, hal.Dir.OUT)
self.wheel_a = self.h.newpin('jog.wheel.a',hal.Type.BOOL, hal.Dir.OUT)
self.wheel_b = self.h.newpin('jog.wheel.b',hal.Type.BOOL, hal.Dir.OUT)
self.jog_increment = self.h.newpin('jog.wheel.incement',hal.Type.REAL, hal.Dir.OUT)

# MPG axis select pins
pin = QHAL.newpin("axis-select-x", Qhal.HAL_BIT, Qhal.HAL_IN)
pin = QHAL.newpin("axis-select-y", Qhal.HAL_BIT, Qhal.HAL_IN)
pin = QHAL.newpin("axis-select-z", Qhal.HAL_BIT, Qhal.HAL_IN)
pin = QHAL.newpin("axis-select-a", Qhal.HAL_BIT, Qhal.HAL_IN)
pin = QHAL.newpin("axis-select-b", Qhal.HAL_BIT, Qhal.HAL_IN)
pin = QHAL.newpin("axis-select-x", QHAL.HAL_BOOL, QHAL.HAL_IN)
pin = QHAL.newpin("axis-select-y", QHAL.HAL_BOOL, QHAL.HAL_IN)
pin = QHAL.newpin("axis-select-z", QHAL.HAL_BOOL, QHAL.HAL_IN)
pin = QHAL.newpin("axis-select-a", QHAL.HAL_BOOL, QHAL.HAL_IN)
pin = QHAL.newpin("axis-select-b", QHAL.HAL_BOOL, QHAL.HAL_IN)

def init_preferences(self):
if not self.w.PREFS_:
Expand Down
18 changes: 9 additions & 9 deletions configs/sim/woodpecker/compensate.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,15 @@ def compensate(self):

def run(self):
self.h = hal.component("compensate")
self.h.newpin("enable-in", hal.HAL_BIT, hal.HAL_IN)
self.h.newpin("map-ready", hal.HAL_BIT, hal.HAL_OUT)
self.h.newpin("scale", hal.HAL_FLOAT, hal.HAL_OUT)
self.h.newpin("counts", hal.HAL_S32, hal.HAL_OUT)
self.h.newpin("clear", hal.HAL_BIT, hal.HAL_IN)
self.h.newpin("x-pos", hal.HAL_FLOAT, hal.HAL_IN)
self.h.newpin("y-pos", hal.HAL_FLOAT, hal.HAL_IN)
self.h.newpin("z-pos", hal.HAL_FLOAT, hal.HAL_IN)
self.h.newpin("fade-height", hal.HAL_FLOAT, hal.HAL_IN)
self.h.newpin("enable-in", hal.Type.BOOL, hal.Dir.IN)
self.h.newpin("map-ready", hal.Type.BOOL, hal.Dir.OUT)
self.h.newpin("scale", hal.Type.REAL, hal.Dir.OUT)
self.h.newpin("counts", hal.HAL_S32, hal.Dir.OUT)
self.h.newpin("clear", hal.Type.BOOL, hal.Dir.IN)
self.h.newpin("x-pos", hal.Type.REAL, hal.Dir.IN)
self.h.newpin("y-pos", hal.Type.REAL, hal.Dir.IN)
self.h.newpin("z-pos", hal.Type.REAL, hal.Dir.IN)
self.h.newpin("fade-height", hal.Type.REAL, hal.Dir.IN)
self.h.ready()
self.stat = linuxcnc.stat()

Expand Down
2 changes: 1 addition & 1 deletion configs/sim/woodpecker/numstr.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import hal
import time
h = hal.component("numstr")
h.newpin("in", hal.HAL_S32, hal.HAL_IN)
h.newpin("in", hal.HAL_S32, hal.Dir.IN)
h.ready()
tmp = 0
try:
Expand Down
4 changes: 2 additions & 2 deletions configs/sim/woodpecker/python/stdglue.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def build_hal(self):
import hal
try:
h=hal.component('remapStat')
h.newpin("tool", hal.HAL_S32, hal.HAL_OUT)
h.newpin("wear", hal.HAL_S32, hal.HAL_OUT)
h.newpin("tool", hal.HAL_S32, hal.Dir.OUT)
h.newpin("wear", hal.HAL_S32, hal.Dir.OUT)
h.ready()
self.hal_tool_comp = h
except Exception as e:
Expand Down
30 changes: 15 additions & 15 deletions configs/sim/woodpecker/woodpecker_/woodpecker_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,29 +151,29 @@ def initialized__(self):
#############################
def init_pins(self):
# spindle control pins
pin = self.h.newpin("spindle_amps", hal.HAL_FLOAT, hal.HAL_IN)
pin = self.h.newpin("spindle_amps", hal.Type.REAL, hal.Dir.IN)
pin.value_changed.connect(self.spindle_pwr_changed)
pin = self.h.newpin("spindle_volts", hal.HAL_FLOAT, hal.HAL_IN)
pin = self.h.newpin("spindle_volts", hal.Type.REAL, hal.Dir.IN)
pin.value_changed.connect(self.spindle_pwr_changed)
pin = self.h.newpin("spindle_fault", hal.HAL_U32, hal.HAL_IN)
pin = self.h.newpin("spindle_fault", hal.HAL_U32, hal.Dir.IN)
pin.value_changed.connect(self.spindle_fault_changed)
pin = self.h.newpin("modbus-errors", hal.HAL_U32, hal.HAL_IN)
pin = self.h.newpin("modbus-errors", hal.HAL_U32, hal.Dir.IN)
pin.value_changed.connect(self.mb_errors_changed)
# self.h.newpin("spindle_pause", hal.HAL_BIT, hal.HAL_OUT)
# self.h.newpin("spindle_pause", hal.Type.BOOL, hal.Dir.OUT)
# external offset control pins
self.h.newpin("eoffset_enable", hal.HAL_BIT, hal.HAL_OUT)
self.h.newpin("eoffset_clear", hal.HAL_BIT, hal.HAL_OUT)
self.h.newpin("eoffset_count", hal.HAL_S32, hal.HAL_OUT)
pin = self.h.newpin("eoffset_value", hal.HAL_FLOAT, hal.HAL_IN)
self.h.newpin("eoffset_enable", hal.Type.BOOL, hal.Dir.OUT)
self.h.newpin("eoffset_clear", hal.Type.BOOL, hal.Dir.OUT)
self.h.newpin("eoffset_count", hal.HAL_S32, hal.Dir.OUT)
pin = self.h.newpin("eoffset_value", hal.Type.REAL, hal.Dir.IN)
pin.value_changed.connect(self.eoffset_changed)

self.pin_mpg_in = self.h.newpin('mpg-in',hal.HAL_S32, hal.HAL_IN)
self.pin_mpg_in = self.h.newpin('mpg-in',hal.HAL_S32, hal.Dir.IN)
self.pin_mpg_in.value_changed.connect(lambda s: self.external_mpg(s))
self.wheel_x = self.h.newpin('jog.wheel.x',hal.HAL_BIT, hal.HAL_OUT)
self.wheel_y = self.h.newpin('jog.wheel.y',hal.HAL_BIT, hal.HAL_OUT)
self.wheel_z = self.h.newpin('jog.wheel.z',hal.HAL_BIT, hal.HAL_OUT)
self.wheel_a = self.h.newpin('jog.wheel.a',hal.HAL_BIT, hal.HAL_OUT)
self.jog_increment = self.h.newpin('jog.wheel.incement',hal.HAL_FLOAT, hal.HAL_OUT)
self.wheel_x = self.h.newpin('jog.wheel.x',hal.Type.BOOL, hal.Dir.OUT)
self.wheel_y = self.h.newpin('jog.wheel.y',hal.Type.BOOL, hal.Dir.OUT)
self.wheel_z = self.h.newpin('jog.wheel.z',hal.Type.BOOL, hal.Dir.OUT)
self.wheel_a = self.h.newpin('jog.wheel.a',hal.Type.BOOL, hal.Dir.OUT)
self.jog_increment = self.h.newpin('jog.wheel.incement',hal.Type.REAL, hal.Dir.OUT)

def init_preferences(self):
if not self.w.PREFS_:
Expand Down
Loading
Loading