This commit is contained in:
@@ -34,14 +34,14 @@ class RobotSC(RobotTCP):
|
||||
|
||||
def get_dewar(self, segment, puck, sample):
|
||||
segment = self.toSegmentNumber(segment)
|
||||
self.start_task('getDewar',segment, puck, sample)
|
||||
self.start_task('getDewar',segment, puck, sample, is_room_temp())
|
||||
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
|
||||
self.assert_dewar()
|
||||
|
||||
def put_dewar(self, segment, puck, sample):
|
||||
segment = self.toSegmentNumber(segment)
|
||||
self.assert_dewar()
|
||||
self.start_task('putDewar',segment, puck, sample)
|
||||
self.start_task('putDewar',segment, puck, sample, is_room_temp())
|
||||
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
|
||||
self.assert_dewar()
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
|
||||
LED_LEVEL_ROOM_TEMPERATURE = 0.4
|
||||
LED_LEVEL_LN2 = 1.0
|
||||
|
||||
|
||||
"""
|
||||
@@ -67,7 +68,7 @@ def set_led_range(room_temp = True):
|
||||
"""
|
||||
Led range should be limitted in room temperature
|
||||
"""
|
||||
max_val = 0.40 if room_temp else 1.20
|
||||
max_val = LED_LEVEL_ROOM_TEMPERATURE if room_temp else LED_LEVEL_LN2
|
||||
led_ctrl_1.config.maxValue = max_val
|
||||
led_ctrl_1.config.save()
|
||||
led_ctrl_2.config.maxValue = max_val
|
||||
@@ -87,7 +88,7 @@ def set_led_range(room_temp = True):
|
||||
|
||||
|
||||
def is_led_room_temp():
|
||||
return led_ctrl_1.config.maxValue <= 0.50
|
||||
return led_ctrl_1.config.maxValue <= LED_LEVEL_ROOM_TEMPERATURE
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user