diff --git a/lib/python/qtvcp/widgets/bar.py b/lib/python/qtvcp/widgets/bar.py index e57b6aca887..b53fe23b336 100644 --- a/lib/python/qtvcp/widgets/bar.py +++ b/lib/python/qtvcp/widgets/bar.py @@ -440,7 +440,7 @@ def _hal_init(self): self._superOpposite = self._opposite - if self._pin_type == HALPinType.FLOAT: + if self._pin_type == HALPinType.REAL: 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: diff --git a/scripts/hal_demo b/scripts/hal_demo index 6591d65a2e5..3e27e42153b 100755 --- a/scripts/hal_demo +++ b/scripts/hal_demo @@ -136,10 +136,10 @@ if [ "$1" = "parport1" ] ; then bin/halcmd show param echo "Hit enter to create some signals" read - echo "$ bin/halcmd newsig jumper1 bit" - bin/halcmd newsig jumper1 bit - echo "$ bin/halcmd newsig jumper2 bit" - bin/halcmd newsig jumper2 bit + echo "$ bin/halcmd newsig jumper1 bool" + bin/halcmd newsig jumper1 bool + echo "$ bin/halcmd newsig jumper2 bool" + bin/halcmd newsig jumper2 bool echo "(signals created - lets look at them)" echo "$ bin/halcmd show sig" bin/halcmd show sig diff --git a/src/emc/usr_intf/axis/scripts/haltest.py b/src/emc/usr_intf/axis/scripts/haltest.py deleted file mode 100644 index 4d64f3e229f..00000000000 --- a/src/emc/usr_intf/axis/scripts/haltest.py +++ /dev/null @@ -1,10 +0,0 @@ -from hal import *; import time -h = component("test"); -h.newpin("i", HAL_S32, HAL_OUT); -h.newpin("f", HAL_FLOAT, HAL_OUT); -h.newpin("u32", HAL_U32, HAL_OUT); -while 1: - h.i += 1; - h.f = h.i * .3125 - h.u32 = (7*h.i) % 256 - time.sleep(.1) diff --git a/src/emc/usr_intf/pncconf/tests.py b/src/emc/usr_intf/pncconf/tests.py index 0b367806a35..64bf2507b06 100644 --- a/src/emc/usr_intf/pncconf/tests.py +++ b/src/emc/usr_intf/pncconf/tests.py @@ -616,7 +616,7 @@ def get_value(d): # do I/O write commands for i in write: halrun.write('%s\n'%i) - halrun.write( "newsig estop-out bit\n") + halrun.write( "newsig estop-out bool\n") halrun.write( "sets estop-out false\n") halrun.write("setp pid.0.Pgain %d\n"% ( w[axis+"P"].get_value() )) halrun.write("setp pid.0.Igain %d\n"% ( w[axis+"I"].get_value() )) @@ -973,11 +973,11 @@ def get_value(d): halrun.write( "addf charge-pump servo-thread\n") for i in write: halrun.write('%s\n'%i) - halrun.write( "newsig estop-out bit\n") + halrun.write( "newsig estop-out bool\n") halrun.write( "sets estop-out false\n") - halrun.write( "newsig enable-not bit\n") - halrun.write( "newsig dir-not bit\n") - halrun.write( "newsig dir bit\n") + halrun.write( "newsig enable-not bool\n") + halrun.write( "newsig dir-not bool\n") + halrun.write( "newsig dir bool\n") # search for pins with test signals that may be needed to enable amp self.hal_test_signals(axis) diff --git a/tests/hal-link-unlink/hallink.py b/tests/hal-link-unlink/hallink.py index 59587b60a2a..a63c5a7a31b 100755 --- a/tests/hal-link-unlink/hallink.py +++ b/tests/hal-link-unlink/hallink.py @@ -24,8 +24,8 @@ def cmd(arg): assert h['inout'] == 4713 # create virgin signals -cmd("halcmd newsig insig float") -cmd("halcmd newsig inoutsig float") +cmd("halcmd newsig insig real") +cmd("halcmd newsig inoutsig real") # link to them cmd("halcmd net insig linktest.in") diff --git a/tests/toolchanger/abort-during-change/test-ui.py b/tests/toolchanger/abort-during-change/test-ui.py index a3cd56a859f..4b8727c15c5 100755 --- a/tests/toolchanger/abort-during-change/test-ui.py +++ b/tests/toolchanger/abort-during-change/test-ui.py @@ -121,16 +121,16 @@ def do_tool_change_handshake(): 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()