This commit is contained in:
@@ -76,11 +76,11 @@ class Hexiposi(DiscretePositionerBase):
|
||||
self.val = val
|
||||
self.move_pos(self.val)
|
||||
#Workaround as state does not changes immediatelly
|
||||
#if moving:
|
||||
# try:
|
||||
# self.waitState(State.Busy,1200)
|
||||
# except:
|
||||
# pass
|
||||
if moving:
|
||||
try:
|
||||
self.waitState(State.Busy,1200)
|
||||
except:
|
||||
pass
|
||||
|
||||
#def isReady(self):
|
||||
# self.get_status()
|
||||
@@ -97,7 +97,7 @@ class Hexiposi(DiscretePositionerBase):
|
||||
|
||||
|
||||
#http://129.129.110.83:8002/hexiposi/get
|
||||
dev = Hexiposi("hexiposi", "129.129.110.83:8002/hexiposi")
|
||||
dev = Hexiposi("hexiposi", "myriotell:8002/hexiposi")
|
||||
|
||||
add_device(dev, True)
|
||||
hexiposi.polling=500
|
||||
|
||||
@@ -24,14 +24,17 @@ class RobotSC(RobotTCP):
|
||||
RobotTCP.__init__(self, name, server, timeout, retries)
|
||||
self.setPolling(DEFAULT_ROBOT_POLLING)
|
||||
|
||||
def mount(self, puck, sample):
|
||||
def mount(self, segment, puck, sample):
|
||||
return self.execute('mount',segment, puck, sample)
|
||||
|
||||
def firstmount(self, puck, sample):
|
||||
def firstmount(self, segment, puck, sample):
|
||||
return self.execute('firstmount', segment, puck, sample)
|
||||
|
||||
def unmount(self, puck, sample):
|
||||
def unmount(self, segment, puck, sample):
|
||||
return self.execute('unmount',segment, puck, sample)
|
||||
|
||||
def robotRecover(self):
|
||||
return self.execute('robotRecover')
|
||||
|
||||
def on_event(self,ev):
|
||||
#print "EVT: " + ev
|
||||
|
||||
@@ -45,7 +45,7 @@ def set_led_level(level):
|
||||
|
||||
def get_led_level():
|
||||
level = get_setting("led_level")
|
||||
return float(50 if level is None else level)
|
||||
return float(0 if level is None else level)
|
||||
|
||||
def set_led_state(value):
|
||||
"""
|
||||
@@ -83,6 +83,7 @@ def set_led_range(room_temp = True):
|
||||
led_ctrl_2.write(max_val)
|
||||
if led_ctrl_3.read() > max_val:
|
||||
led_ctrl_3.write(max_val)
|
||||
set_led_level(get_led_level())
|
||||
|
||||
|
||||
def is_led_room_temp():
|
||||
|
||||
Reference in New Issue
Block a user