This commit is contained in:
@@ -55,12 +55,14 @@ class RobotSC(RobotTCP):
|
||||
self.assert_dewar()
|
||||
|
||||
def put_gonio(self):
|
||||
self.start_task('putGonio')
|
||||
pin_offset = get_pin_offset()
|
||||
self.start_task('putGonio', pin_offset)
|
||||
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
|
||||
self.assert_gonio()
|
||||
|
||||
def get_gonio(self):
|
||||
self.start_task('getGonio')
|
||||
pin_offset = get_pin_offset()
|
||||
self.start_task('getGonio', pin_offset)
|
||||
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
|
||||
self.assert_gonio()
|
||||
|
||||
|
||||
@@ -238,6 +238,25 @@ def is_puck_loading():
|
||||
feedback_psys_safety.take() == False and \
|
||||
not guiding_tool_park.read()
|
||||
|
||||
def set_pin_offset(val):
|
||||
if abs(val) >5:
|
||||
raise Exception("Invlid pin offset: " + str(val))
|
||||
try:
|
||||
set_setting("pin_offset",float(val))
|
||||
except:
|
||||
log("Error setting pin offset: " + str(sys.exc_info()[1]), False)
|
||||
|
||||
def get_pin_offset():
|
||||
try:
|
||||
ret = float(get_setting("pin_offset"))
|
||||
if abs(ret) >5:
|
||||
raise Exception("Invlid configured pin offset: " + str(ret))
|
||||
return ret
|
||||
except:
|
||||
log("Error getting pin offset: " + str(sys.exc_info()[1]), False)
|
||||
return 0.0
|
||||
|
||||
|
||||
|
||||
update()
|
||||
add_device(Controller.getInstance().basePlate, True)
|
||||
|
||||
@@ -6,7 +6,7 @@ test_sample_data = [ \
|
||||
{ "userName": USER_NAME, \
|
||||
"dewarName": DEWAR_NAME, \
|
||||
"puckName": "Isabelle Chip", \
|
||||
"puckBarcode": "PuckWithChips", \
|
||||
"puckBarcode": "CA00CF1471", \
|
||||
"puckType": "unipuck", \
|
||||
"puckAddress": "",\
|
||||
"sampleName": "flat_Base_Pin_1", \
|
||||
@@ -18,7 +18,7 @@ test_sample_data = [ \
|
||||
{ "userName": USER_NAME, \
|
||||
"dewarName": DEWAR_NAME, \
|
||||
"puckName": "Isabelle Chip", \
|
||||
"puckBarcode": "PuckWithChips", \
|
||||
"puckBarcode": "CA00CF1471", \
|
||||
"puckType": "unipuck", \
|
||||
"puckAddress": "",\
|
||||
"sampleName": "flat_Base_Pin_2", \
|
||||
@@ -30,7 +30,7 @@ test_sample_data = [ \
|
||||
{ "userName": USER_NAME, \
|
||||
"dewarName": DEWAR_NAME, \
|
||||
"puckName": "Isabelle Chip", \
|
||||
"puckBarcode": "PuckWithChips", \
|
||||
"puckBarcode": "CA00CF1471", \
|
||||
"puckType": "unipuck", \
|
||||
"puckAddress": "",\
|
||||
"sampleName": "regular_Base_Pin_1", \
|
||||
@@ -42,7 +42,7 @@ test_sample_data = [ \
|
||||
{ "userName": USER_NAME, \
|
||||
"dewarName": DEWAR_NAME, \
|
||||
"puckName": "Isabelle Chip", \
|
||||
"puckBarcode": "PuckWithChips", \
|
||||
"puckBarcode": "CA00CF1471", \
|
||||
"puckType": "unipuck", \
|
||||
"puckAddress": "",\
|
||||
"sampleName": "regular_Base_Pin_2", \
|
||||
|
||||
Reference in New Issue
Block a user