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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/python/qtvcp/widgets/bar.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions scripts/hal_demo
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions src/emc/usr_intf/axis/scripts/haltest.py

This file was deleted.

10 changes: 5 additions & 5 deletions src/emc/usr_intf/pncconf/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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() ))
Expand Down Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions tests/hal-link-unlink/hallink.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
16 changes: 8 additions & 8 deletions tests/toolchanger/abort-during-change/test-ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
Loading