diff --git a/configs/apps/gladevcp/complex/complex.py b/configs/apps/gladevcp/complex/complex.py index 67b2693f69b..db694758b37 100644 --- a/configs/apps/gladevcp/complex/complex.py +++ b/configs/apps/gladevcp/complex/complex.py @@ -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): diff --git a/configs/sim/axis/plasma/plasmac2/plasmac2.py b/configs/sim/axis/plasma/plasmac2/plasmac2.py index f9a71b2271b..3c4137e27b9 100644 --- a/configs/sim/axis/plasma/plasmac2/plasmac2.py +++ b/configs/sim/axis/plasma/plasmac2/plasmac2.py @@ -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(): @@ -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'],\ @@ -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 diff --git a/configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py b/configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py index 70b6b3ceee1..50f3994c484 100644 --- a/configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py +++ b/configs/sim/qtvcp_screens/qtdragon/qtvcp/screens/qtdragon/qtdragon_handler.py @@ -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) @@ -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)) diff --git a/configs/sim/woodpecker/1280x1024_5axis/woodpecker_handler.py b/configs/sim/woodpecker/1280x1024_5axis/woodpecker_handler.py index 4efd28be1c6..bbd1f2c1b87 100644 --- a/configs/sim/woodpecker/1280x1024_5axis/woodpecker_handler.py +++ b/configs/sim/woodpecker/1280x1024_5axis/woodpecker_handler.py @@ -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) @@ -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_: diff --git a/configs/sim/woodpecker/compensate.py b/configs/sim/woodpecker/compensate.py index 1c3bdbe3f5a..452a116118f 100755 --- a/configs/sim/woodpecker/compensate.py +++ b/configs/sim/woodpecker/compensate.py @@ -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() diff --git a/configs/sim/woodpecker/numstr.py b/configs/sim/woodpecker/numstr.py index 5ebaeeb32d4..fbc280a29e0 100644 --- a/configs/sim/woodpecker/numstr.py +++ b/configs/sim/woodpecker/numstr.py @@ -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: diff --git a/configs/sim/woodpecker/python/stdglue.py b/configs/sim/woodpecker/python/stdglue.py index ea32910bece..985a01acd4b 100644 --- a/configs/sim/woodpecker/python/stdglue.py +++ b/configs/sim/woodpecker/python/stdglue.py @@ -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: diff --git a/configs/sim/woodpecker/woodpecker_/woodpecker_handler.py b/configs/sim/woodpecker/woodpecker_/woodpecker_handler.py index d0d343a8ddd..8964040305b 100644 --- a/configs/sim/woodpecker/woodpecker_/woodpecker_handler.py +++ b/configs/sim/woodpecker/woodpecker_/woodpecker_handler.py @@ -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_: diff --git a/lib/python/gladevcp/hal_widgets.py b/lib/python/gladevcp/hal_widgets.py index fa33745f03c..d7d993f4779 100644 --- a/lib/python/gladevcp/hal_widgets.py +++ b/lib/python/gladevcp/hal_widgets.py @@ -41,8 +41,8 @@ def hal_update(self): class _HalToggleBase(_HalWidgetBase): def _hal_init(self): self.set_active(False) - self.hal_pin = self.hal.newpin(self.hal_name, hal.HAL_BIT, hal.HAL_OUT) - self.hal_pin_not = self.hal.newpin(self.hal_name + "-not", hal.HAL_BIT, hal.HAL_OUT) + self.hal_pin = self.hal.newpin(self.hal_name, hal.Type.BOOL, hal.Dir.OUT) + self.hal_pin_not = self.hal.newpin(self.hal_name + "-not", hal.Type.BOOL, hal.Dir.OUT) self.connect("toggled", self.hal_update) def hal_update(self, *a): @@ -52,8 +52,8 @@ def hal_update(self, *a): class _HalScaleBase(_HalWidgetBase): def _hal_init(self): - self.hal_pin = self.hal.newpin(self.hal_name, hal.HAL_FLOAT, hal.HAL_OUT) - self.hal_pin_s = self.hal.newpin(self.hal_name+"-s", hal.HAL_S32, hal.HAL_OUT) + self.hal_pin = self.hal.newpin(self.hal_name, hal.Type.REAL, hal.Dir.OUT) + self.hal_pin_s = self.hal.newpin(self.hal_name+"-s", hal.HAL_S32, hal.Dir.OUT) self.connect("value-changed", self.hal_update) def hal_update(self, *a): @@ -62,7 +62,7 @@ def hal_update(self, *a): class _HalIOScaleBase(_HalWidgetBase): def _hal_init(self): - self.hal_pin = self.hal.newpin(self.hal_name, hal.HAL_FLOAT, hal.HAL_IO) + self.hal_pin = self.hal.newpin(self.hal_name, hal.Type.REAL, hal.Dir.IO) self.connect("value-changed", self.hal_update) self.hal_pin.connect('value-changed', lambda s: self.emit('hal-pin-changed', s)) self.hal_current = self.hal_pin.get() @@ -80,21 +80,21 @@ def hal_update(self, *a): class _HalSensitiveBase(_HalWidgetBase): def _hal_init(self): - self.hal_pin = self.hal.newpin(self.hal_name, hal.HAL_BIT, hal.HAL_IN) + self.hal_pin = self.hal.newpin(self.hal_name, hal.Type.BOOL, hal.Dir.IN) self.hal_pin.connect('value-changed', lambda s: self.set_sensitive(s.value)) self.hal_pin.connect('value-changed', lambda s: self.emit('hal-pin-changed', s)) class _HalJogWheelBase(_HalWidgetBase): def _hal_init(self): - self.hal_pin = self.hal.newpin(self.hal_name, hal.HAL_S32, hal.HAL_OUT) + self.hal_pin = self.hal.newpin(self.hal_name, hal.HAL_S32, hal.Dir.OUT) try: self.get_scaled_value() - self.hal_pin_scaled = self.hal.newpin(self.hal_name+'-scaled', hal.HAL_FLOAT, hal.HAL_OUT) + self.hal_pin_scaled = self.hal.newpin(self.hal_name+'-scaled', hal.Type.REAL, hal.Dir.OUT) except: pass try: self.get_delta_scaled_value() - self.hal_pin_delta_scaled = self.hal.newpin(self.hal_name+'-delta-scaled', hal.HAL_FLOAT, hal.HAL_OUT) + self.hal_pin_delta_scaled = self.hal.newpin(self.hal_name+'-delta-scaled', hal.Type.REAL, hal.Dir.OUT) except: pass @@ -114,7 +114,7 @@ def hal_update(self, *a): class _HalSpeedControlBase(_HalWidgetBase): def _hal_init(self): - self.hal_pin = self.hal.newpin(self.hal_name + '.value', hal.HAL_FLOAT, hal.HAL_OUT) + self.hal_pin = self.hal.newpin(self.hal_name + '.value', hal.Type.REAL, hal.Dir.OUT) self.connect("value-changed", self.hal_update) def hal_update(self, *a): @@ -134,7 +134,7 @@ class HAL_HideTable(Gtk.Grid, _HalWidgetBase): __gsignals__ = dict([hal_pin_changed_signal]) def _hal_init(self): - self.hal_pin = self.hal.newpin(self.hal_name, hal.HAL_BIT, hal.HAL_IN) + self.hal_pin = self.hal.newpin(self.hal_name, hal.Type.BOOL, hal.Dir.IN) self.hal_pin.connect('value-changed',self.update) def update(self,*a): @@ -166,8 +166,8 @@ def do_set_property(self, property, value): raise AttributeError('unknown property %s' % property.name) def _hal_init(self): - self.hal_pin_f = self.hal.newpin(self.hal_name+"-f", hal.HAL_FLOAT, hal.HAL_OUT) - self.hal_pin_s = self.hal.newpin(self.hal_name+"-s", hal.HAL_S32, hal.HAL_OUT) + self.hal_pin_f = self.hal.newpin(self.hal_name+"-f", hal.Type.REAL, hal.Dir.OUT) + self.hal_pin_s = self.hal.newpin(self.hal_name+"-s", hal.HAL_S32, hal.Dir.OUT) self.connect("changed", self.hal_update) def hal_update(self, *a): @@ -184,7 +184,7 @@ class HAL_Button(Gtk.Button, _HalWidgetBase): __gtype_name__ = "HAL_Button" def _hal_init(self): - self.hal_pin = self.hal.newpin(self.hal_name, hal.HAL_BIT, hal.HAL_OUT) + self.hal_pin = self.hal.newpin(self.hal_name, hal.Type.BOOL, hal.Dir.OUT) def _f(w, data): self.hal_pin.set(data) self.connect("pressed", _f, True) @@ -196,7 +196,7 @@ class HALIO_Button(Gtk.ToggleButton, _HalWidgetBase): def _hal_init(self): self.set_active(False) - self.hal_pin = self.hal.newpin(self.hal_name, hal.HAL_BIT, hal.HAL_IO) + self.hal_pin = self.hal.newpin(self.hal_name, hal.Type.BOOL, hal.Dir.IO) def _f(w, data): self.set_active(True) self.hal_pin.set(data) @@ -219,8 +219,8 @@ def hal_update(self, *a): self.hal_pin_s.set(int(data)) def _hal_init(self): - self.hal_pin_f = self.hal.newpin(self.hal_name+"-f", hal.HAL_FLOAT, hal.HAL_OUT) - self.hal_pin_s = self.hal.newpin(self.hal_name+"-s", hal.HAL_S32, hal.HAL_OUT) + self.hal_pin_f = self.hal.newpin(self.hal_name+"-f", hal.Type.REAL, hal.Dir.OUT) + self.hal_pin_s = self.hal.newpin(self.hal_name+"-s", hal.HAL_S32, hal.Dir.OUT) self.connect("value-changed", self.hal_update) self.emit("value-changed") @@ -278,8 +278,8 @@ def do_set_property(self, property, value): raise AttributeError('unknown property %s' % property.name) def _hal_init(self): - self.hal_pin = self.hal.newpin(self.hal_name, hal.HAL_FLOAT, hal.HAL_IN) - self.hal_pin_scale = self.hal.newpin(self.hal_name+".scale", hal.HAL_FLOAT, hal.HAL_IN) + self.hal_pin = self.hal.newpin(self.hal_name, hal.Type.REAL, hal.Dir.IN) + self.hal_pin_scale = self.hal.newpin(self.hal_name+".scale", hal.Type.REAL, hal.Dir.IN) if self.yellow_limit or self.red_limit: self.set_fraction(0) self.modify_bg(Gtk.STATE_PRELIGHT, Gdk.Color.parse('#0f0')[1]) @@ -350,13 +350,13 @@ def do_set_property(self, property, value): def _hal_init(self): types = {0:hal.HAL_S32 - ,1:hal.HAL_FLOAT + ,1:hal.Type.REAL ,2:hal.HAL_U32 } pin_type = types.get(self.label_pin_type, None) if pin_type is None: raise TypeError("%s: Invalid pin type: %s" % (self.hal_name, self.label_pin_type)) - self.hal_pin = self.hal.newpin(self.hal_name, pin_type, hal.HAL_IN) + self.hal_pin = self.hal.newpin(self.hal_name, pin_type, hal.Dir.IN) self.hal_pin.connect('value-changed', lambda p: self.set_text(self.text_template % p.value)) self.hal_pin.connect('value-changed', lambda s: self.emit('hal-pin-changed', s)) diff --git a/lib/python/hal.py b/lib/python/hal.py index 68fa796eebc..34f90289cb6 100644 --- a/lib/python/hal.py +++ b/lib/python/hal.py @@ -11,8 +11,8 @@ import hal, time h = hal.component("component-name") # create pins and parameters with calls to h.newpin and h.newparam -h.newpin("in", hal.HAL_FLOAT, hal.HAL_IN) -h.newpin("out", hal.HAL_FLOAT, hal.HAL_OUT) +h.newpin("in", hal.Type.REAL, hal.Dir.IN) +h.newpin("out", hal.Type.REAL, hal.Dir.OUT) h.ready() # mark the component as 'ready' try: diff --git a/lib/python/pyvcp_widgets.py b/lib/python/pyvcp_widgets.py index 46dba0388bb..7e831fbcae8 100644 --- a/lib/python/pyvcp_widgets.py +++ b/lib/python/pyvcp_widgets.py @@ -59,7 +59,7 @@ class pyvcp_dial(Canvas): # Dial widget by tomp - """ A dial that outputs a HAL_FLOAT + """ A dial that outputs a HAL_REAL reacts to both mouse-wheel and mouse dragging [ 376 ] @@ -202,11 +202,11 @@ def __init__(self,root,pycomp,halpin=None,halparam=None,param_pin=0,size=200,cpr if halparam == None: halparam = "dial." + str(pyvcp_dial.n) + ".param_pin" self.halparam=halparam - pycomp.newpin(halparam, HAL_FLOAT, HAL_IN) + pycomp.newpin(halparam, Type.REAL, Dir.IN) pyvcp_dial.n += 1 self.pycomp=pycomp - pycomp.newpin(halpin, HAL_FLOAT, HAL_OUT) + pycomp.newpin(halpin, Type.REAL, Dir.OUT) pycomp[self.halparam] = self.origValue self.oldValue = self.origValue @@ -348,7 +348,7 @@ def update(self,pycomp): class pyvcp_meter(Canvas): - """ Meter - shows the value of a FLOAT with an analog meter + """ Meter - shows the value of a HAL_REAL with an analog meter [ 300 ] [ "mymeter" ] @@ -402,7 +402,7 @@ def __init__(self,root,pycomp,halpin=None, size=200,text=None,subtext=None,min_= if halpin == None: self.halpin = "meter."+str(pyvcp_meter.n)+".value" pyvcp_meter.n += 1 - pycomp.newpin(self.halpin, HAL_FLOAT, HAL_IN) + pycomp.newpin(self.halpin, Type.REAL, Dir.IN) self.value = pycomp[self.halpin] def rad2deg(self, rad): return rad*180/math.pi @@ -464,7 +464,7 @@ def draw_ticks(self): # ------------------------------------------- class pyvcp_jogwheel(Canvas): - """" A jogwheel that outputs a HAL_FLOAT count + """" A jogwheel that outputs a HAL_REAL count reacts to both mouse-wheel and mouse dragging [ 33 ] (counts per revolution) @@ -550,7 +550,7 @@ def __init__(self,root,pycomp,halpin=None,text=None,clear_pin=0,scale_pin=0, halpin = "jogwheel."+str(pyvcp_jogwheel.n) + name pyvcp_jogwheel.n += 1 self.halpin=halpin - pycomp.newpin(halpin, HAL_FLOAT, HAL_OUT) + pycomp.newpin(halpin, Type.REAL, Dir.OUT) pycomp[self.halpin] = self.count self.pycomp=pycomp @@ -561,13 +561,13 @@ def __init__(self,root,pycomp,halpin=None,text=None,clear_pin=0,scale_pin=0, name = ".reset" clear_pin = halpin + name self.clear_pin = clear_pin - pycomp.newpin(clear_pin, HAL_BIT, HAL_IN) + pycomp.newpin(clear_pin, Type.BOOL, Dir.IN) if scale_pin!=0: name = ".scale" scale_pin = halpin + name self.scale_pin = scale_pin - pycomp.newpin(scale_pin, HAL_FLOAT, HAL_IN) + pycomp.newpin(scale_pin, Type.REAL, Dir.IN) def update_jogscale(self): if self.scale_pin: @@ -694,7 +694,7 @@ def __init__(self,master,pycomp,halpin=None,initval=0,orient=None,choices=[],**k if n==initval: b.select() c_halpin=halpin+"."+str(c) - pycomp.newpin(c_halpin, HAL_BIT, HAL_OUT) + pycomp.newpin(c_halpin, Type.BOOL, Dir.OUT) self.halpins.append(c_halpin) n+=1 @@ -743,7 +743,7 @@ def __init__(self,master,pycomp,halpin=None,disable_pin=False,**kw): pyvcp_label.n += 1 halpin_disable = halpin+".disable" self.halpin_disable = halpin_disable - pycomp.newpin(halpin_disable, HAL_BIT, HAL_IN) + pycomp.newpin(halpin_disable, Type.BOOL, Dir.IN) def update(self,pycomp): if self.disable_pin: @@ -760,7 +760,7 @@ def update(self,pycomp): class pyvcp_multilabel(Label): """ Selectable text label, can display up to 6 label legends - when associated bit pin is activated + when associated bool pin is activated ["Label1" "Label2" "Label3" "Label4" "Label5" "Label6"] ("Helvetica", 20) @@ -783,7 +783,7 @@ def __init__(self,master,pycomp,halpin=None,disable_pin=False,legends=[],initval n=0 for c in legends: c_halpin=halpin+".legend"+str(n) - pycomp.newpin(c_halpin, HAL_BIT, HAL_IN) + pycomp.newpin(c_halpin, Type.BOOL, Dir.IN) self.halpins.append(c_halpin) n+=1 #limit to 6 legends @@ -795,7 +795,7 @@ def __init__(self,master,pycomp,halpin=None,disable_pin=False,legends=[],initval if disable_pin: halpin_disable = halpin+".disable" self.halpin_disable = halpin_disable - pycomp.newpin(halpin_disable, HAL_BIT, HAL_IN) + pycomp.newpin(halpin_disable, Type.BOOL, Dir.IN) # test for out of range initval number if initval >= 0 and initval <= self.num_pins : @@ -950,7 +950,7 @@ def getcontainer(self): # ------------------------------------------- class pyvcp_spinbox(Spinbox): - """ (control) controls a float, also shown as text + """ (control) controls a real, also shown as text reacts to the mouse wheel [ "my-spinbox" ] @@ -983,7 +983,7 @@ def __init__(self,master,pycomp,halpin=None, halparam=None,param_pin=0, if halparam == None: halparam = "spinbox." + str(pyvcp_spinbox.n) + ".param_pin" self.halparam=halparam - pycomp.newpin(halparam, HAL_FLOAT, HAL_IN) + pycomp.newpin(halparam, Type.REAL, Dir.IN) pyvcp_spinbox.n += 1 @@ -1005,7 +1005,7 @@ def __init__(self,master,pycomp,halpin=None, halparam=None,param_pin=0, self.min_=min_ self.resolution=resolution self.v.set( str( self.format % {'b':self.value} ) ) - pycomp.newpin(halpin, HAL_FLOAT, HAL_OUT) + pycomp.newpin(halpin, Type.REAL, Dir.OUT) self.bind('',self.wheel_up) self.bind('',self.wheel_down) @@ -1051,7 +1051,7 @@ def wheel_down(self,event): # ------------------------------------------- class pyvcp_number(Label): - """ (indicator) shows a float as text """ + """ (indicator) shows a real as text """ n=0 def __init__(self,master,pycomp,halpin=None,format="2.1f",**kw): self.v = StringVar() @@ -1064,7 +1064,7 @@ def __init__(self,master,pycomp,halpin=None,format="2.1f",**kw): self.value=0.0 dummy = "%(b)"+self.format self.v.set( str( dummy % {'b':self.value} ) ) - pycomp.newpin(halpin, HAL_FLOAT, HAL_IN) + pycomp.newpin(halpin, Type.REAL, Dir.IN) def update(self,pycomp): newvalue = pycomp[self.halpin] @@ -1088,7 +1088,7 @@ def __init__(self,master,pycomp,halpin=None,format="d",**kw): self.value=int(0.0) dummy = "%(b)"+self.format self.v.set( str( dummy % {'b':self.value} ) ) - pycomp.newpin(halpin, HAL_U32, HAL_IN) + pycomp.newpin(halpin, HAL_U32, Dir.IN) def update(self,pycomp): newvalue = pycomp[self.halpin] @@ -1112,7 +1112,7 @@ def __init__(self,master,pycomp,halpin=None,format="d",**kw): self.value=int(0.0) dummy = "%(b)"+self.format self.v.set( str( dummy % {'b':self.value} ) ) - pycomp.newpin(halpin, HAL_S32, HAL_IN) + pycomp.newpin(halpin, HAL_S32, Dir.IN) def update(self,pycomp): newvalue = pycomp[self.halpin] @@ -1137,10 +1137,10 @@ def __init__(self,master,pycomp,halpin=None,**kw): pyvcp_timer.n += 1 self.halpins=[] c_halpin=halpin+".reset" - pycomp.newpin(c_halpin, HAL_BIT, HAL_IN) + pycomp.newpin(c_halpin, Type.BOOL, Dir.IN) self.halpins.append(c_halpin) c_halpin=halpin+".run" - pycomp.newpin(c_halpin, HAL_BIT, HAL_IN) + pycomp.newpin(c_halpin, Type.BOOL, Dir.IN) self.halpins.append(c_halpin) self.resetvalue=0 @@ -1187,7 +1187,7 @@ class pyvcp_bar(Canvas): ## reworked by ArcEye 10022014 ## allow value ranges in different colours - """ (indicator) a bar-indicator for a float + """ (indicator) a bar-indicator for a real "my-bar" 0 @@ -1231,7 +1231,7 @@ def __init__(self,master,pycomp,fillcolor="green",bgcolor="grey", self.startval=min_ self.format = "%" + format - pycomp.newpin(halpin, HAL_FLOAT, HAL_IN) + pycomp.newpin(halpin, Type.REAL, Dir.IN) self.value=0.0 # some dummy value to start with @@ -1346,11 +1346,11 @@ def __init__(self,master,pycomp, halpin=None,disable_pin=False, halpin = "led."+str(pyvcp_led.n) pyvcp_led.n+=1 self.halpin=halpin - pycomp.newpin(halpin, HAL_BIT, HAL_IN) + pycomp.newpin(halpin, Type.BOOL, Dir.IN) if disable_pin: halpin_disable = halpin+".disable" self.halpin_disable = halpin_disable - pycomp.newpin(halpin_disable, HAL_BIT, HAL_IN) + pycomp.newpin(halpin_disable, Type.BOOL, Dir.IN) def update(self,pycomp): @@ -1396,11 +1396,11 @@ def __init__(self,master,pycomp, halpin=None,disable_pin=False, halpin = "led."+str(pyvcp_led.n) pyvcp_led.n+=1 self.halpin=halpin - pycomp.newpin(halpin, HAL_BIT, HAL_IN) + pycomp.newpin(halpin, Type.BOOL, Dir.IN) if disable_pin: halpin_disable = halpin+".disable" self.halpin_disable = halpin_disable - pycomp.newpin(halpin_disable, HAL_BIT, HAL_IN) + pycomp.newpin(halpin_disable, Type.BOOL, Dir.IN) def update(self,pycomp): @@ -1441,10 +1441,10 @@ def __init__(self,master,pycomp,halpin=None,initval=0,**kw): if halpin == None: halpin = "checkbutton."+str(pyvcp_checkbutton.n) self.halpin=halpin - pycomp.newpin(halpin, HAL_BIT, HAL_OUT) + pycomp.newpin(halpin, Type.BOOL, Dir.OUT) changepin = halpin + ".changepin" self.changepin=changepin - pycomp.newpin(changepin, HAL_BIT, HAL_IN) + pycomp.newpin(changepin, Type.BOOL, Dir.IN) pycomp[self.changepin] = 0 pyvcp_checkbutton.n += 1 @@ -1493,11 +1493,11 @@ def __init__(self,master,pycomp,halpin=None,disable_pin=False,**kw): halpin = "button."+str(pyvcp_button.n) pyvcp_button.n += 1 self.halpin=halpin - pycomp.newpin(halpin, HAL_BIT, HAL_OUT) + pycomp.newpin(halpin, Type.BOOL, Dir.OUT) self.disable_pin = disable_pin if not disable_pin == False: halpin_disable = halpin + ".disable" - pycomp.newpin(halpin_disable, HAL_BIT, HAL_IN) + pycomp.newpin(halpin_disable, Type.BOOL, Dir.IN) self.halpin_disable=halpin_disable self.state=0; self.bind("", self.pressed) @@ -1532,7 +1532,7 @@ def update(self,pycomp): class pyvcp_scale(Scale): """ (control) a slider halpin-i is integer output - halpin-f is float output + halpin-f is real output [ "my-scale" ] @@ -1564,12 +1564,12 @@ def __init__(self,master,pycomp, if halparam == None: halparam = "scale."+str(pyvcp_scale.n)+".param_pin" self.halparam=halparam - pycomp.newpin(halparam, HAL_FLOAT, HAL_IN) + pycomp.newpin(halparam, Type.REAL, Dir.IN) pyvcp_scale.n += 1 - pycomp.newpin(halpin+"-i", HAL_S32, HAL_OUT) - pycomp.newpin(halpin+"-f", HAL_FLOAT, HAL_OUT) + pycomp.newpin(halpin+"-i", HAL_S32, Dir.OUT) + pycomp.newpin(halpin+"-f", Type.REAL, Dir.OUT) self.bind('',self.wheel_up) self.bind('',self.wheel_down) @@ -1764,7 +1764,7 @@ def __init__(self, master, pycomp, images, halpin=None, **kw): self.halpin = halpin self.value = 0 self.last = None - pycomp.newpin(halpin, self.pintype, HAL_IN) + pycomp.newpin(halpin, self.pintype, Dir.IN) def update(self, pycomp): l = pycomp[self.halpin] @@ -1776,7 +1776,7 @@ def update(self, pycomp): self.last = l class pyvcp_image_bit(_pyvcp_image): - pintype = HAL_BIT + pintype = Type.BOOL class pyvcp_image_u32(_pyvcp_image): pintype = HAL_U32 diff --git a/lib/python/qtvcp/lib/message.py b/lib/python/qtvcp/lib/message.py index 3cc844b7034..e74e111baf7 100644 --- a/lib/python/qtvcp/lib/message.py +++ b/lib/python/qtvcp/lib/message.py @@ -65,18 +65,18 @@ def message_setup(self, hal_comp, window=None, notify=None): # this is how we make a pin that can be connected to a callback if ("none" in details): - D._halpin = self.HAL_GCOMP_.newpin(name, hal.HAL_BIT, hal.HAL_IN) + D._halpin = self.HAL_GCOMP_.newpin(name, hal.Type.BOOL, hal.Dir.IN) else: - D._halpin = self.HAL_GCOMP_.newpin(name, hal.HAL_BIT, hal.HAL_IO) + D._halpin = self.HAL_GCOMP_.newpin(name, hal.Type.BOOL, hal.Dir.IO) D._halpin.value_changed.connect(self.messageCallback(self['dialog-{}'.format(name)], D._halpin, name, boldtext, text, pinname, details, icon)) if ("dialog" in details) and not ("nonedialog" in details): - self.HAL_GCOMP_.newpin(name + "-waiting", hal.HAL_BIT, hal.HAL_OUT) + self.HAL_GCOMP_.newpin(name + "-waiting", hal.Type.BOOL, hal.Dir.OUT) if not ("ok" in details): - self.HAL_GCOMP_.newpin(name + "-response", hal.HAL_BIT, hal.HAL_OUT) - self.HAL_GCOMP_.newpin(name + "-response-s32", hal.HAL_S32, hal.HAL_OUT) + self.HAL_GCOMP_.newpin(name + "-response", hal.Type.BOOL, hal.Dir.OUT) + self.HAL_GCOMP_.newpin(name + "-response-s32", hal.HAL_S32, hal.Dir.OUT) self.HAL_GCOMP_[name + "-response-s32"] = -1 # undetermined if not INFO.USRMULTIMESS_ID is None: @@ -88,13 +88,13 @@ def message_setup(self, hal_comp, window=None, notify=None): D.hal_init(HAL_NAME=name) D.pinname = name - D._halpin = self.HAL_GCOMP_.newpin(name, hal.HAL_S32, hal.HAL_IN) + D._halpin = self.HAL_GCOMP_.newpin(name, hal.HAL_S32, hal.Dir.IN) D._halpin.value_changed.connect(self.multiMessageCallback(D, D._halpin, name, mess, )) if ("dialog" in details) and not ("nonedialog" in details): - self.HAL_GCOMP_.newpin(name + "-waiting", hal.HAL_BIT, hal.HAL_OUT) + self.HAL_GCOMP_.newpin(name + "-waiting", hal.Type.BOOL, hal.Dir.OUT) # This weird code is so we can get access to proper variables. # using clicked.connect( self.on_printmessage(pin,name,bt,t,c) ) apparently doesn't easily diff --git a/lib/python/qtvcp/qt_halobjects.py b/lib/python/qtvcp/qt_halobjects.py index 64b5bb0d28e..97db41a57ac 100644 --- a/lib/python/qtvcp/qt_halobjects.py +++ b/lib/python/qtvcp/qt_halobjects.py @@ -114,16 +114,21 @@ def get_name(self): return self._a[0] class _QHal(object): - HAL_BIT = hal.HAL_BIT - HAL_FLOAT = hal.HAL_FLOAT + HAL_BOOL = hal.Type.BOOL + HAL_REAL = hal.Type.REAL + HAL_SINT = hal.Type.SINT + HAL_UINT = hal.Type.UINT + + HAL_BIT = hal.Type.BOOL # Deprecated + HAL_FLOAT = hal.Type.REAL # Deprecated HAL_S32 = hal.HAL_S32 HAL_U32 = hal.HAL_U32 - HAL_IN = hal.HAL_IN - HAL_OUT = hal.HAL_OUT - HAL_IO = hal.HAL_IO - HAL_RO = hal.HAL_RO - HAL_RW = hal.HAL_RW + HAL_IN = hal.Dir.IN + HAL_OUT = hal.Dir.OUT + HAL_IO = hal.Dir.IO + HAL_RO = hal.Dir.RO + HAL_RW = hal.Dir.RW def __new__(cls, *a, **kw): instance = super(_QHal, cls).__new__(cls) diff --git a/lib/python/qtvcp/widgets/bar.py b/lib/python/qtvcp/widgets/bar.py index 36a1a83020a..e57b6aca887 100644 --- a/lib/python/qtvcp/widgets/bar.py +++ b/lib/python/qtvcp/widgets/bar.py @@ -409,7 +409,9 @@ def resetVert(self): class HALPinType(enum.IntEnum): NONE = 0 S32 = hal.HAL_S32 - FLOAT = hal.HAL_FLOAT + FLOAT= hal.Type.REAL # Deprecated + SINT = hal.Type.SINT + REAL = hal.Type.REAL class HalBar(Bar, _HalWidgetBase): @@ -419,7 +421,9 @@ class HalBar(Bar, _HalWidgetBase): # older version of pyqt5 need this as well as QEnum NONE = 0 S32 = hal.HAL_S32 - FLOAT = hal.HAL_FLOAT + FLOAT= hal.Type.REAL # Deprecated + SINT = hal.Type.SINT + REAL = hal.Type.REAL def __init__(self, *args, **kwargs): super(). __init__( *args, **kwargs) @@ -437,10 +441,10 @@ def _hal_init(self): self._superOpposite = self._opposite if self._pin_type == HALPinType.FLOAT: - self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_FLOAT, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.Type.REAL, hal.Dir.IN) self.hal_pin.value_changed.connect(lambda data: self.updateDisplay(data)) elif self._pin_type == HALPinType.S32: - self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_S32, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_S32, hal.Dir.IN) self.hal_pin.value_changed.connect(lambda data: self.updateDisplay(data)) def updateDisplay(self, data): diff --git a/lib/python/qtvcp/widgets/dialog_widget.py b/lib/python/qtvcp/widgets/dialog_widget.py index c281869bfcb..b3164a8b4d4 100644 --- a/lib/python/qtvcp/widgets/dialog_widget.py +++ b/lib/python/qtvcp/widgets/dialog_widget.py @@ -441,11 +441,11 @@ def _hal_init(self): if not hal.component_exists('hal_manualtoolchange'): oldname = self.HAL_GCOMP_.comp.getprefix() self.HAL_GCOMP_.comp.setprefix('hal_manualtoolchange') - self.hal_pin = self.HAL_GCOMP_.newpin('change', hal.HAL_BIT, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin('change', hal.Type.BOOL, hal.Dir.IN) self.hal_pin.value_changed.connect(self.tool_change) - self.tool_number = self.HAL_GCOMP_.newpin('number', hal.HAL_S32, hal.HAL_IN) - self.changed = self.HAL_GCOMP_.newpin('changed', hal.HAL_BIT, hal.HAL_OUT) - self.ext_ack = self.HAL_GCOMP_.newpin(self.HAL_NAME_ + 'change_button', hal.HAL_BIT, hal.HAL_IN) + self.tool_number = self.HAL_GCOMP_.newpin('number', hal.HAL_S32, hal.Dir.IN) + self.changed = self.HAL_GCOMP_.newpin('changed', hal.Type.BOOL, hal.Dir.OUT) + self.ext_ack = self.HAL_GCOMP_.newpin(self.HAL_NAME_ + 'change_button', hal.Type.BOOL, hal.Dir.IN) self.ext_ack.value_changed.connect(self.external_acknowledge) self.HAL_GCOMP_.comp.setprefix(oldname) else: diff --git a/lib/python/qtvcp/widgets/general_hal_input.py b/lib/python/qtvcp/widgets/general_hal_input.py index 2da821acc0d..942fe4cae22 100644 --- a/lib/python/qtvcp/widgets/general_hal_input.py +++ b/lib/python/qtvcp/widgets/general_hal_input.py @@ -48,14 +48,14 @@ def _hal_init(self): else: pname = self._pin_name if self._bit_pin_type: - ptype = hal.HAL_BIT - self.hal_pin = self.HAL_GCOMP_.newpin(self.HAL_NAME_, hal.HAL_BIT, hal.HAL_IN) + ptype = hal.Type.BOOL + self.hal_pin = self.HAL_GCOMP_.newpin(self.HAL_NAME_, hal.Type.BOOL, hal.Dir.IN) self.hal_pin.value_changed.connect(lambda data: self.pin_update(data)) elif self._float_pin_type: - self.hal_pin = self.HAL_GCOMP_.newpin(self.HAL_NAME_, hal.HAL_FLOAT, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin(self.HAL_NAME_, hal.Type.REAL, hal.Dir.IN) self.hal_pin.value_changed.connect(lambda data: self.pin_update(data)) else: - self.hal_pin = self.HAL_GCOMP_.newpin(self.HAL_NAME_, hal.HAL_S32, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin(self.HAL_NAME_, hal.HAL_S32, hal.Dir.IN) self.hal_pin.value_changed.connect(lambda data: self.pin_update(data)) def pin_update(self, *a): diff --git a/lib/python/qtvcp/widgets/general_hal_output.py b/lib/python/qtvcp/widgets/general_hal_output.py index 4133cd6979e..f04439ab3b7 100644 --- a/lib/python/qtvcp/widgets/general_hal_output.py +++ b/lib/python/qtvcp/widgets/general_hal_output.py @@ -47,16 +47,16 @@ def _hal_init(self): else: pname = self._pin_name if self._bit_pin_type: - ptype = hal.HAL_BIT - self.hal_pin = self.HAL_GCOMP_.newpin(pname, ptype, hal.HAL_OUT) - self.hal_pin_2 = self.HAL_GCOMP_.newpin(pname + "-not", ptype, hal.HAL_OUT) + ptype = hal.Type.BOOL + self.hal_pin = self.HAL_GCOMP_.newpin(pname, ptype, hal.Dir.OUT) + self.hal_pin_2 = self.HAL_GCOMP_.newpin(pname + "-not", ptype, hal.Dir.OUT) if self.istate: self._pin_bit_update(self._initial_float) else: ptype = hal.HAL_S32 - ptype2 = hal.HAL_FLOAT - self.hal_pin = self.HAL_GCOMP_.newpin(pname + '-s32', ptype, hal.HAL_OUT) - self.hal_pin_2 = self.HAL_GCOMP_.newpin(pname + "-float", ptype2, hal.HAL_OUT) + ptype2 = hal.Type.REAL + self.hal_pin = self.HAL_GCOMP_.newpin(pname + '-s32', ptype, hal.Dir.OUT) + self.hal_pin_2 = self.HAL_GCOMP_.newpin(pname + "-float", ptype2, hal.Dir.OUT) if self.istate: self._pin_value_update(self._initial_float) diff --git a/lib/python/qtvcp/widgets/hal_label.py b/lib/python/qtvcp/widgets/hal_label.py index c35ac341d75..81b06784867 100644 --- a/lib/python/qtvcp/widgets/hal_label.py +++ b/lib/python/qtvcp/widgets/hal_label.py @@ -49,13 +49,13 @@ def _hal_init(self): else: pname = self._pin_name if self._bit_pin_type: - self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_BIT, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.Type.BOOL, hal.Dir.IN) self.hal_pin.value_changed.connect(lambda data: self._setText(data)) elif self._float_pin_type: - self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_FLOAT, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.Type.REAL, hal.Dir.IN) self.hal_pin.value_changed.connect(lambda data: self._setText(data)) elif self._s32_pin_type or self._use_multi_label: - self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_S32, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_S32, hal.Dir.IN) if self._s32_pin_type: self.hal_pin.value_changed.connect(lambda data: self._setText(data)) else: diff --git a/lib/python/qtvcp/widgets/hal_selectionbox.py b/lib/python/qtvcp/widgets/hal_selectionbox.py index 3bb466ed9e9..8e3d08e6c74 100644 --- a/lib/python/qtvcp/widgets/hal_selectionbox.py +++ b/lib/python/qtvcp/widgets/hal_selectionbox.py @@ -106,16 +106,21 @@ def selected(self,index): ################################################################ class HALSelectionBox(TreeComboBox, _HalWidgetBase): - HAL_BIT = hal.HAL_BIT - HAL_FLOAT = hal.HAL_FLOAT + HAL_BOOL = hal.Type.BOOL + HAL_REAL = hal.Type.REAL + HAL_SINT = hal.Type.SINT + HAL_UINT = hal.Type.UINT + + HAL_BIT = hal.Type.BOOL # Deprecated + HAL_FLOAT = hal.Type.REAL # Deprecated HAL_S32 = hal.HAL_S32 HAL_U32 = hal.HAL_U32 - HAL_IN = hal.HAL_IN - HAL_OUT = hal.HAL_OUT - HAL_IO = hal.HAL_IO - HAL_RO = hal.HAL_RO - HAL_RW = hal.HAL_RW + HAL_IN = hal.Dir.IN + HAL_OUT = hal.Dir.OUT + HAL_IO = hal.Dir.IO + HAL_RO = hal.Dir.RO + HAL_RW = hal.Dir.RW PINS = 1 SIGS = SIGNALS = 2 @@ -123,9 +128,9 @@ class HALSelectionBox(TreeComboBox, _HalWidgetBase): def __init__(self, parent=None): super(HALSelectionBox, self).__init__(parent) - self.PINTYPE = [self.HAL_BIT,self.HAL_FLOAT,self.HAL_S32,self.HAL_U32] + self.PINTYPE = [self.HAL_BOOL,self.HAL_REAL,self.HAL_S32,self.HAL_U32] self.PINDIRECTION = [self.HAL_IN, self.HAL_OUT] - self.SIGTYPE = [self.HAL_BIT,self.HAL_FLOAT,self.HAL_S32,self.HAL_U32] + self.SIGTYPE = [self.HAL_BOOL,self.HAL_REAL,self.HAL_S32,self.HAL_U32] self.SIGDRIVEN = [True, False] self.PARAMTYPE = [self.HAL_RO, self.HAL_RW] self.SHOWTYPES = [self.PINS] @@ -187,30 +192,30 @@ def _hal_init(self): self.view().adjustSize() def setShowTypes(self, types): - ''' Sets the pin type: HAL_BIT,HAL_FLOAT,HAL_S32,HAL_U32 + ''' Sets the pin type: HAL_BOOL,HAL_REAL,HAL_S32,HAL_U32 that will be shown in the combbox. widget defaults to all pin types shown - ie. combobox.setShowTypes([combobox.HAL_BIT])''' + ie. combobox.setShowTypes([combobox.HAL_BOOL])''' self.SHOWTYPES = types def setPinTypes(self, \ - types = [HAL_BIT,HAL_FLOAT,HAL_S32,HAL_U32], \ + types = [HAL_BOOL,HAL_REAL,HAL_S32,HAL_U32], \ direction = [HAL_IN, HAL_OUT]): - ''' Sets the pin type: HAL_BIT,HAL_FLOAT,HAL_S32,HAL_U32 + ''' Sets the pin type: HAL_BOOL,HAL_REAL,HAL_S32,HAL_U32 and direction: HAL_IN, HAL_OUT that will be shown in combobox. widget defaults to all pins, all directions. - ie. combobox.setPinTypes([combobox.HAL_BIT], direction = [HAL_IN])''' + ie. combobox.setPinTypes([combobox.HAL_BOOL], direction = [HAL_IN])''' self.PINTYPE = types self.PINDIRECTION = direction def setSignalTypes(self, \ - types = [HAL_BIT,HAL_FLOAT,HAL_S32,HAL_U32], \ + types = [HAL_BOOL,HAL_REAL,HAL_S32,HAL_U32], \ driven = [True, False]): - ''' Sets the pin type: HAL_BIT,HAL_FLOAT,HAL_S32,HAL_U32 + ''' Sets the pin type: HAL_BOOL,HAL_REAL,HAL_S32,HAL_U32 and what type of signals (driven by a pin, not or both). True being driven and False being un-driven signals - combobox.setSignalTypes([combobox.HAL_BIT], direction = [True,False])''' + combobox.setSignalTypes([combobox.HAL_BOOL], direction = [True,False])''' self.SIGTYPE = types self.SIGDRIVEN = driven diff --git a/lib/python/qtvcp/widgets/joypad.py b/lib/python/qtvcp/widgets/joypad.py index fd35549ebc2..223f459c34d 100644 --- a/lib/python/qtvcp/widgets/joypad.py +++ b/lib/python/qtvcp/widgets/joypad.py @@ -539,9 +539,12 @@ def __setitem__(self, item, value): class HALPinType(enum.IntEnum): NONE = 0 - BIT = hal.HAL_BIT - S32 = hal.HAL_S32 - FLOAT = hal.HAL_FLOAT + BIT = hal.Type.BOOL # Deprecated + S32 = hal.HAL_S32 + FLOAT= hal.Type.REAL # Deprecated + BOOL = hal.Type.BOOL + SINT = hal.Type.SINT + REAL = hal.Type.REAL class HALPad(JoyPad, _HalWidgetBase): HALPinType = HALPinType @@ -549,14 +552,17 @@ class HALPad(JoyPad, _HalWidgetBase): # older version of pyqt5 need this as well as QEnum NONE = 0 - BIT = hal.HAL_BIT - S32 = hal.HAL_S32 - FLOAT = hal.HAL_FLOAT + BIT = hal.Type.BOOL # Deprecated + S32 = hal.HAL_S32 + FLOAT= hal.Type.REAL # Deprecated + BOOL = hal.Type.BOOL + SINT = hal.Type.SINT + REAL = hal.Type.REAL def __init__(self, parent=None): super(HALPad, self).__init__(parent) self._pin_name = '' - self._pin_type = HALPinType.BIT + self._pin_type = HALPinType.BOOL self._trueOutputR = 1.0 self._trueOutputL = 1.0 @@ -579,22 +585,22 @@ def _hal_init(self): pname = self._pin_name if not self._pin_type == HALPinType.NONE: ptype = self._pin_type - self.halPinR = self.HAL_GCOMP_.newpin(pname + '.right', ptype, hal.HAL_OUT) - self.halPinL = self.HAL_GCOMP_.newpin(pname + '.left', ptype, hal.HAL_OUT) - self.halPinT = self.HAL_GCOMP_.newpin(pname + '.top', ptype, hal.HAL_OUT) - self.halPinB = self.HAL_GCOMP_.newpin(pname + '.bottom', ptype, hal.HAL_OUT) - self.halPinC = self.HAL_GCOMP_.newpin(pname + '.center', ptype, hal.HAL_OUT) + self.halPinR = self.HAL_GCOMP_.newpin(pname + '.right', ptype, hal.Dir.OUT) + self.halPinL = self.HAL_GCOMP_.newpin(pname + '.left', ptype, hal.Dir.OUT) + self.halPinT = self.HAL_GCOMP_.newpin(pname + '.top', ptype, hal.Dir.OUT) + self.halPinB = self.HAL_GCOMP_.newpin(pname + '.bottom', ptype, hal.Dir.OUT) + self.halPinC = self.HAL_GCOMP_.newpin(pname + '.center', ptype, hal.Dir.OUT) if not self._highlightPosition == IndicatorPosition.NONE: - self.halPinLightCenter = self.HAL_GCOMP_.newpin(pname + '.light.center', hal.HAL_BIT, hal.HAL_IN) + self.halPinLightCenter = self.HAL_GCOMP_.newpin(pname + '.light.center', hal.Type.BOOL, hal.Dir.IN) self.halPinLightCenter.value_changed.connect(lambda data: self.setLight(data)) def _pressedOutput(self, btncode): self.joy_btn_pressed.emit(btncode) self['joy_{}_pressed'.format(btncode.lower())].emit(True) - if self._pin_type == HALPinType.BIT: + if self._pin_type == HALPinType.BOOL: data = True - elif self._pin_type == HALPinType.FLOAT: + elif self._pin_type == HALPinType.REAL: data = float(self['_trueOutput{}'.format(btncode)]) elif self._pin_type == HALPinType.S32: data = int(self['_trueOutput{}'.format(btncode)]) @@ -609,9 +615,9 @@ def _releasedOutput(self, btncode): self.joy_btn_released.emit(btncode) self['joy_{}_released'.format(btncode.lower())].emit(False) - if self._pin_type == HALPinType.BIT: + if self._pin_type == HALPinType.BOOL: data = False - elif self._pin_type == HALPinType.FLOAT: + elif self._pin_type == HALPinType.REAL: data = float(self._falseOutput) elif self._pin_type == HALPinType.S32: data = int(self._falseOutput) @@ -645,7 +651,7 @@ def set_pin_type(self, value): def get_pin_type(self): return self._pin_type def reset_pin_type(self): - self._pin_type = HALPinType.BIT + self._pin_type = HALPinType.BOOL # designer will show these properties in this order: pin_type = QtCore.Property(HALPinType, get_pin_type, set_pin_type, reset_pin_type) diff --git a/lib/python/qtvcp/widgets/simple_widgets.py b/lib/python/qtvcp/widgets/simple_widgets.py index 8af83620e10..2697fa53b1a 100644 --- a/lib/python/qtvcp/widgets/simple_widgets.py +++ b/lib/python/qtvcp/widgets/simple_widgets.py @@ -45,9 +45,12 @@ class HALPinType(enum.IntEnum): NONE = 0 - BIT = hal.HAL_BIT - S32 = hal.HAL_S32 - FLOAT = hal.HAL_FLOAT + BIT = hal.Type.BOOL # Deprecated + S32 = hal.HAL_S32 + FLOAT= hal.Type.REAL # Deprecated + BOOL = hal.Type.BOOL + SINT = hal.Type.SINT + REAL = hal.Type.REAL # reacts to HAL pin changes class LCDNumber(QtWidgets.QLCDNumber, _HalWidgetBase): @@ -64,13 +67,13 @@ def _hal_init(self): else: pname = self._pin_name_ if self._bit_pin_type: - self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_BIT, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.Type.BOOL, hal.Dir.IN) self.hal_pin.value_changed.connect(lambda data: self.updateDisplay(data)) elif self._float_pin_type: - self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_FLOAT, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.Type.REAL, hal.Dir.IN) self.hal_pin.value_changed.connect(lambda data: self.updateFloatDisplay(data)) elif self._s32_pin_type: - self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_S32, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_S32, hal.Dir.IN) self.hal_pin.value_changed.connect(lambda data: self.updateDisplay(data)) def updateDisplay(self, data): @@ -177,9 +180,9 @@ def _hal_init(self): pname = self.HAL_NAME_ else: pname = self._pin_name_ - self.hal_pin_s = self.HAL_GCOMP_.newpin(str(pname +'-s'), hal.HAL_S32, hal.HAL_OUT) - self.hal_pin_f = self.HAL_GCOMP_.newpin(pname +'-f', hal.HAL_FLOAT, hal.HAL_OUT) - self.hal_pin_scale = self.HAL_GCOMP_.newpin(pname +'-scale', hal.HAL_FLOAT, hal.HAL_IN) + self.hal_pin_s = self.HAL_GCOMP_.newpin(str(pname +'-s'), hal.HAL_S32, hal.Dir.OUT) + self.hal_pin_f = self.HAL_GCOMP_.newpin(pname +'-f', hal.Type.REAL, hal.Dir.OUT) + self.hal_pin_scale = self.HAL_GCOMP_.newpin(pname +'-scale', hal.Type.REAL, hal.Dir.IN) self.hal_pin_scale.set(1) self.updateValue(self.value()) self.valueChanged.connect(lambda data:self.updateValue(data)) @@ -212,10 +215,10 @@ def _hal_init(self): pname = self.HAL_NAME_ else: pname = self._pin_name_ - self.hal_pin_s = self.HAL_GCOMP_.newpin(str(pname +'-s'), hal.HAL_S32, hal.HAL_OUT) - self.hal_pin_f = self.HAL_GCOMP_.newpin(pname +'-f', hal.HAL_FLOAT, hal.HAL_OUT) - self.hal_pin_d = self.HAL_GCOMP_.newpin(pname +'-d', hal.HAL_FLOAT, hal.HAL_OUT) - self.hal_pin_scale = self.HAL_GCOMP_.newpin(pname +'-scale', hal.HAL_FLOAT, hal.HAL_IN) + self.hal_pin_s = self.HAL_GCOMP_.newpin(str(pname +'-s'), hal.HAL_S32, hal.Dir.OUT) + self.hal_pin_f = self.HAL_GCOMP_.newpin(pname +'-f', hal.Type.REAL, hal.Dir.OUT) + self.hal_pin_d = self.HAL_GCOMP_.newpin(pname +'-d', hal.Type.REAL, hal.Dir.OUT) + self.hal_pin_scale = self.HAL_GCOMP_.newpin(pname +'-scale', hal.Type.REAL, hal.Dir.IN) self.hal_pin_scale.value_changed.connect(lambda data: self.updateScale(data)) self.hal_pin_scale.set(1) self.updateCount(self.value()) @@ -359,9 +362,12 @@ class PushButton(QtWidgets.QPushButton, IndicatedMixIn): # older version of pyqt5 need this as well as QEnum NONE = 0 - BIT = hal.HAL_BIT - S32 = hal.HAL_S32 - FLOAT = hal.HAL_FLOAT + BIT = hal.Type.BOOL # Deprecated + S32 = hal.HAL_S32 + FLOAT= hal.Type.REAL # Deprecated + BOOL = hal.Type.BOOL + SINT = hal.Type.SINT + REAL = hal.Type.REAL def __init__(self, parent=None): super(PushButton, self).__init__(parent) @@ -397,7 +403,7 @@ def _hal_init(self): pname = self.HAL_NAME_ else: pname = self._pin_name_ - self.hal_pin = self.HAL_GCOMP_.newpin(str(pname), hal.HAL_BIT, hal.HAL_OUT) + self.hal_pin = self.HAL_GCOMP_.newpin(str(pname), hal.Type.BOOL, hal.Dir.OUT) super(PushButton, self)._hal_init() @@ -434,7 +440,7 @@ def makeGroupPin(self): pname = self.HAL_NAME_ + '.exclusive'+name else: pname = self._groupPinName - self.halPinGroup = self.HAL_GCOMP_.newpin(pname , ptype, hal.HAL_OUT) + self.halPinGroup = self.HAL_GCOMP_.newpin(pname , ptype, hal.Dir.OUT) break break @@ -452,9 +458,9 @@ def updateGroup(self): #print('value:',value) break - if self._pin_type == HALPinType.BIT: + if self._pin_type == HALPinType.BOOL: data = bool(value) - elif self._pin_type == HALPinType.FLOAT: + elif self._pin_type == HALPinType.REAL: data = float(value) elif self._pin_type == HALPinType.S32: data = int(value) diff --git a/lib/python/qtvcp/widgets/widget_baseclass.py b/lib/python/qtvcp/widgets/widget_baseclass.py index 23bfa396f45..49ce0e8a1e1 100644 --- a/lib/python/qtvcp/widgets/widget_baseclass.py +++ b/lib/python/qtvcp/widgets/widget_baseclass.py @@ -120,8 +120,8 @@ def _hal_init(self): pname = self.HAL_NAME_ else: pname = self._pin_name_ - self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_BIT, hal.HAL_OUT) - self.hal_pin_not = self.HAL_GCOMP_.newpin(pname + "-not", hal.HAL_BIT, hal.HAL_OUT) + self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.Type.BOOL, hal.Dir.OUT) + self.hal_pin_not = self.HAL_GCOMP_.newpin(pname + "-not", hal.Type.BOOL, hal.Dir.OUT) self.toggled.connect(lambda data: self._pin_update(data)) def _pin_update(self, state): @@ -142,8 +142,8 @@ def _hal_init(self): pname = self.HAL_NAME_ else: pname = self._pin_name_ - self.hal_pin_f = self.HAL_GCOMP_.newpin(pname + "-f", hal.HAL_FLOAT, hal.HAL_OUT) - self.hal_pin_s = self.HAL_GCOMP_.newpin(pname + "-s", hal.HAL_S32, hal.HAL_OUT) + self.hal_pin_f = self.HAL_GCOMP_.newpin(pname + "-f", hal.Type.REAL, hal.Dir.OUT) + self.hal_pin_s = self.HAL_GCOMP_.newpin(pname + "-s", hal.HAL_S32, hal.Dir.OUT) self.valueChanged.connect(lambda data: self._pin_update(data)) # default scale self.input = 1 @@ -169,7 +169,7 @@ def _hal_init(self): pname = self.HAL_NAME_ else: pname = self._pin_name_ - self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.HAL_BIT, hal.HAL_IN) + self.hal_pin = self.HAL_GCOMP_.newpin(pname, hal.Type.BOOL, hal.Dir.IN) self.hal_pin.value_changed.connect(lambda s: self.setEnabled(s)) def set_pin_name(self, value): diff --git a/lib/python/raster.py b/lib/python/raster.py index 4e87095c3bb..574fdc06c8b 100644 --- a/lib/python/raster.py +++ b/lib/python/raster.py @@ -54,10 +54,10 @@ def __init__(self, name): """ self.__timeout = 5.0 self.component = hal.component(name) - self.port = self.component.newpin("program", hal.HAL_PORT, hal.HAL_OUT) - self.faultCode = self.component.newpin("fault-code", hal.HAL_S32, hal.HAL_IN) - self.enabled = self.component.newpin("enabled", hal.HAL_BIT, hal.HAL_IN) - self.run = self.component.newpin("run", hal.HAL_BIT, hal.HAL_OUT) + self.port = self.component.newpin("program", hal.Type.PORT, hal.Dir.OUT) + self.faultCode = self.component.newpin("fault-code", hal.HAL_S32, hal.Dir.IN) + self.enabled = self.component.newpin("enabled", hal.Type.BOOL, hal.Dir.IN) + self.run = self.component.newpin("run", hal.Type.BOOL, hal.Dir.OUT) self.component.ready() self.run.value = False diff --git a/nc_files/remap_lib/python-stdglue/stdglue.py b/nc_files/remap_lib/python-stdglue/stdglue.py index a3b93019afa..19d29d93520 100644 --- a/nc_files/remap_lib/python-stdglue/stdglue.py +++ b/nc_files/remap_lib/python-stdglue/stdglue.py @@ -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: diff --git a/share/qtvcp/panels/qtplasmac_sim/qtplasmac_sim_handler.py b/share/qtvcp/panels/qtplasmac_sim/qtplasmac_sim_handler.py index 8e6ea7632fb..86ce65d815d 100644 --- a/share/qtvcp/panels/qtplasmac_sim/qtplasmac_sim_handler.py +++ b/share/qtvcp/panels/qtplasmac_sim/qtplasmac_sim_handler.py @@ -53,15 +53,15 @@ def initialized__(self): appPath = os.path.realpath(os.path.dirname(sys.argv[0])) self.iconBase = '/usr' if appPath == '/usr/bin' else appPath.replace('/bin', '/debian/extras/usr') self.w.setWindowIcon(QIcon(os.path.join(self.iconBase, self.iconPath))) - self.arcVoltsOffsetPin = self.hal.newpin('arc_voltage_offset-f', hal.HAL_FLOAT, hal.HAL_OUT) - self.breakPin = self.hal.newpin('sensor_breakaway', hal.HAL_BIT, hal.HAL_OUT) - self.floatPin = self.hal.newpin('sensor_float', hal.HAL_BIT, hal.HAL_OUT) - self.materialPin = self.hal.newpin('material_height', hal.HAL_FLOAT, hal.HAL_IN) - self.ohmicPin = self.hal.newpin('sensor_ohmic', hal.HAL_BIT, hal.HAL_OUT) - self.torchPin = self.hal.newpin('torch_on', hal.HAL_BIT, hal.HAL_IN) - self.statePin = self.hal.newpin('state', hal.HAL_S32, hal.HAL_IN) - self.stylePin = self.hal.newpin('style_update', hal.HAL_BIT, hal.HAL_IN) - self.zPosPin = self.hal.newpin('z_position', hal.HAL_FLOAT, hal.HAL_IN) + self.arcVoltsOffsetPin = self.hal.newpin('arc_voltage_offset-f', hal.Type.REAL, hal.Dir.OUT) + self.breakPin = self.hal.newpin('sensor_breakaway', hal.Type.BOOL, hal.Dir.OUT) + self.floatPin = self.hal.newpin('sensor_float', hal.Type.BOOL, hal.Dir.OUT) + self.materialPin = self.hal.newpin('material_height', hal.Type.REAL, hal.Dir.IN) + self.ohmicPin = self.hal.newpin('sensor_ohmic', hal.Type.BOOL, hal.Dir.OUT) + self.torchPin = self.hal.newpin('torch_on', hal.Type.BOOL, hal.Dir.IN) + self.statePin = self.hal.newpin('state', hal.HAL_S32, hal.Dir.IN) + self.stylePin = self.hal.newpin('style_update', hal.Type.BOOL, hal.Dir.IN) + self.zPosPin = self.hal.newpin('z_position', hal.Type.REAL, hal.Dir.IN) simStepconf = False for sig in hal.get_info_signals(): if sig['NAME'] == 'Zjoint-pos-fb': diff --git a/share/qtvcp/panels/test_button/test_button_handler.py b/share/qtvcp/panels/test_button/test_button_handler.py index e25ca9ce492..27098841928 100644 --- a/share/qtvcp/panels/test_button/test_button_handler.py +++ b/share/qtvcp/panels/test_button/test_button_handler.py @@ -121,8 +121,8 @@ def addButton(self): # combo box for HAL pin selection cb = HALSelectionBox() cb.setShowTypes([cb.PINS,cb.SIGNALS]) - cb.setPinTypes([cb.HAL_BIT], direction = [cb.HAL_IN]) - cb.setSignalTypes([cb.HAL_BIT], driven = [False,True]) + cb.setPinTypes([cb.HAL_BOOL], direction = [cb.HAL_IN]) + cb.setSignalTypes([cb.HAL_BOOL], driven = [False,True]) cb.hal_init() cb.objectSelected.connect(lambda w: self.selectedUpdated(w, button)) diff --git a/share/qtvcp/panels/test_dial/test_dial_handler.py b/share/qtvcp/panels/test_dial/test_dial_handler.py index 4dd967e3941..cde6d1d9906 100644 --- a/share/qtvcp/panels/test_dial/test_dial_handler.py +++ b/share/qtvcp/panels/test_dial/test_dial_handler.py @@ -56,7 +56,7 @@ def initialized__(self): cb = HALSelectionBox() cb.setShowTypes([cb.SIGNALS]) - cb.setSignalTypes([cb.HAL_FLOAT], driven = [False,True]) + cb.setSignalTypes([cb.HAL_REAL], driven = [False,True]) cb.hal_init() cb.currentTextChanged.connect(self.signalSelected) hbox.addWidget(cb) diff --git a/share/qtvcp/panels/test_led/test_led_handler.py b/share/qtvcp/panels/test_led/test_led_handler.py index bd4189018c7..a91a543d888 100644 --- a/share/qtvcp/panels/test_led/test_led_handler.py +++ b/share/qtvcp/panels/test_led/test_led_handler.py @@ -121,8 +121,8 @@ def addLED(self): # combo box for HAL pin selection cb = HALSelectionBox() cb.setShowTypes([cb.PINS,cb.SIGNALS]) - cb.setPinTypes([cb.HAL_BIT]) - cb.setSignalTypes([cb.HAL_BIT], driven = [False,True]) + cb.setPinTypes([cb.HAL_BOOL]) + cb.setSignalTypes([cb.HAL_BOOL], driven = [False,True]) cb.hal_init() cb.selectionUpdated.connect(lambda w: self.signalSelected(w,led)) diff --git a/share/qtvcp/screens/qtaxis/qtaxis_handler.py b/share/qtvcp/screens/qtaxis/qtaxis_handler.py index 0f447aca9ab..d5827821182 100644 --- a/share/qtvcp/screens/qtaxis/qtaxis_handler.py +++ b/share/qtvcp/screens/qtaxis/qtaxis_handler.py @@ -399,14 +399,14 @@ def init_pins(self): # external jogging control pins for i in INFO.AVAILABLE_JOINTS: self['jog_joint_{}_pin'.format(i)] = \ - QHAL.newpin("joint-{}-selected".format(i), QHAL.HAL_BIT, QHAL.HAL_OUT) + QHAL.newpin("joint-{}-selected".format(i), QHAL.HAL_BOOL, QHAL.HAL_OUT) for i in INFO.AVAILABLE_AXES: self['jog_axis_{}_pin'.format(i)] = \ - QHAL.newpin("axis-{}-selected".format(i.lower()), QHAL.HAL_BIT, QHAL.HAL_OUT) + QHAL.newpin("axis-{}-selected".format(i.lower()), QHAL.HAL_BOOL, QHAL.HAL_OUT) # screen MPG controls 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)) - self.pin_mpg_enabled = QHAL.newpin('mpg-enable',QHAL.HAL_BIT, QHAL.HAL_IN) + self.pin_mpg_enabled = QHAL.newpin('mpg-enable',QHAL.HAL_BOOL, QHAL.HAL_IN) def saveSettings(self): # Record the toolbar settings diff --git a/share/qtvcp/screens/qtdragon/qtdragon_handler.py b/share/qtvcp/screens/qtdragon/qtdragon_handler.py index e6460795b0e..41b842de940 100644 --- a/share/qtvcp/screens/qtdragon/qtdragon_handler.py +++ b/share/qtvcp/screens/qtdragon/qtdragon_handler.py @@ -331,10 +331,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.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v)) - pin = QHAL.newPin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN) + pin = QHAL.newPin("spindle-volts", QHAL.HAL_REAL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v)) pin = QHAL.newPin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN) @@ -347,35 +347,35 @@ def init_pins(self): pin = QHAL.newPin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v)) - 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.pinValueChanged.connect(lambda p,v: self.mb_connection_changed(v)) - 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.pinValueChanged.connect(lambda p,v: self.btn_pause_clicked(v)) # 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.pinValueChanged.connect(lambda p,v: self.external_offset_state_changed(v)) # 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) # MPG scrolling pin self.pin_mpg_in = QHAL.newPin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN) self.pin_mpg_in.pinValueChanged.connect(lambda p,v: self.external_mpg(v)) # dialog answer pins - pin = QHAL.newPin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-ok", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,1)) - pin = QHAL.newPin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-no", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,2)) - pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,0)) def init_preferences(self): diff --git a/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py b/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py index fcba159bd4b..7c6055aca71 100644 --- a/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py +++ b/share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py @@ -260,10 +260,10 @@ def initialized__(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.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v)) - pin = QHAL.newPin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN) + pin = QHAL.newPin("spindle-volts", QHAL.HAL_REAL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v)) pin = QHAL.newPin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN) @@ -276,42 +276,42 @@ def init_pins(self): pin = QHAL.newPin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v)) - 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.pinValueChanged.connect(lambda p,v: self.mb_connection_changed(v)) - 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.pinValueChanged.connect(lambda p,v: self.btn_pause_clicked(v)) # 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'] = False QHAL.newPin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT) QHAL.newPin("eoffset-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) # total external offsets - pin = QHAL.newPin("eoffset-value", QHAL.HAL_FLOAT, QHAL.HAL_IN) + pin = QHAL.newPin("eoffset-value", QHAL.HAL_REAL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.external_offset_state_changed(v)) pin = QHAL.newPin("eoffset-zlevel-count", QHAL.HAL_S32, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.comp_count_changed(v)) - QHAL.newPin("comp-on", QHAL.HAL_BIT, QHAL.HAL_OUT) - QHAL.newPin("spindle-lift-on", QHAL.HAL_BIT, QHAL.HAL_OUT) + QHAL.newPin("comp-on", QHAL.HAL_BOOL, QHAL.HAL_OUT) + QHAL.newPin("spindle-lift-on", QHAL.HAL_BOOL, QHAL.HAL_OUT) # MPG scrolling pin self.pin_mpg_in = QHAL.newPin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN) self.pin_mpg_in.pinValueChanged.connect(lambda p,v: self.external_mpg(v)) # dialog answer pins - pin = QHAL.newPin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-ok", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,1)) - pin = QHAL.newPin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-no", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,2)) - pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,0)) def init_preferences(self): diff --git a/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py b/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py index 589c95b4959..dd6829fe5c7 100644 --- a/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py +++ b/share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py @@ -260,10 +260,10 @@ def initialized__(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.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v)) - pin = QHAL.newPin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN) + pin = QHAL.newPin("spindle-volts", QHAL.HAL_REAL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v)) pin = QHAL.newPin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN) @@ -276,42 +276,42 @@ def init_pins(self): pin = QHAL.newPin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v)) - 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.pinValueChanged.connect(lambda p,v: self.mb_connection_changed(v)) - 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.pinValueChanged.connect(lambda p,v: self.btn_pause_clicked(v)) # 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'] = False QHAL.newPin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT) QHAL.newPin("eoffset-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) # total external offsets - pin = QHAL.newPin("eoffset-value", QHAL.HAL_FLOAT, QHAL.HAL_IN) + pin = QHAL.newPin("eoffset-value", QHAL.HAL_REAL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.external_offset_state_changed(v)) pin = QHAL.newPin("eoffset-zlevel-count", QHAL.HAL_S32, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.comp_count_changed(v)) - QHAL.newPin("comp-on", Qhal.HAL_BIT, Qhal.HAL_OUT) - QHAL.newPin("spindle-lift-on", Qhal.HAL_BIT, Qhal.HAL_OUT) + QHAL.newPin("comp-on", QHAL.HAL_BOOL, QHAL.HAL_OUT) + QHAL.newPin("spindle-lift-on", QHAL.HAL_BOOL, QHAL.HAL_OUT) # MPG scrolling pin self.pin_mpg_in = QHAL.newPin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN) self.pin_mpg_in.pinValueChanged.connect(lambda p,v: self.external_mpg(v)) # dialog answer pins - pin = QHAL.newPin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-ok", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,1)) - pin = QHAL.newPin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-no", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,2)) - pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,0)) def init_preferences(self): diff --git a/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py b/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py index e1a480d7ffe..698eb9de9b1 100644 --- a/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py +++ b/share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py @@ -321,10 +321,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.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v)) - pin = QHAL.newPin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN) + pin = QHAL.newPin("spindle-volts", QHAL.HAL_REAL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v)) pin = QHAL.newPin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN) @@ -337,34 +337,34 @@ def init_pins(self): pin = QHAL.newPin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v)) - 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.pinValueChanged.connect(lambda p,v: self.mb_connection_changed(v)) - 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.pinValueChanged.connect(lambda p,v: self.btn_pause_clicked(v)) # 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.pinValueChanged.connect(lambda p,v: self.external_offset_state_changed(v)) # 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.pinValueChanged.connect(lambda p,v: self.external_mpg(v)) # dialog answer pins - pin = QHAL.newPin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-ok", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,1)) - pin = QHAL.newPin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-no", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,2)) - pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN) + pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BOOL, QHAL.HAL_IN) pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,0)) def init_preferences(self): diff --git a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py index b6fdc3d0865..23e54a2518f 100644 --- a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py +++ b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py @@ -842,97 +842,97 @@ def new_process_error(self, w, kind, text): ######################################################################################################################### def make_hal_pins(self): - self.consChangePin = self.h.newpin('consumable_changing', hal.HAL_BIT, hal.HAL_IN) - self.convTabDisable = self.h.newpin('conv_disable', hal.HAL_BIT, hal.HAL_IN) - self.cutTypePin = self.h.newpin('cut_type', hal.HAL_S32, hal.HAL_IN) - self.developmentPin = self.h.newpin('development', hal.HAL_BIT, hal.HAL_IN) - self.extAbortPin = self.h.newpin('ext_abort', hal.HAL_BIT, hal.HAL_IN) - self.extAutoVoltsEnablePin = self.h.newpin('ext_auto_volts_enable', hal.HAL_BIT, hal.HAL_IN) - self.extChangeConsPin = self.h.newpin('ext_consumables', hal.HAL_BIT, hal.HAL_IN) - self.extCornerLockEnablePin = self.h.newpin('ext_cornerlock_enable', hal.HAL_BIT, hal.HAL_IN) - self.extCutRecCancelPin = self.h.newpin('ext_cutrec_cancel', hal.HAL_BIT, hal.HAL_IN) - self.extCutRecRevPin = self.h.newpin('ext_cutrec_rev', hal.HAL_BIT, hal.HAL_IN) - self.extCutRecFwdPin = self.h.newpin('ext_cutrec_fwd', hal.HAL_BIT, hal.HAL_IN) - self.extCutRecNPin = self.h.newpin('ext_cutrec_n', hal.HAL_BIT, hal.HAL_IN) - self.extCutRecNEPin = self.h.newpin('ext_cutrec_ne', hal.HAL_BIT, hal.HAL_IN) - self.extCutRecEPin = self.h.newpin('ext_cutrec_e', hal.HAL_BIT, hal.HAL_IN) - self.extCutRecSEPin = self.h.newpin('ext_cutrec_se', hal.HAL_BIT, hal.HAL_IN) - self.extCutRecSPin = self.h.newpin('ext_cutrec_s', hal.HAL_BIT, hal.HAL_IN) - self.extCutRecSWPin = self.h.newpin('ext_cutrec_sw', hal.HAL_BIT, hal.HAL_IN) - self.extCutRecWPin = self.h.newpin('ext_cutrec_w', hal.HAL_BIT, hal.HAL_IN) - self.extCutRecNWPin = self.h.newpin('ext_cutrec_nw', hal.HAL_BIT, hal.HAL_IN) - self.extFramingPin = self.h.newpin('ext_frame_job', hal.HAL_BIT, hal.HAL_IN) - self.extHeightOvrCountsPin = self.h.newpin('ext_height_ovr_counts', hal.HAL_S32, hal.HAL_IN) - self.extHeightOvrCountEnablePin = self.h.newpin('ext_height_ovr_count_enable', hal.HAL_BIT, hal.HAL_IN) - self.extHeightOvrMinusPin = self.h.newpin('ext_height_ovr_minus', hal.HAL_BIT, hal.HAL_IN) - self.extHeightOvrPlusPin = self.h.newpin('ext_height_ovr_plus', hal.HAL_BIT, hal.HAL_IN) - self.extHeightOvrResetPin = self.h.newpin('ext_height_ovr_reset', hal.HAL_BIT, hal.HAL_IN) - self.extHeightOvrScalePin = self.h.newpin('ext_height_ovr_scale', hal.HAL_FLOAT, hal.HAL_IN) - self.extIgnoreArcOkPin = self.h.newpin('ext_ignore_arc_ok', hal.HAL_BIT, hal.HAL_IN) - self.extJogSlowPin = self.h.newpin('ext_jog_slow', hal.HAL_BIT, hal.HAL_IN) -# self.extKerfCrossEnablePin = self.h.newpin('ext_kerfcross_enable', hal.HAL_BIT, hal.HAL_IN) - self.extLaserTouchOffPin = self.h.newpin('ext_laser_touchoff', hal.HAL_BIT, hal.HAL_IN) - self.extLaserTogglePin = self.h.newpin('ext_laser_toggle', hal.HAL_BIT, hal.HAL_IN) - self.extMeshModePin = self.h.newpin('ext_mesh_mode', hal.HAL_BIT, hal.HAL_IN) - self.extOhmicPin = self.h.newpin('ext_ohmic', hal.HAL_BIT, hal.HAL_IN) - self.extOhmicProbeEnablePin = self.h.newpin('ext_ohmic_probe_enable', hal.HAL_BIT, hal.HAL_IN) - self.extPausePin = self.h.newpin('ext_pause', hal.HAL_BIT, hal.HAL_IN) - self.extPauseOnlyPin = self.h.newpin('ext_pause_only', hal.HAL_BIT, hal.HAL_IN) - self.extPowerPin = self.h.newpin('ext_power', hal.HAL_BIT, hal.HAL_IN) - self.extProbePin = self.h.newpin('ext_probe', hal.HAL_BIT, hal.HAL_IN) - self.extPulsePin = self.h.newpin('ext_pulse', hal.HAL_BIT, hal.HAL_IN) - self.extResumePin = self.h.newpin('ext_resume', hal.HAL_BIT, hal.HAL_IN) - self.extRunPausePin = self.h.newpin('ext_run_pause', hal.HAL_BIT, hal.HAL_IN) - self.extRunPin = self.h.newpin('ext_run', hal.HAL_BIT, hal.HAL_IN) - self.extThcEnablePin = self.h.newpin('ext_thc_enable', hal.HAL_BIT, hal.HAL_IN) - self.extTorchEnablePin = self.h.newpin('ext_torch_enable', hal.HAL_BIT, hal.HAL_IN) - self.extTouchOffPin = self.h.newpin('ext_touchoff', hal.HAL_BIT, hal.HAL_IN) - self.extVoidLockEnablePin = self.h.newpin('ext_voidlock_enable', hal.HAL_BIT, hal.HAL_IN) - self.gcodeScalePin = self.h.newpin('gcode_scale', hal.HAL_FLOAT, hal.HAL_OUT) - self.heightOverridePin = self.h.newpin('height_override', hal.HAL_FLOAT, hal.HAL_OUT) - self.jogInhibited = self.h.newpin('jog_inhibited', hal.HAL_BIT, hal.HAL_IN) - self.laserOnPin = self.h.newpin('laser_on', hal.HAL_BIT, hal.HAL_OUT) - self.offsetSetProbePin = self.h.newpin('offset_set_probe', hal.HAL_BIT, hal.HAL_OUT) - self.offsetSetScribePin = self.h.newpin('offset_set_scribe', hal.HAL_BIT, hal.HAL_OUT) - self.laserRecStatePin = self.h.newpin('laser_recovery_state', hal.HAL_S32, hal.HAL_IN) - self.materialChangePin = self.h.newpin('material_change', hal.HAL_S32, hal.HAL_IN) - self.materialChangeNumberPin = self.h.newpin('material_change_number', hal.HAL_S32, hal.HAL_IN) - self.materialChangeTimeoutPin = self.h.newpin('material_change_timeout', hal.HAL_BIT, hal.HAL_IN) - self.materialReloadPin = self.h.newpin('material_reload', hal.HAL_BIT, hal.HAL_IN) - self.materialTempPin = self.h.newpin('material_temp', hal.HAL_S32, hal.HAL_IN) - self.offsetsActivePin = self.h.newpin('offsets_active', hal.HAL_BIT, hal.HAL_IN) - self.ohmicLedInPin = self.h.newpin('ohmic_led_in', hal.HAL_BIT, hal.HAL_IN) - self.paramTabDisable = self.h.newpin('param_disable', hal.HAL_BIT, hal.HAL_IN) - self.settingsTabDisable = self.h.newpin('settings_disable', hal.HAL_BIT, hal.HAL_IN) - self.simStyleUpdate = self.h.newpin('sim_style_update', hal.HAL_BIT, hal.HAL_OUT) - self.plasmacStatePin = self.h.newpin('plasmac_state', hal.HAL_S32, hal.HAL_IN) - self.plasmacStopPin = self.h.newpin('plasmac_stop', hal.HAL_S32, hal.HAL_IN) - self.pmx485CurrentPin = self.h.newpin('pmx485_current', hal.HAL_FLOAT, hal.HAL_IN) - self.pmx485CurrentMaxPin = self.h.newpin('pmx485_current_max', hal.HAL_FLOAT, hal.HAL_IN) - self.pmx485CurrentMinPin = self.h.newpin('pmx485_current_min', hal.HAL_FLOAT, hal.HAL_IN) - self.pmx485FaultPin = self.h.newpin('pmx485_fault', hal.HAL_FLOAT, hal.HAL_IN) - self.pmx485ModePin = self.h.newpin('pmx485_mode', hal.HAL_FLOAT, hal.HAL_IN) - self.pmx485PressurePin = self.h.newpin('pmx485_pressure', hal.HAL_FLOAT, hal.HAL_IN) - self.pmx485PressureMaxPin = self.h.newpin('pmx485_pressure_max', hal.HAL_FLOAT, hal.HAL_IN) - self.pmx485PressureMinPin = self.h.newpin('pmx485_pressure_min', hal.HAL_FLOAT, hal.HAL_IN) - self.pmx485StatusPin = self.h.newpin('pmx485_status', hal.HAL_BIT, hal.HAL_IN) - self.pmx485ArcTimePin = self.h.newpin('pmx485_arc_time', hal.HAL_FLOAT, hal.HAL_IN) - self.probeTestErrorPin = self.h.newpin('probe_test_error', hal.HAL_BIT, hal.HAL_IN) - self.out0Pin = self.h.newpin('ext_out_0', hal.HAL_BIT, hal.HAL_OUT) - self.out1Pin = self.h.newpin('ext_out_1', hal.HAL_BIT, hal.HAL_OUT) - self.out2Pin = self.h.newpin('ext_out_2', hal.HAL_BIT, hal.HAL_OUT) - self.sensorActive = self.h.newpin('sensor_active', hal.HAL_BIT, hal.HAL_IN) - self.tabsAlwaysEnabled = self.h.newpin('tabs_always_enabled', hal.HAL_BIT, hal.HAL_IN) - self.thcFeedRatePin = self.h.newpin('thc_feed_rate', hal.HAL_FLOAT, hal.HAL_OUT) - self.velReduct = self.h.newpin('vel_reduct', hal.HAL_FLOAT, hal.HAL_IN) - self.xOffsetPin = self.h.newpin('x_offset', hal.HAL_FLOAT, hal.HAL_IN) - self.yOffsetPin = self.h.newpin('y_offset', hal.HAL_FLOAT, hal.HAL_IN) - self.zHeightPin = self.h.newpin('z_height', hal.HAL_FLOAT, hal.HAL_IN) - self.zOffsetPin = self.h.newpin('z_offset_counts', hal.HAL_S32, hal.HAL_IN) - self.xMinPierceExtentPin = self.h.newpin('x_min_pierce_extent', hal.HAL_FLOAT, hal.HAL_IN) - self.xMaxPierceExtentPin = self.h.newpin('x_max_pierce_extent', hal.HAL_FLOAT, hal.HAL_IN) - self.yMinPierceExtentPin = self.h.newpin('y_min_pierce_extent', hal.HAL_FLOAT, hal.HAL_IN) - self.yMaxPierceExtentPin = self.h.newpin('y_max_pierce_extent', hal.HAL_FLOAT, hal.HAL_IN) + self.consChangePin = self.h.newpin('consumable_changing', hal.Type.BOOL, hal.Dir.IN) + self.convTabDisable = self.h.newpin('conv_disable', hal.Type.BOOL, hal.Dir.IN) + self.cutTypePin = self.h.newpin('cut_type', hal.HAL_S32, hal.Dir.IN) + self.developmentPin = self.h.newpin('development', hal.Type.BOOL, hal.Dir.IN) + self.extAbortPin = self.h.newpin('ext_abort', hal.Type.BOOL, hal.Dir.IN) + self.extAutoVoltsEnablePin = self.h.newpin('ext_auto_volts_enable', hal.Type.BOOL, hal.Dir.IN) + self.extChangeConsPin = self.h.newpin('ext_consumables', hal.Type.BOOL, hal.Dir.IN) + self.extCornerLockEnablePin = self.h.newpin('ext_cornerlock_enable', hal.Type.BOOL, hal.Dir.IN) + self.extCutRecCancelPin = self.h.newpin('ext_cutrec_cancel', hal.Type.BOOL, hal.Dir.IN) + self.extCutRecRevPin = self.h.newpin('ext_cutrec_rev', hal.Type.BOOL, hal.Dir.IN) + self.extCutRecFwdPin = self.h.newpin('ext_cutrec_fwd', hal.Type.BOOL, hal.Dir.IN) + self.extCutRecNPin = self.h.newpin('ext_cutrec_n', hal.Type.BOOL, hal.Dir.IN) + self.extCutRecNEPin = self.h.newpin('ext_cutrec_ne', hal.Type.BOOL, hal.Dir.IN) + self.extCutRecEPin = self.h.newpin('ext_cutrec_e', hal.Type.BOOL, hal.Dir.IN) + self.extCutRecSEPin = self.h.newpin('ext_cutrec_se', hal.Type.BOOL, hal.Dir.IN) + self.extCutRecSPin = self.h.newpin('ext_cutrec_s', hal.Type.BOOL, hal.Dir.IN) + self.extCutRecSWPin = self.h.newpin('ext_cutrec_sw', hal.Type.BOOL, hal.Dir.IN) + self.extCutRecWPin = self.h.newpin('ext_cutrec_w', hal.Type.BOOL, hal.Dir.IN) + self.extCutRecNWPin = self.h.newpin('ext_cutrec_nw', hal.Type.BOOL, hal.Dir.IN) + self.extFramingPin = self.h.newpin('ext_frame_job', hal.Type.BOOL, hal.Dir.IN) + self.extHeightOvrCountsPin = self.h.newpin('ext_height_ovr_counts', hal.HAL_S32, hal.Dir.IN) + self.extHeightOvrCountEnablePin = self.h.newpin('ext_height_ovr_count_enable', hal.Type.BOOL, hal.Dir.IN) + self.extHeightOvrMinusPin = self.h.newpin('ext_height_ovr_minus', hal.Type.BOOL, hal.Dir.IN) + self.extHeightOvrPlusPin = self.h.newpin('ext_height_ovr_plus', hal.Type.BOOL, hal.Dir.IN) + self.extHeightOvrResetPin = self.h.newpin('ext_height_ovr_reset', hal.Type.BOOL, hal.Dir.IN) + self.extHeightOvrScalePin = self.h.newpin('ext_height_ovr_scale', hal.Type.REAL, hal.Dir.IN) + self.extIgnoreArcOkPin = self.h.newpin('ext_ignore_arc_ok', hal.Type.BOOL, hal.Dir.IN) + self.extJogSlowPin = self.h.newpin('ext_jog_slow', hal.Type.BOOL, hal.Dir.IN) +# self.extKerfCrossEnablePin = self.h.newpin('ext_kerfcross_enable', hal.Type.BOOL, hal.Dir.IN) + self.extLaserTouchOffPin = self.h.newpin('ext_laser_touchoff', hal.Type.BOOL, hal.Dir.IN) + self.extLaserTogglePin = self.h.newpin('ext_laser_toggle', hal.Type.BOOL, hal.Dir.IN) + self.extMeshModePin = self.h.newpin('ext_mesh_mode', hal.Type.BOOL, hal.Dir.IN) + self.extOhmicPin = self.h.newpin('ext_ohmic', hal.Type.BOOL, hal.Dir.IN) + self.extOhmicProbeEnablePin = self.h.newpin('ext_ohmic_probe_enable', hal.Type.BOOL, hal.Dir.IN) + self.extPausePin = self.h.newpin('ext_pause', hal.Type.BOOL, hal.Dir.IN) + self.extPauseOnlyPin = self.h.newpin('ext_pause_only', hal.Type.BOOL, hal.Dir.IN) + self.extPowerPin = self.h.newpin('ext_power', hal.Type.BOOL, hal.Dir.IN) + self.extProbePin = self.h.newpin('ext_probe', hal.Type.BOOL, hal.Dir.IN) + self.extPulsePin = self.h.newpin('ext_pulse', hal.Type.BOOL, hal.Dir.IN) + self.extResumePin = self.h.newpin('ext_resume', hal.Type.BOOL, hal.Dir.IN) + self.extRunPausePin = self.h.newpin('ext_run_pause', hal.Type.BOOL, hal.Dir.IN) + self.extRunPin = self.h.newpin('ext_run', hal.Type.BOOL, hal.Dir.IN) + self.extThcEnablePin = self.h.newpin('ext_thc_enable', hal.Type.BOOL, hal.Dir.IN) + self.extTorchEnablePin = self.h.newpin('ext_torch_enable', hal.Type.BOOL, hal.Dir.IN) + self.extTouchOffPin = self.h.newpin('ext_touchoff', hal.Type.BOOL, hal.Dir.IN) + self.extVoidLockEnablePin = self.h.newpin('ext_voidlock_enable', hal.Type.BOOL, hal.Dir.IN) + self.gcodeScalePin = self.h.newpin('gcode_scale', hal.Type.REAL, hal.Dir.OUT) + self.heightOverridePin = self.h.newpin('height_override', hal.Type.REAL, hal.Dir.OUT) + self.jogInhibited = self.h.newpin('jog_inhibited', hal.Type.BOOL, hal.Dir.IN) + self.laserOnPin = self.h.newpin('laser_on', hal.Type.BOOL, hal.Dir.OUT) + self.offsetSetProbePin = self.h.newpin('offset_set_probe', hal.Type.BOOL, hal.Dir.OUT) + self.offsetSetScribePin = self.h.newpin('offset_set_scribe', hal.Type.BOOL, hal.Dir.OUT) + self.laserRecStatePin = self.h.newpin('laser_recovery_state', hal.HAL_S32, hal.Dir.IN) + self.materialChangePin = self.h.newpin('material_change', hal.HAL_S32, hal.Dir.IN) + self.materialChangeNumberPin = self.h.newpin('material_change_number', hal.HAL_S32, hal.Dir.IN) + self.materialChangeTimeoutPin = self.h.newpin('material_change_timeout', hal.Type.BOOL, hal.Dir.IN) + self.materialReloadPin = self.h.newpin('material_reload', hal.Type.BOOL, hal.Dir.IN) + self.materialTempPin = self.h.newpin('material_temp', hal.HAL_S32, hal.Dir.IN) + self.offsetsActivePin = self.h.newpin('offsets_active', hal.Type.BOOL, hal.Dir.IN) + self.ohmicLedInPin = self.h.newpin('ohmic_led_in', hal.Type.BOOL, hal.Dir.IN) + self.paramTabDisable = self.h.newpin('param_disable', hal.Type.BOOL, hal.Dir.IN) + self.settingsTabDisable = self.h.newpin('settings_disable', hal.Type.BOOL, hal.Dir.IN) + self.simStyleUpdate = self.h.newpin('sim_style_update', hal.Type.BOOL, hal.Dir.OUT) + self.plasmacStatePin = self.h.newpin('plasmac_state', hal.HAL_S32, hal.Dir.IN) + self.plasmacStopPin = self.h.newpin('plasmac_stop', hal.HAL_S32, hal.Dir.IN) + self.pmx485CurrentPin = self.h.newpin('pmx485_current', hal.Type.REAL, hal.Dir.IN) + self.pmx485CurrentMaxPin = self.h.newpin('pmx485_current_max', hal.Type.REAL, hal.Dir.IN) + self.pmx485CurrentMinPin = self.h.newpin('pmx485_current_min', hal.Type.REAL, hal.Dir.IN) + self.pmx485FaultPin = self.h.newpin('pmx485_fault', hal.Type.REAL, hal.Dir.IN) + self.pmx485ModePin = self.h.newpin('pmx485_mode', hal.Type.REAL, hal.Dir.IN) + self.pmx485PressurePin = self.h.newpin('pmx485_pressure', hal.Type.REAL, hal.Dir.IN) + self.pmx485PressureMaxPin = self.h.newpin('pmx485_pressure_max', hal.Type.REAL, hal.Dir.IN) + self.pmx485PressureMinPin = self.h.newpin('pmx485_pressure_min', hal.Type.REAL, hal.Dir.IN) + self.pmx485StatusPin = self.h.newpin('pmx485_status', hal.Type.BOOL, hal.Dir.IN) + self.pmx485ArcTimePin = self.h.newpin('pmx485_arc_time', hal.Type.REAL, hal.Dir.IN) + self.probeTestErrorPin = self.h.newpin('probe_test_error', hal.Type.BOOL, hal.Dir.IN) + self.out0Pin = self.h.newpin('ext_out_0', hal.Type.BOOL, hal.Dir.OUT) + self.out1Pin = self.h.newpin('ext_out_1', hal.Type.BOOL, hal.Dir.OUT) + self.out2Pin = self.h.newpin('ext_out_2', hal.Type.BOOL, hal.Dir.OUT) + self.sensorActive = self.h.newpin('sensor_active', hal.Type.BOOL, hal.Dir.IN) + self.tabsAlwaysEnabled = self.h.newpin('tabs_always_enabled', hal.Type.BOOL, hal.Dir.IN) + self.thcFeedRatePin = self.h.newpin('thc_feed_rate', hal.Type.REAL, hal.Dir.OUT) + self.velReduct = self.h.newpin('vel_reduct', hal.Type.REAL, hal.Dir.IN) + self.xOffsetPin = self.h.newpin('x_offset', hal.Type.REAL, hal.Dir.IN) + self.yOffsetPin = self.h.newpin('y_offset', hal.Type.REAL, hal.Dir.IN) + self.zHeightPin = self.h.newpin('z_height', hal.Type.REAL, hal.Dir.IN) + self.zOffsetPin = self.h.newpin('z_offset_counts', hal.HAL_S32, hal.Dir.IN) + self.xMinPierceExtentPin = self.h.newpin('x_min_pierce_extent', hal.Type.REAL, hal.Dir.IN) + self.xMaxPierceExtentPin = self.h.newpin('x_max_pierce_extent', hal.Type.REAL, hal.Dir.IN) + self.yMinPierceExtentPin = self.h.newpin('y_min_pierce_extent', hal.Type.REAL, hal.Dir.IN) + self.yMaxPierceExtentPin = self.h.newpin('y_max_pierce_extent', hal.Type.REAL, hal.Dir.IN) def link_hal_pins(self): # arc parameters @@ -5650,10 +5650,10 @@ def pmx485_setup(self): 'cut_mode-f', 'pmx485_mode', 'cut_amps-f', 'pmx485_current', 'pmx485_current_min', 'pmx485_current_max', 'gas_pressure-f', 'pmx485_pressure', 'pmx485_pressure_min', 'pmx485_pressure_max', 'pmx485_arc_time'] - pinType = [hal.HAL_BIT, hal.HAL_BIT, hal.HAL_FLOAT, - hal.HAL_FLOAT, hal.HAL_FLOAT, - hal.HAL_FLOAT, hal.HAL_FLOAT, hal.HAL_FLOAT, hal.HAL_FLOAT, - hal.HAL_FLOAT, hal.HAL_FLOAT, hal.HAL_FLOAT, hal.HAL_FLOAT, hal.HAL_FLOAT] + pinType = [hal.Type.BOOL, hal.Type.BOOL, hal.Type.REAL, + hal.Type.REAL, hal.Type.REAL, + hal.Type.REAL, hal.Type.REAL, hal.Type.REAL, hal.Type.REAL, + hal.Type.REAL, hal.Type.REAL, hal.Type.REAL, hal.Type.REAL, hal.Type.REAL] for pin in self.pins485Comp: hal.new_sig(f'plasmac:{pin.replace("pmx485.", "pmx485_")}', pinType[self.pins485Comp.index(pin)]) hal.connect(pin, f'plasmac:{pin.replace("pmx485.", "pmx485_")}') diff --git a/share/qtvcp/screens/qttouchy/qttouchy_handler.py b/share/qtvcp/screens/qttouchy/qttouchy_handler.py index e52e74a08f3..0da4e405dd4 100644 --- a/share/qtvcp/screens/qttouchy/qttouchy_handler.py +++ b/share/qtvcp/screens/qttouchy/qttouchy_handler.py @@ -60,17 +60,17 @@ def initialized__(self): 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)) - self.pin_cycle_start_in = QHAL.newpin('cycle-start-in',QHAL.HAL_BIT, QHAL.HAL_IN) + self.pin_cycle_start_in = QHAL.newpin('cycle-start-in',QHAL.HAL_BOOL, QHAL.HAL_IN) self.pin_cycle_start_in.value_changed.connect(lambda s: self.cycleStart(s)) - self.pin_abort = QHAL.newpin('abort',QHAL.HAL_BIT, QHAL.HAL_IN) + self.pin_abort = QHAL.newpin('abort',QHAL.HAL_BOOL, QHAL.HAL_IN) self.pin_abort.value_changed.connect(lambda s: self.abort(s)) - self.wheel_x = QHAL.newpin('jogwheel.x-enable',QHAL.HAL_BIT, QHAL.HAL_OUT) - self.wheel_y = QHAL.newpin('jogwheel.y-enable',QHAL.HAL_BIT, QHAL.HAL_OUT) - self.wheel_z = QHAL.newpin('jogwheel.z-enable',QHAL.HAL_BIT, QHAL.HAL_OUT) + self.wheel_x = QHAL.newpin('jogwheel.x-enable',QHAL.HAL_BOOL, QHAL.HAL_OUT) + self.wheel_y = QHAL.newpin('jogwheel.y-enable',QHAL.HAL_BOOL, QHAL.HAL_OUT) + self.wheel_z = QHAL.newpin('jogwheel.z-enable',QHAL.HAL_BOOL, QHAL.HAL_OUT) - self.jog_increment = QHAL.newpin('jogwheel.increment',QHAL.HAL_FLOAT, QHAL.HAL_OUT) + self.jog_increment = QHAL.newpin('jogwheel.increment',QHAL.HAL_REAL, QHAL.HAL_OUT) STATUS.connect('feed-override-changed', lambda w, data: self.w.pushbutton_fo.setText('FO {0:.0f}%'.format(data))) STATUS.connect('rapid-override-changed', lambda w, data: self.w.pushbutton_ro.setText('RO {0:.0f}%'.format(data))) diff --git a/share/qtvcp/screens/woodpecker/woodpecker_handler.py b/share/qtvcp/screens/woodpecker/woodpecker_handler.py index c1c9126ab70..622642c1c7c 100644 --- a/share/qtvcp/screens/woodpecker/woodpecker_handler.py +++ b/share/qtvcp/screens/woodpecker/woodpecker_handler.py @@ -246,28 +246,28 @@ 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-count", QHAL.HAL_S32, QHAL.HAL_OUT) - 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 = 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.increment',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.increment',hal.Type.REAL, hal.Dir.OUT) def init_preferences(self): if not self.w.PREFS_: diff --git a/src/emc/usr_intf/axis/scripts/axis.py b/src/emc/usr_intf/axis/scripts/axis.py index 2a1c90cb57b..22e7851cffa 100755 --- a/src/emc/usr_intf/axis/scripts/axis.py +++ b/src/emc/usr_intf/axis/scripts/axis.py @@ -4041,22 +4041,22 @@ def select_run_from(e): if hal_present == 1 : comp = hal.component("axisui") - comp.newpin("jog.x", hal.HAL_BIT, hal.HAL_OUT) - comp.newpin("jog.y", hal.HAL_BIT, hal.HAL_OUT) - comp.newpin("jog.z", hal.HAL_BIT, hal.HAL_OUT) - comp.newpin("jog.a", hal.HAL_BIT, hal.HAL_OUT) - comp.newpin("jog.b", hal.HAL_BIT, hal.HAL_OUT) - comp.newpin("jog.c", hal.HAL_BIT, hal.HAL_OUT) - comp.newpin("jog.u", hal.HAL_BIT, hal.HAL_OUT) - comp.newpin("jog.v", hal.HAL_BIT, hal.HAL_OUT) - comp.newpin("jog.w", hal.HAL_BIT, hal.HAL_OUT) - comp.newpin("jog.increment", hal.HAL_FLOAT, hal.HAL_OUT) - comp.newpin("notifications-clear",hal.HAL_BIT,hal.HAL_IN) - comp.newpin("notifications-clear-info",hal.HAL_BIT,hal.HAL_IN) - comp.newpin("notifications-clear-error",hal.HAL_BIT,hal.HAL_IN) - comp.newpin("resume-inhibit",hal.HAL_BIT,hal.HAL_IN) - comp.newpin("error", hal.HAL_BIT, hal.HAL_OUT) - comp.newpin("abort", hal.HAL_BIT, hal.HAL_OUT) + comp.newpin("jog.x", hal.Type.BOOL, hal.Dir.OUT) + comp.newpin("jog.y", hal.Type.BOOL, hal.Dir.OUT) + comp.newpin("jog.z", hal.Type.BOOL, hal.Dir.OUT) + comp.newpin("jog.a", hal.Type.BOOL, hal.Dir.OUT) + comp.newpin("jog.b", hal.Type.BOOL, hal.Dir.OUT) + comp.newpin("jog.c", hal.Type.BOOL, hal.Dir.OUT) + comp.newpin("jog.u", hal.Type.BOOL, hal.Dir.OUT) + comp.newpin("jog.v", hal.Type.BOOL, hal.Dir.OUT) + comp.newpin("jog.w", hal.Type.BOOL, hal.Dir.OUT) + comp.newpin("jog.increment", hal.Type.REAL, hal.Dir.OUT) + comp.newpin("notifications-clear",hal.Type.BOOL,hal.Dir.IN) + comp.newpin("notifications-clear-info",hal.Type.BOOL,hal.Dir.IN) + comp.newpin("notifications-clear-error",hal.Type.BOOL,hal.Dir.IN) + comp.newpin("resume-inhibit",hal.Type.BOOL,hal.Dir.IN) + comp.newpin("error", hal.Type.BOOL, hal.Dir.OUT) + comp.newpin("abort", hal.Type.BOOL, hal.Dir.OUT) vars.has_ladder.set(hal.component_exists('classicladder_rt')) diff --git a/src/emc/usr_intf/axis/scripts/hal_manualtoolchange.py b/src/emc/usr_intf/axis/scripts/hal_manualtoolchange.py index 6308fb73865..cb4acceaff6 100644 --- a/src/emc/usr_intf/axis/scripts/hal_manualtoolchange.py +++ b/src/emc/usr_intf/axis/scripts/hal_manualtoolchange.py @@ -78,10 +78,10 @@ def get_tool_change_message(n): h = hal.component("hal_manualtoolchange") -h.newpin("number", hal.HAL_S32, hal.HAL_IN) -h.newpin("change", hal.HAL_BIT, hal.HAL_IN) -h.newpin("change_button", hal.HAL_BIT, hal.HAL_IN) -h.newpin("changed", hal.HAL_BIT, hal.HAL_OUT) +h.newpin("number", hal.HAL_S32, hal.Dir.IN) +h.newpin("change", hal.Type.BOOL, hal.Dir.IN) +h.newpin("change_button", hal.Type.BOOL, hal.Dir.IN) +h.newpin("changed", hal.Type.BOOL, hal.Dir.OUT) h.ready() import nf, rs274.options diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py index b25396ff62c..cae34386ee7 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.py +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py @@ -2640,20 +2640,20 @@ def _init_user_messages(self): return for message in user_messages: if message[1] == "status": - pin = hal_glib.GPin(self.halcomp.newpin("messages." + message[2], hal.HAL_BIT, hal.HAL_IN)) + pin = hal_glib.GPin(self.halcomp.newpin("messages." + message[2], hal.Type.BOOL, hal.Dir.IN)) pin.connect("value_changed", self._show_user_message, message) elif message[1] == "okdialog": - pin = hal_glib.GPin(self.halcomp.newpin("messages." + message[2], hal.HAL_BIT, hal.HAL_IN)) + pin = hal_glib.GPin(self.halcomp.newpin("messages." + message[2], hal.Type.BOOL, hal.Dir.IN)) pin.connect("value_changed", self._show_user_message, message) pin = hal_glib.GPin( - self.halcomp.newpin("messages." + message[2] + "-waiting", hal.HAL_BIT, hal.HAL_OUT)) + self.halcomp.newpin("messages." + message[2] + "-waiting", hal.Type.BOOL, hal.Dir.OUT)) elif message[1] == "yesnodialog": - pin = hal_glib.GPin(self.halcomp.newpin("messages." + message[2], hal.HAL_BIT, hal.HAL_IN)) + pin = hal_glib.GPin(self.halcomp.newpin("messages." + message[2], hal.Type.BOOL, hal.Dir.IN)) pin.connect("value_changed", self._show_user_message, message) pin = hal_glib.GPin( - self.halcomp.newpin("messages." + message[2] + "-waiting", hal.HAL_BIT, hal.HAL_OUT)) + self.halcomp.newpin("messages." + message[2] + "-waiting", hal.Type.BOOL, hal.Dir.OUT)) pin = hal_glib.GPin( - self.halcomp.newpin("messages." + message[2] + "-response", hal.HAL_BIT, hal.HAL_OUT)) + self.halcomp.newpin("messages." + message[2] + "-response", hal.Type.BOOL, hal.Dir.OUT)) else: LOG.error(_("Message type {0} not supported").format(message[1])) @@ -6399,135 +6399,135 @@ def _get_child_button(self, location, number = None): def _make_hal_pins(self): # generate the horizontal button pins for h_button in range(0, 10): - pin = self.halcomp.newpin("h-button.button-{0}".format(h_button), hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("h-button.button-{0}".format(h_button), hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._button_pin_changed) # generate the vertical button pins for v_button in range(0, 7): - pin = self.halcomp.newpin("v-button.button-{0}".format(v_button), hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("v-button.button-{0}".format(v_button), hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._button_pin_changed) # buttons for jogging the axis for jog_button in self.axis_list: - pin = self.halcomp.newpin("jog.axis.jog-{0}-plus".format(jog_button), hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("jog.axis.jog-{0}-plus".format(jog_button), hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_pin_jog_changed, "{0}+".format(jog_button)) - pin = self.halcomp.newpin("jog.axis.jog-{0}-minus".format(jog_button), hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("jog.axis.jog-{0}-minus".format(jog_button), hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_pin_jog_changed, "{0}-".format(jog_button)) if self.stat.kinematics_type != linuxcnc.KINEMATICS_IDENTITY: for joint_button in range(0, self.stat.joints): - pin = self.halcomp.newpin("jog.joint.jog-{0}-plus".format(joint_button), hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("jog.joint.jog-{0}-plus".format(joint_button), hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_pin_jog_changed, "{0}+".format(joint_button)) - pin = self.halcomp.newpin("jog.joint.jog-{0}-minus".format(joint_button), hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("jog.joint.jog-{0}-minus".format(joint_button), hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_pin_jog_changed, "{0}-".format(joint_button)) # jog_increment out pin - self.halcomp.newpin("jog.jog-increment", hal.HAL_FLOAT, hal.HAL_OUT) + self.halcomp.newpin("jog.jog-increment", hal.Type.REAL, hal.Dir.OUT) # generate the pins to set the increments for buttonnumber in range(0, len(self.jog_increments)): - pin = self.halcomp.newpin("jog.jog-inc-{0}".format(buttonnumber), hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("jog.jog-inc-{0}".format(buttonnumber), hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_pin_incr_changed, buttonnumber) # make the pin for unlocking settings page - pin = self.halcomp.newpin("unlock-settings", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("unlock-settings", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_unlock_settings_changed) # generate the pins to connect encoders to the sliders - pin = self.halcomp.newpin("feed.feed-override.counts", hal.HAL_S32, hal.HAL_IN) + pin = self.halcomp.newpin("feed.feed-override.counts", hal.HAL_S32, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_counts_changed, "spc_feed") - pin = self.halcomp.newpin("spindle.spindle-override.counts", hal.HAL_S32, hal.HAL_IN) + pin = self.halcomp.newpin("spindle.spindle-override.counts", hal.HAL_S32, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_counts_changed, "spc_spindle") - pin = self.halcomp.newpin("jog.jog-velocity.counts", hal.HAL_S32, hal.HAL_IN) + pin = self.halcomp.newpin("jog.jog-velocity.counts", hal.HAL_S32, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_counts_changed, "spc_lin_jog_vel") - pin = self.halcomp.newpin("rapid.rapid-override.counts", hal.HAL_S32, hal.HAL_IN) + pin = self.halcomp.newpin("rapid.rapid-override.counts", hal.HAL_S32, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_counts_changed, "spc_rapid") - self.halcomp.newpin("feed.feed-override.count-enable", hal.HAL_BIT, hal.HAL_IN) - self.halcomp.newpin("spindle.spindle-override.count-enable", hal.HAL_BIT, hal.HAL_IN) - self.halcomp.newpin("jog.jog-velocity.count-enable", hal.HAL_BIT, hal.HAL_IN) - self.halcomp.newpin("rapid.rapid-override.count-enable", hal.HAL_BIT, hal.HAL_IN) + self.halcomp.newpin("feed.feed-override.count-enable", hal.Type.BOOL, hal.Dir.IN) + self.halcomp.newpin("spindle.spindle-override.count-enable", hal.Type.BOOL, hal.Dir.IN) + self.halcomp.newpin("jog.jog-velocity.count-enable", hal.Type.BOOL, hal.Dir.IN) + self.halcomp.newpin("rapid.rapid-override.count-enable", hal.Type.BOOL, hal.Dir.IN) # generate the pins to connect analog inputs for sliders - pin = self.halcomp.newpin("feed.feed-override.analog-enable", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("feed.feed-override.analog-enable", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_analog_enable_changed, "spc_feed") - pin = self.halcomp.newpin("spindle.spindle-override.analog-enable", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("spindle.spindle-override.analog-enable", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_analog_enable_changed, "spc_spindle") - pin = self.halcomp.newpin("jog.jog-velocity.analog-enable", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("jog.jog-velocity.analog-enable", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_analog_enable_changed, "spc_lin_jog_vel") - pin = self.halcomp.newpin("rapid.rapid-override.analog-enable", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("rapid.rapid-override.analog-enable", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_analog_enable_changed, "spc_rapid") - pin = self.halcomp.newpin("feed.feed-override.direct-value", hal.HAL_FLOAT, hal.HAL_IN) + pin = self.halcomp.newpin("feed.feed-override.direct-value", hal.Type.REAL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_analog_value_changed, "spc_feed") - pin = self.halcomp.newpin("spindle.spindle-override.direct-value", hal.HAL_FLOAT, hal.HAL_IN) + pin = self.halcomp.newpin("spindle.spindle-override.direct-value", hal.Type.REAL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_analog_value_changed, "spc_spindle") - pin = self.halcomp.newpin("jog.jog-velocity.direct-value", hal.HAL_FLOAT, hal.HAL_IN) + pin = self.halcomp.newpin("jog.jog-velocity.direct-value", hal.Type.REAL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_analog_value_changed, "spc_lin_jog_vel") - pin = self.halcomp.newpin("rapid.rapid-override.direct-value", hal.HAL_FLOAT, hal.HAL_IN) + pin = self.halcomp.newpin("rapid.rapid-override.direct-value", hal.Type.REAL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_analog_value_changed, "spc_rapid") # make a pin to set turtle jog vel - pin = self.halcomp.newpin("jog.turtle-jog", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("jog.turtle-jog", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._on_pin_turtle_jog) # make the pins for tool measurement - self.halcomp.newpin("probeheight", hal.HAL_FLOAT, hal.HAL_OUT) - pin = self.halcomp.newpin("blockheight", hal.HAL_FLOAT, hal.HAL_OUT) + self.halcomp.newpin("probeheight", hal.Type.REAL, hal.Dir.OUT) + pin = self.halcomp.newpin("blockheight", hal.Type.REAL, hal.Dir.OUT) hal_glib.GPin(pin).connect("value_changed", self._on_blockheight_value_changed) preset = self.prefs.getpref("blockheight", 0.0, float) self.halcomp["blockheight"] = preset - self.halcomp.newpin("toolmeasurement", hal.HAL_BIT, hal.HAL_OUT) - self.halcomp.newpin("searchvel", hal.HAL_FLOAT, hal.HAL_OUT) - self.halcomp.newpin("probevel", hal.HAL_FLOAT, hal.HAL_OUT) + self.halcomp.newpin("toolmeasurement", hal.Type.BOOL, hal.Dir.OUT) + self.halcomp.newpin("searchvel", hal.Type.REAL, hal.Dir.OUT) + self.halcomp.newpin("probevel", hal.Type.REAL, hal.Dir.OUT) # make pins to react to tool_offset changes - pin = self.halcomp.newpin("tooloffset-x", hal.HAL_FLOAT, hal.HAL_IN) + pin = self.halcomp.newpin("tooloffset-x", hal.Type.REAL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._offset_changed, "tooloffset-x") - pin = self.halcomp.newpin("tooloffset-z", hal.HAL_FLOAT, hal.HAL_IN) + pin = self.halcomp.newpin("tooloffset-z", hal.Type.REAL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._offset_changed, "tooloffset-z") - self.halcomp.newpin("tool-diameter", hal.HAL_FLOAT, hal.HAL_OUT) + self.halcomp.newpin("tool-diameter", hal.Type.REAL, hal.Dir.OUT) # make a pin to delete a notification message - pin = self.halcomp.newpin("delete-message", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("delete-message", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._del_message_changed) # for manual tool change dialog - self.halcomp.newpin("toolchange-number", hal.HAL_S32, hal.HAL_IN) - self.halcomp.newpin("toolchange-changed", hal.HAL_BIT, hal.HAL_OUT) - pin = self.halcomp.newpin('toolchange-change', hal.HAL_BIT, hal.HAL_IN) + self.halcomp.newpin("toolchange-number", hal.HAL_S32, hal.Dir.IN) + self.halcomp.newpin("toolchange-changed", hal.Type.BOOL, hal.Dir.OUT) + pin = self.halcomp.newpin('toolchange-change', hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect('value_changed', self.on_tool_change) - self.halcomp.newpin('toolchange-confirm', hal.HAL_BIT, hal.HAL_IN) + self.halcomp.newpin('toolchange-confirm', hal.Type.BOOL, hal.Dir.IN) # make a pin to confirm a warning dialog - self.halcomp.newpin('warning-confirm', hal.HAL_BIT, hal.HAL_IN) + self.halcomp.newpin('warning-confirm', hal.Type.BOOL, hal.Dir.IN) # make a pin to reset feed override to 100 % - pin = self.halcomp.newpin("feed.reset-feed-override", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("feed.reset-feed-override", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._reset_override, "feed") # make a pin to reset rapid override to 100 % - pin = self.halcomp.newpin("rapid.reset-rapid-override", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("rapid.reset-rapid-override", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._reset_override, "rapid") # make a pin to reset spindle override to 100 % - pin = self.halcomp.newpin("spindle.reset-spindle-override", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("spindle.reset-spindle-override", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._reset_override, "spindle") # make an error pin to indicate a error to hardware - self.halcomp.newpin("error", hal.HAL_BIT, hal.HAL_OUT) + self.halcomp.newpin("error", hal.Type.BOOL, hal.Dir.OUT) # make pins to indicate program progress information - self.halcomp.newpin("program.length", hal.HAL_S32, hal.HAL_OUT) - self.halcomp.newpin("program.current-line", hal.HAL_S32, hal.HAL_OUT) - self.halcomp.newpin("program.progress", hal.HAL_FLOAT, hal.HAL_OUT) + self.halcomp.newpin("program.length", hal.HAL_S32, hal.Dir.OUT) + self.halcomp.newpin("program.current-line", hal.HAL_S32, hal.Dir.OUT) + self.halcomp.newpin("program.progress", hal.Type.REAL, hal.Dir.OUT) # make a pin to set ignore limits - pin = self.halcomp.newpin("ignore-limits", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("ignore-limits", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._ignore_limits) # make pins to set optional stops and block delete - pin = self.halcomp.newpin("optional-stop", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("optional-stop", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._optional_blocks) - pin = self.halcomp.newpin("blockdelete", hal.HAL_BIT, hal.HAL_IN) + pin = self.halcomp.newpin("blockdelete", hal.Type.BOOL, hal.Dir.IN) hal_glib.GPin(pin).connect("value_changed", self._blockdelete) diff --git a/src/emc/usr_intf/gscreen/gscreen.py b/src/emc/usr_intf/gscreen/gscreen.py index a8d10ca6058..80ae44eed34 100755 --- a/src/emc/usr_intf/gscreen/gscreen.py +++ b/src/emc/usr_intf/gscreen/gscreen.py @@ -1650,51 +1650,51 @@ def initialize_pins(self): self.init_control_pins() def init_spindle_pins(self): - """creates a HAL float in pin for control the spindle readout meter + """creates a HAL REAL in pin for control the spindle readout meter """ - self.halcomp.newpin("spindle-readout-in", hal.HAL_FLOAT, hal.HAL_IN) + self.halcomp.newpin("spindle-readout-in", hal.Type.REAL, hal.Dir.IN) def init_coolant_pins(self): - """create HAL BIT out pins to control coolant + """create HAL BOOL out pins to control coolant """ - self.halcomp.newpin("aux-coolant-m7-out", hal.HAL_BIT, hal.HAL_OUT) - self.halcomp.newpin("aux-coolant-m8-out", hal.HAL_BIT, hal.HAL_OUT) - self.halcomp.newpin("mist-coolant-out", hal.HAL_BIT, hal.HAL_OUT) - self.halcomp.newpin("flood-coolant-out", hal.HAL_BIT, hal.HAL_OUT) + self.halcomp.newpin("aux-coolant-m7-out", hal.Type.BOOL, hal.Dir.OUT) + self.halcomp.newpin("aux-coolant-m8-out", hal.Type.BOOL, hal.Dir.OUT) + self.halcomp.newpin("mist-coolant-out", hal.Type.BOOL, hal.Dir.OUT) + self.halcomp.newpin("flood-coolant-out", hal.Type.BOOL, hal.Dir.OUT) def init_jog_pins(self): - """create HAL BIT out pins for all axis jog enable - create HAL BIT out for jog mode enabled - create HAL FLOAT out pin for current jog increment + """create HAL BOOL out pins for all axis jog enable + create HAL BOOL out for jog mode enabled + create HAL REAL out pin for current jog increment These could be used for MPG selecting """ for axis in self.data.axis_list: - self.halcomp.newpin("jog-enable-%s-out"% (axis), hal.HAL_BIT, hal.HAL_OUT) - self.halcomp.newpin("jog-enable-out", hal.HAL_BIT, hal.HAL_OUT) - self.halcomp.newpin("jog-increment-out", hal.HAL_FLOAT, hal.HAL_OUT) - #self.data['jog-increment-in'] = hal_glib.GPin(self.halcomp.newpin('jog-increment-in', hal.HAL_S32, hal.HAL_IN)) + self.halcomp.newpin("jog-enable-%s-out"% (axis), hal.Type.BOOL, hal.Dir.OUT) + self.halcomp.newpin("jog-enable-out", hal.Type.BOOL, hal.Dir.OUT) + self.halcomp.newpin("jog-increment-out", hal.Type.REAL, hal.Dir.OUT) + #self.data['jog-increment-in'] = hal_glib.GPin(self.halcomp.newpin('jog-increment-in', hal.HAL_S32, hal.Dir.IN)) #self.data['jog-increment-in'].connect('value-changed', self.on_hal_jog_increments_changed) - #self.data['jog-rate-in'] = hal_glib.GPin(self.halcomp.newpin('jog-rate-in', hal.HAL_S32, hal.HAL_IN)) + #self.data['jog-rate-in'] = hal_glib.GPin(self.halcomp.newpin('jog-rate-in', hal.HAL_S32, hal.Dir.IN)) #self.data['jog-rate-in'].connect('value-changed', self.on_hal_jog_rate_changed) # pins used for selecting an encoder to adjust overrides def init_override_pins(self): - """creates HAL BIT pins for spindle,feed and Max velocity overrides. + """creates HAL BOOL pins for spindle,feed and Max velocity overrides. used as selection pins for an encoder to set values """ - self.halcomp.newpin("s-override-enable-out", hal.HAL_BIT, hal.HAL_OUT) - self.halcomp.newpin("f-override-enable-out", hal.HAL_BIT, hal.HAL_OUT) - self.halcomp.newpin("mv-override-enable-out", hal.HAL_BIT, hal.HAL_OUT) + self.halcomp.newpin("s-override-enable-out", hal.Type.BOOL, hal.Dir.OUT) + self.halcomp.newpin("f-override-enable-out", hal.Type.BOOL, hal.Dir.OUT) + self.halcomp.newpin("mv-override-enable-out", hal.Type.BOOL, hal.Dir.OUT) def init_control_pins(self): """Creates and registers function calls for start,abort and feed_hold pins calls self.on_cycle_start_changed, self.on_abort_changed, self.on_feed_hold_changed """ - self.data['cycle_start'] = hal_glib.GPin(self.halcomp.newpin('cycle-start', hal.HAL_BIT, hal.HAL_IN)) + self.data['cycle_start'] = hal_glib.GPin(self.halcomp.newpin('cycle-start', hal.Type.BOOL, hal.Dir.IN)) self.data['cycle_start'].connect('value-changed', self.on_cycle_start_changed) - self.data['abort'] = hal_glib.GPin(self.halcomp.newpin('abort', hal.HAL_BIT, hal.HAL_IN)) + self.data['abort'] = hal_glib.GPin(self.halcomp.newpin('abort', hal.Type.BOOL, hal.Dir.IN)) self.data['abort'].connect('value-changed', self.on_abort_changed) - self.data['feed_hold'] = hal_glib.GPin(self.halcomp.newpin('feed-hold', hal.HAL_BIT, hal.HAL_IN)) + self.data['feed_hold'] = hal_glib.GPin(self.halcomp.newpin('feed-hold', hal.Type.BOOL, hal.Dir.IN)) self.data['feed_hold'].connect('value-changed', self.on_feed_hold_changed) def initialize_manual_toolchange(self): @@ -1706,9 +1706,9 @@ def initialize_manual_toolchange(self): or the default function """ # for manual tool change dialog - self.halcomp.newpin("tool-number", hal.HAL_S32, hal.HAL_IN) - self.halcomp.newpin("tool-changed", hal.HAL_BIT, hal.HAL_OUT) - self.data['change-tool'] = hal_glib.GPin(self.halcomp.newpin('change-tool', hal.HAL_BIT, hal.HAL_IN)) + self.halcomp.newpin("tool-number", hal.HAL_S32, hal.Dir.IN) + self.halcomp.newpin("tool-changed", hal.Type.BOOL, hal.Dir.OUT) + self.data['change-tool'] = hal_glib.GPin(self.halcomp.newpin('change-tool', hal.Type.BOOL, hal.Dir.IN)) # you can override manual tool change if "on_tool_change" in dir(self.handler_instance): self.data['change-tool'].connect('value-changed', self.handler_instance.on_tool_change) @@ -3808,12 +3808,12 @@ def message_setup(self): continue if not name == None: # this is how we make a pin that can be connected to a callback - self.data['name'] = hal_glib.GPin(self.halcomp.newpin(name, hal.HAL_BIT, hal.HAL_IN)) + self.data['name'] = hal_glib.GPin(self.halcomp.newpin(name, hal.Type.BOOL, hal.Dir.IN)) self.data['name'].connect('value-changed', self.on_printmessage,name,bt,t,c) if ("dialog" in c): - self.halcomp.newpin(name+"-waiting", hal.HAL_BIT, hal.HAL_OUT) + self.halcomp.newpin(name+"-waiting", hal.Type.BOOL, hal.Dir.OUT) if not ("ok" in c): - self.halcomp.newpin(name+"-response", hal.HAL_BIT, hal.HAL_OUT) + self.halcomp.newpin(name+"-response", hal.Type.BOOL, hal.Dir.OUT) # display dialog def warning_dialog(self,message, displaytype, secondary=None,pinname=None): diff --git a/src/emc/usr_intf/pncconf/tests.py b/src/emc/usr_intf/pncconf/tests.py index 10f411ef3d9..0b367806a35 100644 --- a/src/emc/usr_intf/pncconf/tests.py +++ b/src/emc/usr_intf/pncconf/tests.py @@ -1415,7 +1415,7 @@ def update(self): def make_blank(self,container,boardnum,number): #blankname = "enc-%d" % (number) #self.data2["brd%denc%d" % (boardnum,number)]= Gtk.Button("Reset-%d"% number) - #self.hal.c.newpin(encname, hal.HAL_S32, hal.HAL_IN) + #self.hal.c.newpin(encname, hal.HAL_S32, hal.Dir.IN) label = Gtk.Label(" ") container.pack_start(label, False, False, 10) label = Gtk.Label(" ") @@ -1425,14 +1425,14 @@ def make_blank(self,container,boardnum,number): def make_enc(self,container,boardnum,number): encname = "brd.%d.enc.%d.reset" % (boardnum,number) print("making HAL pin enc bit Brd %d,num %d"%(boardnum,number)) - self.hal.c.newpin(encname, hal.HAL_BIT, hal.HAL_OUT) - hal.new_sig(encname+"-signal",hal.HAL_BIT) + self.hal.c.newpin(encname, hal.Type.BOOL, hal.Dir.OUT) + hal.new_sig(encname+"-signal",hal.Type.BOOL) hal.connect("testpanel."+encname,encname+"-signal") self.data2["brd%denc%dreset" % (boardnum,number)]= Gtk.Button("Reset-%d"% number) container.pack_start(self.data2["brd%denc%dreset" % (boardnum,number)], False, False, 10) encname = "brd.%d.enc.%d.count" % (boardnum,number) print("making HAL pin enc s32 brd %d num %d"%(boardnum,number)) - self.hal.c.newpin(encname, hal.HAL_S32, hal.HAL_IN) + self.hal.c.newpin(encname, hal.HAL_S32, hal.Dir.IN) hal.new_sig(encname+"-signal",hal.HAL_S32) hal.connect("testpanel."+encname,encname+"-signal") label = self.data2["brd%denc%dcount" % (boardnum,number)] = Gtk.Label("Encoder-%d"% (number)) @@ -1442,12 +1442,12 @@ def make_enc(self,container,boardnum,number): # This creates widgets and HAL pins for stepper controls def make_stp(self,container,boardnum,number): stpname = "brd.%d.stp.%d.position-cmd" % (boardnum,number) - self.hal.c.newpin(stpname, hal.HAL_FLOAT, hal.HAL_OUT) - hal.new_sig(stpname+"-signal",hal.HAL_FLOAT) + self.hal.c.newpin(stpname, hal.Type.REAL, hal.Dir.OUT) + hal.new_sig(stpname+"-signal",hal.Type.REAL) hal.connect("testpanel."+stpname,stpname+"-signal") stpname = "brd.%d.stp.%d.enable" % (boardnum,number) - self.hal.c.newpin(stpname, hal.HAL_BIT, hal.HAL_OUT) - hal.new_sig(stpname+"-signal",hal.HAL_BIT) + self.hal.c.newpin(stpname, hal.Type.BOOL, hal.Dir.OUT) + hal.new_sig(stpname+"-signal",hal.Type.BOOL) hal.connect("testpanel."+stpname,stpname+"-signal") adj = Gtk.Adjustment(0.0, -1000.0, 1000.0, 1.0, 5.0, 0.0) spin = self.data2["brd%dstp%dcmd" % (boardnum,number)]= Gtk.SpinButton(adj, 0, 1) @@ -1462,13 +1462,13 @@ def make_stp(self,container,boardnum,number): def make_pwm(self,container,boardnum,number): pwmname = "brd.%d.pwm.%d.value" % (boardnum,number) print("making HAL pin pwm float brd%d num %d"%(boardnum,number)) - self.hal.c.newpin(pwmname, hal.HAL_FLOAT, hal.HAL_OUT) - hal.new_sig(pwmname+"-signal",hal.HAL_FLOAT) + self.hal.c.newpin(pwmname, hal.Type.REAL, hal.Dir.OUT) + hal.new_sig(pwmname+"-signal",hal.Type.REAL) hal.connect("testpanel."+pwmname,pwmname+"-signal") pwmname = "brd.%d.pwm.%d.enable" % (boardnum,number) print("making HAL pin pwm bit brd %d num %d"%(boardnum,number)) - self.hal.c.newpin(pwmname, hal.HAL_BIT, hal.HAL_OUT) - hal.new_sig(pwmname+"-signal",hal.HAL_BIT) + self.hal.c.newpin(pwmname, hal.Type.BOOL, hal.Dir.OUT) + hal.new_sig(pwmname+"-signal",hal.Type.BOOL) hal.connect("testpanel."+pwmname,pwmname+"-signal") adj = self.data2["brd%dpwm%dadj" % (boardnum,number)] = Gtk.Adjustment(0.0, -10.0, 10.0, 0.1, 0.5, 0.0) adj.connect("value_changed", self.pwm_callback,"pwm",boardnum,number,None) @@ -1486,8 +1486,8 @@ def make_pwm(self,container,boardnum,number): def make_led(self,container,boardnum,number): ledname = "brd.%d.led.%d" % (boardnum,number) print("making HAL pin led bit brd %d num %d"%(boardnum,number)) - self.hal.c.newpin(ledname, hal.HAL_BIT, hal.HAL_IN) - hal.new_sig(ledname+"-signal",hal.HAL_BIT) + self.hal.c.newpin(ledname, hal.Type.BOOL, hal.Dir.IN) + hal.new_sig(ledname+"-signal",hal.Type.BOOL) hal.connect("testpanel."+ledname,ledname+"-signal") led = self.data2["brd%dled%d" % (boardnum,number)] = LED(self) led.set_color("off",[1,0,0]) # red @@ -1503,8 +1503,8 @@ def make_switch(self,container,boardnum,number): # make a HAL pin switchname = "brd.%d.switch.%d" % (boardnum,number) print("making HAL pin switch bit brd %d num %d"%(boardnum,number)) - self.hal.c.newpin(switchname, hal.HAL_BIT, hal.HAL_OUT) - hal.new_sig(switchname+"-signal",hal.HAL_BIT) + self.hal.c.newpin(switchname, hal.Type.BOOL, hal.Dir.OUT) + hal.new_sig(switchname+"-signal",hal.Type.BOOL) hal.connect("testpanel."+switchname,switchname+"-signal") # add button to container using boarnum and number as a reference button = self.data2["brd%dswch%d" % (boardnum,number)]= Gtk.Button("OUT-%d"% number) diff --git a/src/emc/usr_intf/pyui/widgets.py b/src/emc/usr_intf/pyui/widgets.py index 0a037ea216b..53be78a0f96 100644 --- a/src/emc/usr_intf/pyui/widgets.py +++ b/src/emc/usr_intf/pyui/widgets.py @@ -37,12 +37,12 @@ def hal_init(self, master, comp, name,metadata,command,widgets,dbg): self.pintype=hal.HAL_U32 self.true_state = int(self.metadata['TRUE_STATE']) self.false_state = int(self.metadata['FALSE_STATE']) - elif self.metadata['OUTPUT'] == 'FLOAT': - self.pintype=hal.HAL_FLOAT + elif self.metadata['OUTPUT'] == 'REAL' or self.metadata['OUTPUT'] == 'FLOAT': + self.pintype=hal.Type.REAL self.true_state = float(self.metadata['TRUE_STATE']) self.false_state = float(self.metadata['FALSE_STATE']) - elif self.metadata['OUTPUT'] == 'BIT': - self.pintype=hal.HAL_BIT + elif self.metadata['OUTPUT'] == 'BOOL' or self.metadata['OUTPUT'] == 'BIT': + self.pintype=hal.Type.BOOL self.true_state = True#self.metadata['TRUE_STATE'] self.false_state = False#self.metadata['FALSE_STATE'] elif self.metadata['OUTPUT'] == 'COMMAND': @@ -104,12 +104,12 @@ def _hal_init(self): pass # If not a command output requested make the pins if pintype not in(None,'COMMAND','ZMQ'): - self.hal_pin = self.hal.newpin(self.hal_name, pintype, hal.HAL_OUT) - self.hal_pin_not = self.hal.newpin(self.hal_name + "-not", pintype, hal.HAL_OUT) + self.hal_pin = self.hal.newpin(self.hal_name, pintype, hal.Dir.OUT) + self.hal_pin_not = self.hal.newpin(self.hal_name + "-not", pintype, hal.Dir.OUT) # If there is a status requested make there pins if self.status_pin: - self.hal_status_pin = self.hal.newpin(self.hal_name+ "-state", hal.HAL_BIT, hal.HAL_OUT) - self.hal_status_pin_not = self.hal.newpin(self.hal_name+ "-state-not", hal.HAL_BIT, hal.HAL_OUT) + self.hal_status_pin = self.hal.newpin(self.hal_name+ "-state", hal.Type.BOOL, hal.Dir.OUT) + self.hal_status_pin_not = self.hal.newpin(self.hal_name+ "-state-not", hal.Type.BOOL, hal.Dir.OUT) # Update the pin to the proper state, but don't print debug for this if pintype not in ('COMMAND','ZMQ'): DBG_suppress = True @@ -230,8 +230,8 @@ def convert(scmd): class GROUP(_WidgetBase): def _hal_init(self): pintype = self.pintype - self.hal_pin = self.hal.newpin(self.hal_name, pintype, hal.HAL_OUT) - self.hal_pin_not = self.hal.newpin(self.hal_name + "-not", pintype, hal.HAL_OUT) + self.hal_pin = self.hal.newpin(self.hal_name, pintype, hal.Dir.OUT) + self.hal_pin_not = self.hal.newpin(self.hal_name + "-not", pintype, hal.Dir.OUT) # preset the radio group # which sets the state of the default widget # then updates that widget ( to get the state to actually change ) diff --git a/src/emc/usr_intf/touchy/hal_interface.py b/src/emc/usr_intf/touchy/hal_interface.py index f53808f3683..4864d2bf9f8 100644 --- a/src/emc/usr_intf/touchy/hal_interface.py +++ b/src/emc/usr_intf/touchy/hal_interface.py @@ -22,67 +22,67 @@ def __init__(self, gui, emc_control, mdi_control, emc): self.emc_stat = self.emc.stat() self.mdi_control = mdi_control self.c = hal.component("touchy") - self.c.newpin("status-indicator", hal.HAL_BIT, hal.HAL_OUT) - self.c.newpin("jog.active", hal.HAL_BIT, hal.HAL_OUT) - self.c.newpin("jog.wheel.x", hal.HAL_BIT, hal.HAL_OUT) - self.c.newpin("jog.wheel.y", hal.HAL_BIT, hal.HAL_OUT) - self.c.newpin("jog.wheel.z", hal.HAL_BIT, hal.HAL_OUT) - self.c.newpin("jog.wheel.a", hal.HAL_BIT, hal.HAL_OUT) - self.c.newpin("jog.wheel.b", hal.HAL_BIT, hal.HAL_OUT) - self.c.newpin("jog.wheel.c", hal.HAL_BIT, hal.HAL_OUT) - self.c.newpin("jog.wheel.u", hal.HAL_BIT, hal.HAL_OUT) - self.c.newpin("jog.wheel.v", hal.HAL_BIT, hal.HAL_OUT) - self.c.newpin("jog.wheel.w", hal.HAL_BIT, hal.HAL_OUT) - self.c.newpin("jog.wheel.increment", hal.HAL_FLOAT, hal.HAL_OUT) - - self.c.newpin("jog.continuous.x.positive", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("status-indicator", hal.Type.BOOL, hal.Dir.OUT) + self.c.newpin("jog.active", hal.Type.BOOL, hal.Dir.OUT) + self.c.newpin("jog.wheel.x", hal.Type.BOOL, hal.Dir.OUT) + self.c.newpin("jog.wheel.y", hal.Type.BOOL, hal.Dir.OUT) + self.c.newpin("jog.wheel.z", hal.Type.BOOL, hal.Dir.OUT) + self.c.newpin("jog.wheel.a", hal.Type.BOOL, hal.Dir.OUT) + self.c.newpin("jog.wheel.b", hal.Type.BOOL, hal.Dir.OUT) + self.c.newpin("jog.wheel.c", hal.Type.BOOL, hal.Dir.OUT) + self.c.newpin("jog.wheel.u", hal.Type.BOOL, hal.Dir.OUT) + self.c.newpin("jog.wheel.v", hal.Type.BOOL, hal.Dir.OUT) + self.c.newpin("jog.wheel.w", hal.Type.BOOL, hal.Dir.OUT) + self.c.newpin("jog.wheel.increment", hal.Type.REAL, hal.Dir.OUT) + + self.c.newpin("jog.continuous.x.positive", hal.Type.BOOL, hal.Dir.IN) self.xp = 0 - self.c.newpin("jog.continuous.x.negative", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.x.negative", hal.Type.BOOL, hal.Dir.IN) self.xn = 0 - self.c.newpin("jog.continuous.y.positive", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.y.positive", hal.Type.BOOL, hal.Dir.IN) self.yp = 0 - self.c.newpin("jog.continuous.y.negative", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.y.negative", hal.Type.BOOL, hal.Dir.IN) self.yn = 0 - self.c.newpin("jog.continuous.z.positive", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.z.positive", hal.Type.BOOL, hal.Dir.IN) self.zp = 0 - self.c.newpin("jog.continuous.z.negative", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.z.negative", hal.Type.BOOL, hal.Dir.IN) self.zn = 0 - self.c.newpin("jog.continuous.a.positive", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.a.positive", hal.Type.BOOL, hal.Dir.IN) self.ap = 0 - self.c.newpin("jog.continuous.a.negative", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.a.negative", hal.Type.BOOL, hal.Dir.IN) self.an = 0 - self.c.newpin("jog.continuous.b.positive", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.b.positive", hal.Type.BOOL, hal.Dir.IN) self.bp = 0 - self.c.newpin("jog.continuous.b.negative", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.b.negative", hal.Type.BOOL, hal.Dir.IN) self.bn = 0 - self.c.newpin("jog.continuous.c.positive", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.c.positive", hal.Type.BOOL, hal.Dir.IN) self.cp = 0 - self.c.newpin("jog.continuous.c.negative", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.c.negative", hal.Type.BOOL, hal.Dir.IN) self.cn = 0 - self.c.newpin("jog.continuous.u.positive", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.u.positive", hal.Type.BOOL, hal.Dir.IN) self.up = 0 - self.c.newpin("jog.continuous.u.negative", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.u.negative", hal.Type.BOOL, hal.Dir.IN) self.un = 0 - self.c.newpin("jog.continuous.v.positive", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.v.positive", hal.Type.BOOL, hal.Dir.IN) self.vp = 0 - self.c.newpin("jog.continuous.v.negative", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.v.negative", hal.Type.BOOL, hal.Dir.IN) self.vn = 0 - self.c.newpin("jog.continuous.w.positive", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.w.positive", hal.Type.BOOL, hal.Dir.IN) self.wp = 0 - self.c.newpin("jog.continuous.w.negative", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("jog.continuous.w.negative", hal.Type.BOOL, hal.Dir.IN) self.wn = 0 - self.c.newpin("quill-up", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("quill-up", hal.Type.BOOL, hal.Dir.IN) self.quillup = 0 - self.c.newpin("cycle-start", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("cycle-start", hal.Type.BOOL, hal.Dir.IN) self.cyclestart = 0 - self.c.newpin("abort", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("abort", hal.Type.BOOL, hal.Dir.IN) self.abort = 0 - self.c.newpin("single-block", hal.HAL_BIT, hal.HAL_IN) + self.c.newpin("single-block", hal.Type.BOOL, hal.Dir.IN) self.singleblock = 0 - self.c.newpin("wheel-counts", hal.HAL_S32, hal.HAL_IN) + self.c.newpin("wheel-counts", hal.HAL_S32, hal.Dir.IN) self.counts = 0 self.jog_velocity = 1 self.c.ready() diff --git a/src/hal/user_comps/hal_bridge.py b/src/hal/user_comps/hal_bridge.py index 1833ab7e7af..8bc82bf6db5 100644 --- a/src/hal/user_comps/hal_bridge.py +++ b/src/hal/user_comps/hal_bridge.py @@ -66,50 +66,50 @@ def init_hal(self): self.comp = h = hal.component("bridge") QHAL = Qhal(comp=self.comp, hal=hal) - self.jogRate = QHAL.newpin("jog-rate", hal.HAL_FLOAT, hal.HAL_OUT) - self.jogRateIn = QHAL.newpin("jog-rate-in", hal.HAL_FLOAT, hal.HAL_IN) + self.jogRate = QHAL.newpin("jog-rate", hal.Type.REAL, hal.Dir.OUT) + self.jogRateIn = QHAL.newpin("jog-rate-in", hal.Type.REAL, hal.Dir.IN) self.jogRateIn.pinValueChanged.connect(self.pinChanged) - self.jogRateAngular = QHAL.newpin("jog-rate-angular", hal.HAL_FLOAT, hal.HAL_OUT) - self.jogRateAngularIn = QHAL.newpin("jog-rate-angular-in", hal.HAL_FLOAT, hal.HAL_OUT) + self.jogRateAngular = QHAL.newpin("jog-rate-angular", hal.Type.REAL, hal.Dir.OUT) + self.jogRateAngularIn = QHAL.newpin("jog-rate-angular-in", hal.Type.REAL, hal.Dir.OUT) self.jogRateAngularIn.pinValueChanged.connect(self.pinChanged) - self.jogIncrement = QHAL.newpin("jog-increment", hal.HAL_FLOAT, hal.HAL_OUT) - self.jogIncrementAngular = QHAL.newpin("jog-increment-angular", hal.HAL_FLOAT, hal.HAL_OUT) - self.activeJoint = QHAL.newpin('joint-selected', hal.HAL_S32, hal.HAL_OUT) + self.jogIncrement = QHAL.newpin("jog-increment", hal.Type.REAL, hal.Dir.OUT) + self.jogIncrementAngular = QHAL.newpin("jog-increment-angular", hal.Type.REAL, hal.Dir.OUT) + self.activeJoint = QHAL.newpin('joint-selected', hal.HAL_S32, hal.Dir.OUT) for i in (self.INFO.AVAILABLE_AXES): let = i.lower() # input - self['axis{}Select'.format(let)] = QHAL.newpin('axis-%s-select'%let, hal.HAL_BIT, hal.HAL_IN) + self['axis{}Select'.format(let)] = QHAL.newpin('axis-%s-select'%let, hal.Type.BOOL, hal.Dir.IN) self['axis{}Select'.format(let)].pinValueChanged.connect(self.pinChanged) # output - self['Axis{}IsSelected'.format(let)] = QHAL.newpin('axis-%s-is-selected'%let, hal.HAL_BIT, hal.HAL_OUT) + self['Axis{}IsSelected'.format(let)] = QHAL.newpin('axis-%s-is-selected'%let, hal.Type.BOOL, hal.Dir.OUT) - self.cycle_start = QHAL.newpin('cycle-start-in',QHAL.HAL_BIT, QHAL.HAL_IN) + self.cycle_start = QHAL.newpin('cycle-start-in',QHAL.HAL_BOOL, QHAL.HAL_IN) self.cycle_start.pinValueChanged.connect(self.pinChanged) - self.cycle_pause = QHAL.newpin('cycle-pause-in',QHAL.HAL_BIT, QHAL.HAL_IN) + self.cycle_pause = QHAL.newpin('cycle-pause-in',QHAL.HAL_BOOL, QHAL.HAL_IN) self.cycle_pause.pinValueChanged.connect(self.pinChanged) - self.reload_display = QHAL.newpin('reload-display-in',QHAL.HAL_BIT, QHAL.HAL_IN) + self.reload_display = QHAL.newpin('reload-display-in',QHAL.HAL_BOOL, QHAL.HAL_IN) self.reload_display.pinValueChanged.connect(self.pinChanged) - self.shutdown = QHAL.newpin('shutdown-in',QHAL.HAL_BIT, QHAL.HAL_IN) + self.shutdown = QHAL.newpin('shutdown-in',QHAL.HAL_BOOL, QHAL.HAL_IN) self.shutdown.pinValueChanged.connect(self.pinChanged) - self.ok = QHAL.newpin('ok-in',QHAL.HAL_BIT, QHAL.HAL_IN) + self.ok = QHAL.newpin('ok-in',QHAL.HAL_BOOL, QHAL.HAL_IN) self.ok.pinValueChanged.connect(self.pinChanged) - self.cancel = QHAL.newpin('cancel-in',QHAL.HAL_BIT, QHAL.HAL_IN) + self.cancel = QHAL.newpin('cancel-in',QHAL.HAL_BOOL, QHAL.HAL_IN) self.cancel.pinValueChanged.connect(self.pinChanged) if not self.INFO.MDI_COMMAND_DICT is None: for i in self.INFO.MDI_COMMAND_DICT: LOG.debug('{} {}'.format(i,self.INFO.MDI_COMMAND_DICT.get(i))) - self[i] = QHAL.newpin('ini-mdi-cmd-{}'.format(i),QHAL.HAL_BIT, QHAL.HAL_IN) + self[i] = QHAL.newpin('ini-mdi-cmd-{}'.format(i),QHAL.HAL_BOOL, QHAL.HAL_IN) self[i].pinValueChanged.connect(self.runMacroChanged) if not self.INFO.MACRO_COMMAND_DICT is None: for name in self.INFO.MACRO_COMMAND_DICT: LOG.debug('{} {}'.format(name,self.INFO.MDI_COMMAND_DICT.get(name))) name = str(name) - self[name] = QHAL.newpin('ini-macro-cmd-{}'.format(name),QHAL.HAL_BIT, QHAL.HAL_IN) + self[name] = QHAL.newpin('ini-macro-cmd-{}'.format(name),QHAL.HAL_BOOL, QHAL.HAL_IN) self[name].pinValueChanged.connect(self.runMacroChanged) QHAL.setUpdateRate(100) diff --git a/src/hal/user_comps/hal_input.py b/src/hal/user_comps/hal_input.py index 87c90e716db..28f64cf018c 100644 --- a/src/hal/user_comps/hal_input.py +++ b/src/hal/user_comps/hal_input.py @@ -82,18 +82,18 @@ def __init__(self, comp, idx, name, parts='KRAL'): for key in self.device.get_bits('EV_KEY'): key = tohalname(key) self.codes.add(key) - comp.newpin("%s.%s" % (idx, key), HAL_BIT, HAL_OUT) - comp.newpin("%s.%s-not" % (idx, key), HAL_BIT, HAL_OUT) + comp.newpin("%s.%s" % (idx, key), Type.BOOL, Dir.OUT) + comp.newpin("%s.%s-not" % (idx, key), Type.BOOL, Dir.OUT) self.set(key + "-not", 1) if 'R' in parts: for axis in self.device.get_bits('EV_REL'): name = tohalname(axis) self.codes.add(name) - comp.newpin("%s.%s-position" % (idx, name), HAL_FLOAT, HAL_OUT) - comp.newpin("%s.%s-counts" % (idx, name), HAL_S32, HAL_OUT) - comp.newpin("%s.%s-reset" % (idx, name), HAL_BIT, HAL_IN) - comp.newpin("%s.%s-scale" % (idx, name), HAL_FLOAT, HAL_IN) + comp.newpin("%s.%s-position" % (idx, name), Type.REAL, Dir.OUT) + comp.newpin("%s.%s-counts" % (idx, name), HAL_S32, Dir.OUT) + comp.newpin("%s.%s-reset" % (idx, name), Type.BOOL, Dir.IN) + comp.newpin("%s.%s-scale" % (idx, name), Type.REAL, Dir.IN) self.set(name + '-scale', 1.) self.rel_items.append(name) @@ -102,16 +102,16 @@ def __init__(self, comp, idx, name, parts='KRAL'): name = tohalname(axis) self.codes.add(name) absinfo = self.device.get_absinfo(axis) - comp.newpin("%s.%s-position" % (idx, name), HAL_FLOAT, HAL_OUT) - comp.newpin("%s.%s-counts" % (idx, name), HAL_S32, HAL_OUT) - comp.newpin("%s.%s-is-pos" % (idx, name), HAL_BIT, HAL_OUT) - comp.newpin("%s.%s-is-neg" % (idx, name), HAL_BIT, HAL_OUT) - comp.newpin("%s.%s-scale" % (idx, name), HAL_FLOAT, HAL_IN) - comp.newpin("%s.%s-offset" % (idx, name), HAL_FLOAT, HAL_IN) - comp.newpin("%s.%s-fuzz" % (idx, name), HAL_S32, HAL_IN) - comp.newpin("%s.%s-flat" % (idx, name), HAL_S32, HAL_IN) - comp.newparam("%s.%s-min" % (idx, name), HAL_S32, HAL_RO) - comp.newparam("%s.%s-max" % (idx, name), HAL_S32, HAL_RO) + comp.newpin("%s.%s-position" % (idx, name), Type.REAL, Dir.OUT) + comp.newpin("%s.%s-counts" % (idx, name), HAL_S32, Dir.OUT) + comp.newpin("%s.%s-is-pos" % (idx, name), Type.BOOL, Dir.OUT) + comp.newpin("%s.%s-is-neg" % (idx, name), Type.BOOL, Dir.OUT) + comp.newpin("%s.%s-scale" % (idx, name), Type.REAL, Dir.IN) + comp.newpin("%s.%s-offset" % (idx, name), Type.REAL, Dir.IN) + comp.newpin("%s.%s-fuzz" % (idx, name), HAL_S32, Dir.IN) + comp.newpin("%s.%s-flat" % (idx, name), HAL_S32, Dir.IN) + comp.newparam("%s.%s-min" % (idx, name), HAL_S32, Dir.RO) + comp.newparam("%s.%s-max" % (idx, name), HAL_S32, Dir.RO) center = (absinfo.minimum + absinfo.maximum)/2. halfrange = (absinfo.maximum - absinfo.minimum)/2. or 1 self.set(name + "-counts", absinfo.value) @@ -130,8 +130,8 @@ def __init__(self, comp, idx, name, parts='KRAL'): for led in self.device.get_bits('EV_LED'): name = tohalname(led) self.ledmap[name] = led - comp.newpin("%s.%s" % (idx, name), HAL_BIT, HAL_IN) - comp.newpin("%s.%s-invert" % (idx, name), HAL_BIT, HAL_IN) + comp.newpin("%s.%s" % (idx, name), Type.BOOL, Dir.IN) + comp.newpin("%s.%s-invert" % (idx, name), Type.BOOL, Dir.IN) self.last[name] = 0 self.device.write_event('EV_LED', led, 0) @@ -203,7 +203,7 @@ def update(self): self.set(r + "-position", self.get(r + "-counts") / scale) for k, v in list(self.last.items()): - # Note: this is OK because the hal module always returns True or False for HAL_BIT values + # Note: this is OK because the hal module always returns True or False for BOOL values u = self.comp["%s.%s" % ( self.idx, k)] != self.comp["%s.%s-invert" % (self.idx, k)] if u != self.last[k]: diff --git a/src/hal/user_comps/mqtt-publisher.py b/src/hal/user_comps/mqtt-publisher.py index 847137dc30b..25cf2a0bdb3 100755 --- a/src/hal/user_comps/mqtt-publisher.py +++ b/src/hal/user_comps/mqtt-publisher.py @@ -73,11 +73,11 @@ def create_pins(self, keys): self.lcncstat.poll() self.hal = hal.component('mqtt-publisher') - self.hal.newpin('enable', hal.HAL_BIT, hal.HAL_IN) + self.hal.newpin('enable', hal.Type.BOOL, hal.Dir.IN) self.hal['enable'] = True - self.hal.newpin('period', hal.HAL_U32, hal.HAL_IN) + self.hal.newpin('period', hal.HAL_U32, hal.Dir.IN) self.hal['period'] = 10 - self.hal.newpin('lastpublish', hal.HAL_U32, hal.HAL_OUT) + self.hal.newpin('lastpublish', hal.HAL_U32, hal.Dir.OUT) self.hal['lastpublish'] = 0 self.hal.ready() diff --git a/src/hal/user_comps/scorbot-er-3.py b/src/hal/user_comps/scorbot-er-3.py index 77c420d916d..f29221f0db9 100755 --- a/src/hal/user_comps/scorbot-er-3.py +++ b/src/hal/user_comps/scorbot-er-3.py @@ -76,10 +76,10 @@ def serial_read(num_bytes): old_counts = [None] * 8 old_motor_max_vel = [None] * 8 for joint in range(0, 8): - h.newpin('joint%d.limit-sw' % joint, hal.HAL_BIT, hal.HAL_OUT) - h.newpin('joint%d.motor-pos-cmd' % joint, hal.HAL_FLOAT, hal.HAL_IN) - h.newpin('joint%d.scale' % joint, hal.HAL_FLOAT, hal.HAL_IN) - h.newpin('joint%d.motor-max-vel' % joint, hal.HAL_S32, hal.HAL_IN) + h.newpin('joint%d.limit-sw' % joint, hal.Type.BOOL, hal.Dir.OUT) + h.newpin('joint%d.motor-pos-cmd' % joint, hal.Type.REAL, hal.Dir.IN) + h.newpin('joint%d.scale' % joint, hal.Type.REAL, hal.Dir.IN) + h.newpin('joint%d.motor-max-vel' % joint, hal.HAL_S32, hal.Dir.IN) h['joint%d.motor-pos-cmd' % joint] = 0.0 old_motor_pos_cmd[joint] = 0.0 diff --git a/src/hal/user_comps/sim-torch.py b/src/hal/user_comps/sim-torch.py index 9b45326917e..87e27deb60a 100644 --- a/src/hal/user_comps/sim-torch.py +++ b/src/hal/user_comps/sim-torch.py @@ -29,19 +29,19 @@ h = hal.component('sim-torch') # create the hal pins h.setprefix('sim-torch') -h.newpin('cut-noise-in', hal.HAL_FLOAT, hal.HAL_IN) -h.newpin('cycles-in', hal.HAL_S32, hal.HAL_IN) -h.newpin('on-delay-in', hal.HAL_S32, hal.HAL_IN) -h.newpin('offset-in', hal.HAL_FLOAT, hal.HAL_IN) -h.newpin('overshoot-in', hal.HAL_S32, hal.HAL_IN) -h.newpin('ramp-noise-in', hal.HAL_FLOAT, hal.HAL_IN) -h.newpin('ramp-up-in', hal.HAL_S32, hal.HAL_IN) -h.newpin('start', hal.HAL_BIT, hal.HAL_IN) -h.newpin('voltage-in', hal.HAL_FLOAT, hal.HAL_IN) -h.newpin('close', hal.HAL_BIT, hal.HAL_IN) -h.newpin('voltage-out', hal.HAL_FLOAT, hal.HAL_OUT) -h.newpin('void', hal.HAL_BIT, hal.HAL_IN) -h.newpin('void_ramp', hal.HAL_S32, hal.HAL_IN) +h.newpin('cut-noise-in', hal.Type.REAL, hal.Dir.IN) +h.newpin('cycles-in', hal.HAL_S32, hal.Dir.IN) +h.newpin('on-delay-in', hal.HAL_S32, hal.Dir.IN) +h.newpin('offset-in', hal.Type.REAL, hal.Dir.IN) +h.newpin('overshoot-in', hal.HAL_S32, hal.Dir.IN) +h.newpin('ramp-noise-in', hal.Type.REAL, hal.Dir.IN) +h.newpin('ramp-up-in', hal.HAL_S32, hal.Dir.IN) +h.newpin('start', hal.Type.BOOL, hal.Dir.IN) +h.newpin('voltage-in', hal.Type.REAL, hal.Dir.IN) +h.newpin('close', hal.Type.BOOL, hal.Dir.IN) +h.newpin('voltage-out', hal.Type.REAL, hal.Dir.OUT) +h.newpin('void', hal.Type.BOOL, hal.Dir.IN) +h.newpin('void_ramp', hal.HAL_S32, hal.Dir.IN) # setdefaults for input pins h['cut-noise-in'] = 0.75 h['cycles-in'] = 200 #"the number of cycles that the arc voltage overshoots the cut voltage (cycles)" diff --git a/src/hal/user_comps/z_level_compensation.py b/src/hal/user_comps/z_level_compensation.py index 366c2889587..6e7bdaa654e 100644 --- a/src/hal/user_comps/z_level_compensation.py +++ b/src/hal/user_comps/z_level_compensation.py @@ -110,15 +110,15 @@ def compensate(self): def run(self): self.h = hal.component("z_level_compensation") - self.h.newpin("enable-in", hal.HAL_BIT, hal.HAL_IN) - 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("method", hal.HAL_S32, hal.HAL_IN) + self.h.newpin("enable-in", hal.Type.BOOL, hal.Dir.IN) + 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.newpin("method", hal.HAL_S32, hal.Dir.IN) self.h.ready() self.stat = linuxcnc.stat() diff --git a/tests/hal-link-unlink/hallink.py b/tests/hal-link-unlink/hallink.py index 3ce6e9eee37..59587b60a2a 100755 --- a/tests/hal-link-unlink/hallink.py +++ b/tests/hal-link-unlink/hallink.py @@ -7,8 +7,8 @@ def cmd(arg): subprocess.call(arg, shell=True) h = hal.component("linktest") -h.newpin("in", hal.HAL_FLOAT, hal.HAL_IN) -h.newpin("inout", hal.HAL_FLOAT, hal.HAL_IO) +h.newpin("in", hal.Type.REAL, hal.Dir.IN) +h.newpin("inout", hal.Type.REAL, hal.Dir.IO) h.ready() # set pin values before linking diff --git a/tests/halmodule.3/expected b/tests/halmodule.3/expected deleted file mode 100644 index 140572ef7d0..00000000000 --- a/tests/halmodule.3/expected +++ /dev/null @@ -1,60 +0,0 @@ -# Pins -and2.0.in0 {'haltype': 'pin', 'name': 'and2.0.in0', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-input-a', 'comp': 'and2', 'comp_id': 'ID'} -and2.0.in1 {'haltype': 'pin', 'name': 'and2.0.in1', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-input-b', 'comp': 'and2', 'comp_id': 'ID'} -and2.0.out {'haltype': 'pin', 'name': 'and2.0.out', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-a', 'comp': 'and2', 'comp_id': 'ID'} -and2.0.time {'haltype': 'pin', 'name': 'and2.0.time', 'type': , 'dir': , 'value': 0, 'alias': None, 'signal': None, 'comp': 'and2', 'comp_id': 'ID'} -or2.0.in0 {'haltype': 'pin', 'name': 'or2.0.in0', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-input-a', 'comp': 'or2', 'comp_id': 'ID'} -or2.0.in1 {'haltype': 'pin', 'name': 'or2.0.in1', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-input-b', 'comp': 'or2', 'comp_id': 'ID'} -or2.0.out {'haltype': 'pin', 'name': 'or2.0.out', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-b', 'comp': 'or2', 'comp_id': 'ID'} -or2.0.time {'haltype': 'pin', 'name': 'or2.0.time', 'type': , 'dir': , 'value': 0, 'alias': None, 'signal': None, 'comp': 'or2', 'comp_id': 'ID'} -testthread.threadbeat {'haltype': 'pin', 'name': 'testthread.threadbeat', 'type': , 'dir': , 'value': 0, 'alias': None, 'signal': None, 'comp': '__testthread', 'comp_id': 'ID'} -testthread.time {'haltype': 'pin', 'name': 'testthread.time', 'type': , 'dir': , 'value': 0, 'alias': None, 'signal': None, 'comp': '__testthread', 'comp_id': 'ID'} -xor2.0.in0 {'haltype': 'pin', 'name': 'xor2.0.in0', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-a', 'comp': 'xor2', 'comp_id': 'ID'} -xor2.0.in1 {'haltype': 'pin', 'name': 'xor2.0.in1', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-b', 'comp': 'xor2', 'comp_id': 'ID'} -xor2.0.out {'haltype': 'pin', 'name': 'xor2.0.out', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-output', 'comp': 'xor2', 'comp_id': 'ID'} -xor2.0.time {'haltype': 'pin', 'name': 'xor2.0.time', 'type': , 'dir': , 'value': 0, 'alias': None, 'signal': None, 'comp': 'xor2', 'comp_id': 'ID'} -# Params -and2.0.tmax {'haltype': 'parameter', 'name': 'and2.0.tmax', 'type': , 'dir': , 'value': 0, 'alias': None, 'comp': 'and2', 'comp_id': 'ID'} -and2.0.tmax-increased {'haltype': 'parameter', 'name': 'and2.0.tmax-increased', 'type': , 'dir': , 'value': False, 'alias': None, 'comp': 'and2', 'comp_id': 'ID'} -or2.0.tmax {'haltype': 'parameter', 'name': 'or2.0.tmax', 'type': , 'dir': , 'value': 0, 'alias': None, 'comp': 'or2', 'comp_id': 'ID'} -or2.0.tmax-increased {'haltype': 'parameter', 'name': 'or2.0.tmax-increased', 'type': , 'dir': , 'value': False, 'alias': None, 'comp': 'or2', 'comp_id': 'ID'} -testthread.tmax {'haltype': 'parameter', 'name': 'testthread.tmax', 'type': , 'dir': , 'value': 0, 'alias': None, 'comp': '__testthread', 'comp_id': 'ID'} -xor2.0.tmax {'haltype': 'parameter', 'name': 'xor2.0.tmax', 'type': , 'dir': , 'value': 0, 'alias': None, 'comp': 'xor2', 'comp_id': 'ID'} -xor2.0.tmax-increased {'haltype': 'parameter', 'name': 'xor2.0.tmax-increased', 'type': , 'dir': , 'value': False, 'alias': None, 'comp': 'xor2', 'comp_id': 'ID'} -# Signals -net-input-a {'haltype': 'signal', 'name': 'net-input-a', 'type': , 'value': False, 'writers': 0, 'readers': 2, 'bidirs': 0, 'driver': None} -net-input-b {'haltype': 'signal', 'name': 'net-input-b', 'type': , 'value': False, 'writers': 0, 'readers': 2, 'bidirs': 0, 'driver': None} -net-output {'haltype': 'signal', 'name': 'net-output', 'type': , 'value': False, 'writers': 1, 'readers': 0, 'bidirs': 0, 'driver': 'xor2.0.out'} -net-xor-a {'haltype': 'signal', 'name': 'net-xor-a', 'type': , 'value': False, 'writers': 1, 'readers': 1, 'bidirs': 0, 'driver': 'and2.0.out'} -net-xor-b {'haltype': 'signal', 'name': 'net-xor-b', 'type': , 'value': False, 'writers': 1, 'readers': 1, 'bidirs': 0, 'driver': 'or2.0.out'} -# Components -xor2 {'haltype': 'component', 'name': 'xor2', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': 'count=1'} -or2 {'haltype': 'component', 'name': 'or2', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': 'count=1'} -and2 {'haltype': 'component', 'name': 'and2', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': 'count=1'} -__testthread {'haltype': 'component', 'name': '__testthread', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': None} -threads {'haltype': 'component', 'name': 'threads', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': 'name1=testthread period1=1000000'} -# Functions -and2.0 {'haltype': 'function', 'name': 'and2.0', 'comp': 'and2', 'comp_id': 'ID', 'users': 1, 'reentrant': False} -or2.0 {'haltype': 'function', 'name': 'or2.0', 'comp': 'or2', 'comp_id': 'ID', 'users': 1, 'reentrant': False} -xor2.0 {'haltype': 'function', 'name': 'xor2.0', 'comp': 'xor2', 'comp_id': 'ID', 'users': 1, 'reentrant': False} -# Threads -testthread {'haltype': 'thread', 'name': 'testthread', 'comp': '__testthread', 'comp_id': 'ID', 'priority': 0, 'period': 1000000, 'functions': [{'haltype': 'threadfunction', 'name': 'and2.0', 'index': 0, 'is_init': False}, {'haltype': 'threadfunction', 'name': 'or2.0', 'index': 1, 'is_init': False}, {'haltype': 'threadfunction', 'name': 'xor2.0', 'index': 2, 'is_init': False}]} -# Signal pins -and2.0.out {'haltype': 'pin', 'name': 'and2.0.out', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-a', 'comp': 'and2', 'comp_id': 'ID'} -xor2.0.in0 {'haltype': 'pin', 'name': 'xor2.0.in0', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-a', 'comp': 'xor2', 'comp_id': 'ID'} -# Intended failures -pin('does-not-exist') fails correctly -param('does-not-exist') fails correctly -signal('does-not-exist') fails correctly -comp('does-not-exist') fails correctly -comp(65534) fails correctly -funct('does-not-exist') fails correctly -thread('does-not-exist') fails correctly -signalpins('does-not-exist') fails correctly -# Simple named queries -Pin: {'haltype': 'pin', 'name': 'or2.0.in1', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-input-b', 'comp': 'or2', 'comp_id': 'ID'} -Param: {'haltype': 'parameter', 'name': 'testthread.tmax', 'type': , 'dir': , 'value': 0, 'alias': None, 'comp': '__testthread', 'comp_id': 'ID'} -Signal: {'haltype': 'signal', 'name': 'net-output', 'type': , 'value': False, 'writers': 1, 'readers': 0, 'bidirs': 0, 'driver': 'xor2.0.out'} -Component: {'haltype': 'component', 'name': 'and2', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': 'count=1'} -Function: {'haltype': 'function', 'name': 'xor2.0', 'comp': 'xor2', 'comp_id': 'ID', 'users': 1, 'reentrant': False} -Thread: {'haltype': 'thread', 'name': 'testthread', 'comp': '__testthread', 'comp_id': 'ID', 'priority': 0, 'period': 1000000, 'functions': [{'haltype': 'threadfunction', 'name': 'and2.0', 'index': 0, 'is_init': False}, {'haltype': 'threadfunction', 'name': 'or2.0', 'index': 1, 'is_init': False}, {'haltype': 'threadfunction', 'name': 'xor2.0', 'index': 2, 'is_init': False}]} diff --git a/tests/halmodule.0/README b/tests/halmodule/comp-set-get/README similarity index 100% rename from tests/halmodule.0/README rename to tests/halmodule/comp-set-get/README diff --git a/tests/halmodule.0/expected b/tests/halmodule/comp-set-get/expected similarity index 100% rename from tests/halmodule.0/expected rename to tests/halmodule/comp-set-get/expected diff --git a/tests/halmodule.0/test.py b/tests/halmodule/comp-set-get/test.py similarity index 75% rename from tests/halmodule.0/test.py rename to tests/halmodule/comp-set-get/test.py index 59e0e83d457..46d6d36b0f3 100755 --- a/tests/halmodule.0/test.py +++ b/tests/halmodule/comp-set-get/test.py @@ -4,10 +4,10 @@ h = hal.component("x") try: - ps = h.newpin("s", hal.HAL_S32, hal.HAL_OUT) - pu = h.newpin("u", hal.HAL_U32, hal.HAL_OUT) - pf = h.newpin("f", hal.HAL_FLOAT, hal.HAL_OUT) - param = h.newparam("param", hal.HAL_BIT, hal.HAL_RW) + ps = h.newpin("s", hal.HAL_S32, hal.Dir.OUT) + pu = h.newpin("u", hal.HAL_U32, hal.Dir.OUT) + pf = h.newpin("f", hal.Type.REAL, hal.Dir.OUT) + param = h.newparam("param", hal.Type.BOOL, hal.Dir.RW) h.ready() def try_set(p, v): @@ -64,27 +64,27 @@ def pin_validate(i, t, d): print("pincheck {} {} {} {}".format( i.get_name(), i.is_pin(), i.get_type() == t, i.get_dir() == d)) - pin_validate(ps, hal.HAL_S32, hal.HAL_OUT) - pin_validate(pu, hal.HAL_U32, hal.HAL_OUT) - pin_validate(pf, hal.HAL_FLOAT, hal.HAL_OUT) + pin_validate(ps, hal.HAL_S32, hal.Dir.OUT) + pin_validate(pu, hal.HAL_U32, hal.Dir.OUT) + pin_validate(pf, hal.Type.REAL, hal.Dir.OUT) pin = h.getitem("s") - pin_validate(pin, hal.HAL_S32, hal.HAL_OUT) + pin_validate(pin, hal.HAL_S32, hal.Dir.OUT) try: pin = h.getitem("not-found") print("{} {} {}".format("getitem", "not-found", "ok")) except: print("{} {} {}".format("getitem", "not-found", "fail")) - pin_validate(param, hal.HAL_BIT, hal.HAL_RW) + pin_validate(param, hal.Type.BOOL, hal.Dir.RW) param = h.getitem("param") - pin_validate(param, hal.HAL_BIT, hal.HAL_RW) + pin_validate(param, hal.Type.BOOL, hal.Dir.RW) pin = h.getpin("s") - pin_validate(pin, hal.HAL_S32, hal.HAL_OUT) + pin_validate(pin, hal.HAL_S32, hal.Dir.OUT) param = h.getparam("param") - pin_validate(param, hal.HAL_BIT, hal.HAL_RW) + pin_validate(param, hal.Type.BOOL, hal.Dir.RW) try_set_pin(pu, 0) try_set_pin(pu, -1) diff --git a/tests/halmodule.0/test.sh b/tests/halmodule/comp-set-get/test.sh similarity index 100% rename from tests/halmodule.0/test.sh rename to tests/halmodule/comp-set-get/test.sh diff --git a/tests/halmodule/halquery/expected b/tests/halmodule/halquery/expected new file mode 100644 index 00000000000..18671b2942e --- /dev/null +++ b/tests/halmodule/halquery/expected @@ -0,0 +1,60 @@ +# Pins +and2.0.in0 {'haltype': 'pin', 'name': 'and2.0.in0', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-input-a', 'comp': 'and2', 'comp_id': 'ID'} +and2.0.in1 {'haltype': 'pin', 'name': 'and2.0.in1', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-input-b', 'comp': 'and2', 'comp_id': 'ID'} +and2.0.out {'haltype': 'pin', 'name': 'and2.0.out', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-a', 'comp': 'and2', 'comp_id': 'ID'} +and2.0.time {'haltype': 'pin', 'name': 'and2.0.time', 'type': , 'dir': , 'value': 0, 'alias': None, 'signal': None, 'comp': 'and2', 'comp_id': 'ID'} +or2.0.in0 {'haltype': 'pin', 'name': 'or2.0.in0', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-input-a', 'comp': 'or2', 'comp_id': 'ID'} +or2.0.in1 {'haltype': 'pin', 'name': 'or2.0.in1', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-input-b', 'comp': 'or2', 'comp_id': 'ID'} +or2.0.out {'haltype': 'pin', 'name': 'or2.0.out', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-b', 'comp': 'or2', 'comp_id': 'ID'} +or2.0.time {'haltype': 'pin', 'name': 'or2.0.time', 'type': , 'dir': , 'value': 0, 'alias': None, 'signal': None, 'comp': 'or2', 'comp_id': 'ID'} +testthread.threadbeat {'haltype': 'pin', 'name': 'testthread.threadbeat', 'type': , 'dir': , 'value': 0, 'alias': None, 'signal': None, 'comp': '__testthread', 'comp_id': 'ID'} +testthread.time {'haltype': 'pin', 'name': 'testthread.time', 'type': , 'dir': , 'value': 0, 'alias': None, 'signal': None, 'comp': '__testthread', 'comp_id': 'ID'} +xor2.0.in0 {'haltype': 'pin', 'name': 'xor2.0.in0', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-a', 'comp': 'xor2', 'comp_id': 'ID'} +xor2.0.in1 {'haltype': 'pin', 'name': 'xor2.0.in1', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-b', 'comp': 'xor2', 'comp_id': 'ID'} +xor2.0.out {'haltype': 'pin', 'name': 'xor2.0.out', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-output', 'comp': 'xor2', 'comp_id': 'ID'} +xor2.0.time {'haltype': 'pin', 'name': 'xor2.0.time', 'type': , 'dir': , 'value': 0, 'alias': None, 'signal': None, 'comp': 'xor2', 'comp_id': 'ID'} +# Params +and2.0.tmax {'haltype': 'parameter', 'name': 'and2.0.tmax', 'type': , 'dir': , 'value': 0, 'alias': None, 'comp': 'and2', 'comp_id': 'ID'} +and2.0.tmax-increased {'haltype': 'parameter', 'name': 'and2.0.tmax-increased', 'type': , 'dir': , 'value': False, 'alias': None, 'comp': 'and2', 'comp_id': 'ID'} +or2.0.tmax {'haltype': 'parameter', 'name': 'or2.0.tmax', 'type': , 'dir': , 'value': 0, 'alias': None, 'comp': 'or2', 'comp_id': 'ID'} +or2.0.tmax-increased {'haltype': 'parameter', 'name': 'or2.0.tmax-increased', 'type': , 'dir': , 'value': False, 'alias': None, 'comp': 'or2', 'comp_id': 'ID'} +testthread.tmax {'haltype': 'parameter', 'name': 'testthread.tmax', 'type': , 'dir': , 'value': 0, 'alias': None, 'comp': '__testthread', 'comp_id': 'ID'} +xor2.0.tmax {'haltype': 'parameter', 'name': 'xor2.0.tmax', 'type': , 'dir': , 'value': 0, 'alias': None, 'comp': 'xor2', 'comp_id': 'ID'} +xor2.0.tmax-increased {'haltype': 'parameter', 'name': 'xor2.0.tmax-increased', 'type': , 'dir': , 'value': False, 'alias': None, 'comp': 'xor2', 'comp_id': 'ID'} +# Signals +net-input-a {'haltype': 'signal', 'name': 'net-input-a', 'type': , 'value': False, 'writers': 0, 'readers': 2, 'bidirs': 0, 'driver': None} +net-input-b {'haltype': 'signal', 'name': 'net-input-b', 'type': , 'value': False, 'writers': 0, 'readers': 2, 'bidirs': 0, 'driver': None} +net-output {'haltype': 'signal', 'name': 'net-output', 'type': , 'value': False, 'writers': 1, 'readers': 0, 'bidirs': 0, 'driver': 'xor2.0.out'} +net-xor-a {'haltype': 'signal', 'name': 'net-xor-a', 'type': , 'value': False, 'writers': 1, 'readers': 1, 'bidirs': 0, 'driver': 'and2.0.out'} +net-xor-b {'haltype': 'signal', 'name': 'net-xor-b', 'type': , 'value': False, 'writers': 1, 'readers': 1, 'bidirs': 0, 'driver': 'or2.0.out'} +# Components +xor2 {'haltype': 'component', 'name': 'xor2', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': 'count=1'} +or2 {'haltype': 'component', 'name': 'or2', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': 'count=1'} +and2 {'haltype': 'component', 'name': 'and2', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': 'count=1'} +__testthread {'haltype': 'component', 'name': '__testthread', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': None} +threads {'haltype': 'component', 'name': 'threads', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': 'name1=testthread period1=1000000'} +# Functions +and2.0 {'haltype': 'function', 'name': 'and2.0', 'comp': 'and2', 'comp_id': 'ID', 'users': 1, 'reentrant': False} +or2.0 {'haltype': 'function', 'name': 'or2.0', 'comp': 'or2', 'comp_id': 'ID', 'users': 1, 'reentrant': False} +xor2.0 {'haltype': 'function', 'name': 'xor2.0', 'comp': 'xor2', 'comp_id': 'ID', 'users': 1, 'reentrant': False} +# Threads +testthread {'haltype': 'thread', 'name': 'testthread', 'comp': '__testthread', 'comp_id': 'ID', 'priority': 0, 'period': 1000000, 'functions': [{'haltype': 'threadfunction', 'name': 'and2.0', 'index': 0, 'is_init': False}, {'haltype': 'threadfunction', 'name': 'or2.0', 'index': 1, 'is_init': False}, {'haltype': 'threadfunction', 'name': 'xor2.0', 'index': 2, 'is_init': False}]} +# Signal pins +and2.0.out {'haltype': 'pin', 'name': 'and2.0.out', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-a', 'comp': 'and2', 'comp_id': 'ID'} +xor2.0.in0 {'haltype': 'pin', 'name': 'xor2.0.in0', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-xor-a', 'comp': 'xor2', 'comp_id': 'ID'} +# Intended failures +pin('does-not-exist') fails correctly +param('does-not-exist') fails correctly +signal('does-not-exist') fails correctly +comp('does-not-exist') fails correctly +comp(65534) fails correctly +funct('does-not-exist') fails correctly +thread('does-not-exist') fails correctly +signalpins('does-not-exist') fails correctly +# Simple named queries +Pin: {'haltype': 'pin', 'name': 'or2.0.in1', 'type': , 'dir': , 'value': False, 'alias': None, 'signal': 'net-input-b', 'comp': 'or2', 'comp_id': 'ID'} +Param: {'haltype': 'parameter', 'name': 'testthread.tmax', 'type': , 'dir': , 'value': 0, 'alias': None, 'comp': '__testthread', 'comp_id': 'ID'} +Signal: {'haltype': 'signal', 'name': 'net-output', 'type': , 'value': False, 'writers': 1, 'readers': 0, 'bidirs': 0, 'driver': 'xor2.0.out'} +Component: {'haltype': 'component', 'name': 'and2', 'type': , 'id': 'ID', 'pid': 0, 'ready': True, 'insmod': 'count=1'} +Function: {'haltype': 'function', 'name': 'xor2.0', 'comp': 'xor2', 'comp_id': 'ID', 'users': 1, 'reentrant': False} +Thread: {'haltype': 'thread', 'name': 'testthread', 'comp': '__testthread', 'comp_id': 'ID', 'priority': 0, 'period': 1000000, 'functions': [{'haltype': 'threadfunction', 'name': 'and2.0', 'index': 0, 'is_init': False}, {'haltype': 'threadfunction', 'name': 'or2.0', 'index': 1, 'is_init': False}, {'haltype': 'threadfunction', 'name': 'xor2.0', 'index': 2, 'is_init': False}]} diff --git a/tests/halmodule.3/halquerytest.py b/tests/halmodule/halquery/halquerytest.py similarity index 90% rename from tests/halmodule.3/halquerytest.py rename to tests/halmodule/halquery/halquerytest.py index 58bec69e8bd..0025382e2dc 100755 --- a/tests/halmodule.3/halquerytest.py +++ b/tests/halmodule/halquery/halquerytest.py @@ -1,19 +1,23 @@ #!/usr/bin/env python3 import hal +import re # There is a chance that component IDs are not always consistent. They # should be, but there are no guarantees. Therefore, we simply mask the # number and use 'ID' as replacement. +def fix_enum_numbers(d): + return re.sub(r':\s*\d+>', '>', str(d)) + def fix_comp_id(d): if 'comp_id' in d: d['comp_id'] = "ID" - return d + return fix_enum_numbers(d) def fix_id(d): if 'id' in d: d['id'] = "ID" - return d + return fix_enum_numbers(d) # Call the listing query methods. print("# Pins") @@ -26,7 +30,7 @@ def fix_id(d): print("# Signals") for n,v in hal.query.signals().items(): - print(n, v) + print(n, fix_enum_numbers(v)) print("# Components") for n,v in hal.query.comps().items(): @@ -67,7 +71,7 @@ def fix_id(d): print("# Simple named queries") print("Pin:", fix_comp_id(hal.query.pin('or2.0.in1'))) print("Param:", fix_comp_id(hal.query.param('testthread.tmax'))) -print("Signal:", hal.query.signal('net-output')) +print("Signal:", fix_enum_numbers(hal.query.signal('net-output'))) print("Component:", fix_id(hal.query.comp('and2'))) print("Function:", fix_comp_id(hal.query.funct('xor2.0'))) print("Thread:", fix_comp_id(hal.query.thread('testthread'))) diff --git a/tests/halmodule.3/test.hal b/tests/halmodule/halquery/test.hal similarity index 100% rename from tests/halmodule.3/test.hal rename to tests/halmodule/halquery/test.hal diff --git a/tests/halmodule.2/expected b/tests/halmodule/no-comp-needed/expected similarity index 100% rename from tests/halmodule.2/expected rename to tests/halmodule/no-comp-needed/expected diff --git a/tests/halmodule.2/halmodtest.py b/tests/halmodule/no-comp-needed/halmodtest.py similarity index 100% rename from tests/halmodule.2/halmodtest.py rename to tests/halmodule/no-comp-needed/halmodtest.py diff --git a/tests/halmodule.2/test.hal b/tests/halmodule/no-comp-needed/test.hal similarity index 100% rename from tests/halmodule.2/test.hal rename to tests/halmodule/no-comp-needed/test.hal diff --git a/tests/halmodule.1/expected b/tests/halmodule/stream/expected similarity index 100% rename from tests/halmodule.1/expected rename to tests/halmodule/stream/expected diff --git a/tests/halmodule.1/stream_reader.py b/tests/halmodule/stream/stream_reader.py similarity index 100% rename from tests/halmodule.1/stream_reader.py rename to tests/halmodule/stream/stream_reader.py diff --git a/tests/halmodule.1/stream_test.py b/tests/halmodule/stream/stream_test.py similarity index 100% rename from tests/halmodule.1/stream_test.py rename to tests/halmodule/stream/stream_test.py diff --git a/tests/halmodule.1/stream_writer.py b/tests/halmodule/stream/stream_writer.py similarity index 100% rename from tests/halmodule.1/stream_writer.py rename to tests/halmodule/stream/stream_writer.py diff --git a/tests/halmodule.1/test.hal b/tests/halmodule/stream/test.hal similarity index 100% rename from tests/halmodule.1/test.hal rename to tests/halmodule/stream/test.hal diff --git a/tests/io-startup/test-ui.py b/tests/io-startup/test-ui.py index d46c5a1fd6d..e818464510d 100755 --- a/tests/io-startup/test-ui.py +++ b/tests/io-startup/test-ui.py @@ -39,7 +39,7 @@ def wait_for_pin_value(pin_name, value, timeout=5.0): h = hal.component("test-ui") -h.newpin("tool-number", hal.HAL_S32, hal.HAL_IN) +h.newpin("tool-number", hal.HAL_S32, hal.Dir.IN) h.ready() # mark the component as 'ready' diff --git a/tests/motion/jogwheel-axis/test-ui.py b/tests/motion/jogwheel-axis/test-ui.py index e66b3ae478c..12fb6aa9473 100755 --- a/tests/motion/jogwheel-axis/test-ui.py +++ b/tests/motion/jogwheel-axis/test-ui.py @@ -60,20 +60,20 @@ def jog_axis(axis_letter, counts=1, scale=0.001): h = hal.component("test-ui") -h.newpin("axis-x-jog-enable", hal.HAL_BIT, hal.HAL_OUT) -h.newpin("axis-x-jog-counts", hal.HAL_S32, hal.HAL_OUT) -h.newpin("axis-x-jog-scale", hal.HAL_FLOAT, hal.HAL_OUT) -h.newpin("axis-x-position", hal.HAL_FLOAT, hal.HAL_IN) - -h.newpin("axis-y-jog-enable", hal.HAL_BIT, hal.HAL_OUT) -h.newpin("axis-y-jog-counts", hal.HAL_S32, hal.HAL_OUT) -h.newpin("axis-y-jog-scale", hal.HAL_FLOAT, hal.HAL_OUT) -h.newpin("axis-y-position", hal.HAL_FLOAT, hal.HAL_IN) - -h.newpin("axis-z-jog-enable", hal.HAL_BIT, hal.HAL_OUT) -h.newpin("axis-z-jog-counts", hal.HAL_S32, hal.HAL_OUT) -h.newpin("axis-z-jog-scale", hal.HAL_FLOAT, hal.HAL_OUT) -h.newpin("axis-z-position", hal.HAL_FLOAT, hal.HAL_IN) +h.newpin("axis-x-jog-enable", hal.Type.BOOL, hal.Dir.OUT) +h.newpin("axis-x-jog-counts", hal.HAL_S32, hal.Dir.OUT) +h.newpin("axis-x-jog-scale", hal.Type.REAL, hal.Dir.OUT) +h.newpin("axis-x-position", hal.Type.REAL, hal.Dir.IN) + +h.newpin("axis-y-jog-enable", hal.Type.BOOL, hal.Dir.OUT) +h.newpin("axis-y-jog-counts", hal.HAL_S32, hal.Dir.OUT) +h.newpin("axis-y-jog-scale", hal.Type.REAL, hal.Dir.OUT) +h.newpin("axis-y-position", hal.Type.REAL, hal.Dir.IN) + +h.newpin("axis-z-jog-enable", hal.Type.BOOL, hal.Dir.OUT) +h.newpin("axis-z-jog-counts", hal.HAL_S32, hal.Dir.OUT) +h.newpin("axis-z-jog-scale", hal.Type.REAL, hal.Dir.OUT) +h.newpin("axis-z-position", hal.Type.REAL, hal.Dir.IN) h.ready() # mark the component as 'ready' diff --git a/tests/motion/jogwheel-joint/test-ui.py b/tests/motion/jogwheel-joint/test-ui.py index 076f659d5df..fbedfc8e6f9 100755 --- a/tests/motion/jogwheel-joint/test-ui.py +++ b/tests/motion/jogwheel-joint/test-ui.py @@ -75,20 +75,20 @@ def jog_joint(joint_number, counts=1, scale=0.001): h = hal.component("test-ui") -h.newpin("joint-0-jog-enable", hal.HAL_BIT, hal.HAL_OUT) -h.newpin("joint-0-jog-counts", hal.HAL_S32, hal.HAL_OUT) -h.newpin("joint-0-jog-scale", hal.HAL_FLOAT, hal.HAL_OUT) -h.newpin("joint-0-position", hal.HAL_FLOAT, hal.HAL_IN) - -h.newpin("joint-1-jog-enable", hal.HAL_BIT, hal.HAL_OUT) -h.newpin("joint-1-jog-counts", hal.HAL_S32, hal.HAL_OUT) -h.newpin("joint-1-jog-scale", hal.HAL_FLOAT, hal.HAL_OUT) -h.newpin("joint-1-position", hal.HAL_FLOAT, hal.HAL_IN) - -h.newpin("joint-2-jog-enable", hal.HAL_BIT, hal.HAL_OUT) -h.newpin("joint-2-jog-counts", hal.HAL_S32, hal.HAL_OUT) -h.newpin("joint-2-jog-scale", hal.HAL_FLOAT, hal.HAL_OUT) -h.newpin("joint-2-position", hal.HAL_FLOAT, hal.HAL_IN) +h.newpin("joint-0-jog-enable", hal.Type.BOOL, hal.Dir.OUT) +h.newpin("joint-0-jog-counts", hal.HAL_S32, hal.Dir.OUT) +h.newpin("joint-0-jog-scale", hal.Type.REAL, hal.Dir.OUT) +h.newpin("joint-0-position", hal.Type.REAL, hal.Dir.IN) + +h.newpin("joint-1-jog-enable", hal.Type.BOOL, hal.Dir.OUT) +h.newpin("joint-1-jog-counts", hal.HAL_S32, hal.Dir.OUT) +h.newpin("joint-1-jog-scale", hal.Type.REAL, hal.Dir.OUT) +h.newpin("joint-1-position", hal.Type.REAL, hal.Dir.IN) + +h.newpin("joint-2-jog-enable", hal.Type.BOOL, hal.Dir.OUT) +h.newpin("joint-2-jog-counts", hal.HAL_S32, hal.Dir.OUT) +h.newpin("joint-2-jog-scale", hal.Type.REAL, hal.Dir.OUT) +h.newpin("joint-2-position", hal.Type.REAL, hal.Dir.IN) h.ready() # mark the component as 'ready' diff --git a/tests/raster/rastertest.py b/tests/raster/rastertest.py index 31cf8978490..4605672698e 100755 --- a/tests/raster/rastertest.py +++ b/tests/raster/rastertest.py @@ -188,22 +188,22 @@ def main(): c = hal.component("test") pin = { - 'reset': c.newpin("reset", hal.HAL_BIT, hal.HAL_OUT), - 'enabled': c.newpin("enabled", hal.HAL_BIT, hal.HAL_IN), - 'position': c.newpin("position", hal.HAL_FLOAT, hal.HAL_OUT), - 'output': c.newpin("output", hal.HAL_FLOAT, hal.HAL_IN), - 'offset': c.newpin("offset", hal.HAL_FLOAT, hal.HAL_IN), - 'bpp': c.newpin("bpp", hal.HAL_S32, hal.HAL_IN), - 'ppu': c.newpin("ppu", hal.HAL_FLOAT, hal.HAL_IN), - 'count': c.newpin("count", hal.HAL_S32, hal.HAL_IN), - 'fault': c.newpin("fault", hal.HAL_BIT, hal.HAL_IN), - 'fault_code': c.newpin("fault-code", hal.HAL_S32, hal.HAL_IN), - 'state': c.newpin("state", hal.HAL_S32, hal.HAL_IN), - 'bitmap_position': c.newpin("bitmap-position", hal.HAL_FLOAT, hal.HAL_IN), - 'current_pixel_index': c.newpin("current-pixel-index", hal.HAL_S32, hal.HAL_IN), - 'current_pixel_value': c.newpin("current-pixel-value", hal.HAL_FLOAT, hal.HAL_IN), - 'previous_pixel_value': c.newpin("previous-pixel-value", hal.HAL_FLOAT, hal.HAL_IN), - 'fraction': c.newpin("fraction", hal.HAL_FLOAT, hal.HAL_IN), + 'reset': c.newpin("reset", hal.Type.BOOL, hal.Dir.OUT), + 'enabled': c.newpin("enabled", hal.Type.BOOL, hal.Dir.IN), + 'position': c.newpin("position", hal.Type.REAL, hal.Dir.OUT), + 'output': c.newpin("output", hal.Type.REAL, hal.Dir.IN), + 'offset': c.newpin("offset", hal.Type.REAL, hal.Dir.IN), + 'bpp': c.newpin("bpp", hal.HAL_S32, hal.Dir.IN), + 'ppu': c.newpin("ppu", hal.Type.REAL, hal.Dir.IN), + 'count': c.newpin("count", hal.HAL_S32, hal.Dir.IN), + 'fault': c.newpin("fault", hal.Type.BOOL, hal.Dir.IN), + 'fault_code': c.newpin("fault-code", hal.HAL_S32, hal.Dir.IN), + 'state': c.newpin("state", hal.HAL_S32, hal.Dir.IN), + 'bitmap_position': c.newpin("bitmap-position", hal.Type.REAL, hal.Dir.IN), + 'current_pixel_index': c.newpin("current-pixel-index", hal.HAL_S32, hal.Dir.IN), + 'current_pixel_value': c.newpin("current-pixel-value", hal.Type.REAL, hal.Dir.IN), + 'previous_pixel_value': c.newpin("previous-pixel-value", hal.Type.REAL, hal.Dir.IN), + 'fraction': c.newpin("fraction", hal.Type.REAL, hal.Dir.IN), } c.ready() diff --git a/tests/tlo/test-ui.py b/tests/tlo/test-ui.py index c6c1f5e0402..5c8bee90b14 100755 --- a/tests/tlo/test-ui.py +++ b/tests/tlo/test-ui.py @@ -114,7 +114,7 @@ def verify_tool(tool, x, y, z, a, b, c, u, v, w, diameter, front_angle, back_ang h = hal.component("python-ui") -h.newpin("tool-number", hal.HAL_S32, hal.HAL_IN) +h.newpin("tool-number", hal.HAL_S32, hal.Dir.IN) h.ready() # mark the component as 'ready' diff --git a/tests/tool-info/non-random/test-ui.py b/tests/tool-info/non-random/test-ui.py index 137ad78c606..b87ee9e05bb 100755 --- a/tests/tool-info/non-random/test-ui.py +++ b/tests/tool-info/non-random/test-ui.py @@ -127,13 +127,13 @@ def wait_for_hal_pin(pin_name, value, timeout=10): h = hal.component("test-ui") -h.newpin("tool-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-pocket", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prepare", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-prepared", hal.HAL_BIT, hal.HAL_OUT) -h.newpin("tool-change", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-changed", hal.HAL_BIT, hal.HAL_OUT) +h.newpin("tool-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-pocket", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prepare", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-prepared", hal.Type.BOOL, hal.Dir.OUT) +h.newpin("tool-change", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-changed", hal.Type.BOOL, hal.Dir.OUT) h['tool-prepared'] = False h['tool-changed'] = False h.ready() diff --git a/tests/tool-info/random-no-startup-tool/test-ui.py b/tests/tool-info/random-no-startup-tool/test-ui.py index 62fe5707ad3..be69f2516b3 100755 --- a/tests/tool-info/random-no-startup-tool/test-ui.py +++ b/tests/tool-info/random-no-startup-tool/test-ui.py @@ -127,13 +127,13 @@ def wait_for_hal_pin(pin_name, value, timeout=10): h = hal.component("test-ui") -h.newpin("tool-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-pocket", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prepare", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-prepared", hal.HAL_BIT, hal.HAL_OUT) -h.newpin("tool-change", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-changed", hal.HAL_BIT, hal.HAL_OUT) +h.newpin("tool-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-pocket", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prepare", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-prepared", hal.Type.BOOL, hal.Dir.OUT) +h.newpin("tool-change", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-changed", hal.Type.BOOL, hal.Dir.OUT) h['tool-prepared'] = False h['tool-changed'] = False h.ready() diff --git a/tests/tool-info/random-with-startup-tool/test-ui.py b/tests/tool-info/random-with-startup-tool/test-ui.py index 1f373cd327d..de4c00a3943 100755 --- a/tests/tool-info/random-with-startup-tool/test-ui.py +++ b/tests/tool-info/random-with-startup-tool/test-ui.py @@ -127,13 +127,13 @@ def wait_for_hal_pin(pin_name, value, timeout=10): h = hal.component("test-ui") -h.newpin("tool-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-pocket", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prepare", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-prepared", hal.HAL_BIT, hal.HAL_OUT) -h.newpin("tool-change", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-changed", hal.HAL_BIT, hal.HAL_OUT) +h.newpin("tool-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-pocket", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prepare", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-prepared", hal.Type.BOOL, hal.Dir.OUT) +h.newpin("tool-change", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-changed", hal.Type.BOOL, hal.Dir.OUT) h['tool-prepared'] = False h['tool-changed'] = False h.ready() diff --git a/tests/toolchanger/m61/test-ui.py b/tests/toolchanger/m61/test-ui.py index ca29beb5d6e..0bc7e78315f 100755 --- a/tests/toolchanger/m61/test-ui.py +++ b/tests/toolchanger/m61/test-ui.py @@ -125,16 +125,16 @@ def do_tool_change_handshake(tool_number, pocket_number): h = hal.component("python-ui") -h.newpin("tool-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-pocket", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-from-pocket", hal.HAL_S32, hal.HAL_IN) +h.newpin("tool-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-pocket", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-from-pocket", hal.HAL_S32, hal.Dir.IN) -h.newpin("tool-prepare", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-prepared", hal.HAL_BIT, hal.HAL_OUT) +h.newpin("tool-prepare", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-prepared", hal.Type.BOOL, hal.Dir.OUT) -h.newpin("tool-change", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-changed", hal.HAL_BIT, hal.HAL_OUT) +h.newpin("tool-change", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-changed", hal.Type.BOOL, hal.Dir.OUT) h.ready() # mark the component as 'ready' diff --git a/tests/toolchanger/reload-tool/non-random/test-ui.py b/tests/toolchanger/reload-tool/non-random/test-ui.py index 7bff305516f..ac887ba7bcf 100755 --- a/tests/toolchanger/reload-tool/non-random/test-ui.py +++ b/tests/toolchanger/reload-tool/non-random/test-ui.py @@ -39,18 +39,18 @@ def wait_for_hal_pin(name, value, timeout=10): h = hal.component("test-ui") -h.newpin("tool-change", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-changed", hal.HAL_BIT, hal.HAL_OUT) +h.newpin("tool-change", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-changed", hal.Type.BOOL, hal.Dir.OUT) h["tool-changed"] = False -h.newpin("tool-prepare", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-prepared", hal.HAL_BIT, hal.HAL_OUT) +h.newpin("tool-prepare", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-prepared", hal.Type.BOOL, hal.Dir.OUT) h["tool-prepared"] = False -h.newpin("tool-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-pocket", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-from-pocket", hal.HAL_S32, hal.HAL_IN) +h.newpin("tool-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-pocket", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-from-pocket", hal.HAL_S32, hal.Dir.IN) h.ready() diff --git a/tests/toolchanger/reload-tool/random/test-ui.py b/tests/toolchanger/reload-tool/random/test-ui.py index 7e5fc520eca..29f3aa56b2c 100755 --- a/tests/toolchanger/reload-tool/random/test-ui.py +++ b/tests/toolchanger/reload-tool/random/test-ui.py @@ -39,18 +39,18 @@ def wait_for_hal_pin(name, value, timeout=10): h = hal.component("test-ui") -h.newpin("tool-change", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-changed", hal.HAL_BIT, hal.HAL_OUT) +h.newpin("tool-change", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-changed", hal.Type.BOOL, hal.Dir.OUT) h["tool-changed"] = False -h.newpin("tool-prepare", hal.HAL_BIT, hal.HAL_IN) -h.newpin("tool-prepared", hal.HAL_BIT, hal.HAL_OUT) +h.newpin("tool-prepare", hal.Type.BOOL, hal.Dir.IN) +h.newpin("tool-prepared", hal.Type.BOOL, hal.Dir.OUT) h["tool-prepared"] = False -h.newpin("tool-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-number", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-prep-pocket", hal.HAL_S32, hal.HAL_IN) -h.newpin("tool-from-pocket", hal.HAL_S32, hal.HAL_IN) +h.newpin("tool-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-number", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-prep-pocket", hal.HAL_S32, hal.Dir.IN) +h.newpin("tool-from-pocket", hal.HAL_S32, hal.Dir.IN) h.ready()