tell/X06SA
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

way too many changes for git to be useful

Browse Source
This commit is contained in:
gac-S_Changer
2020-09-28 11:22:13 +02:00
parent e0a65b13f8
commit 1d710de372
12 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
+1
View File
@@ -1,3 +1,4 @@
eh_door_lock=ch.psi.pshell.epics.ChannelString|X06SA-EH1-LAC:02_05|Read||true
img=ch.psi.pshell.prosilica.Prosilica|204464 "PacketSize=1504;PixelFormat=Mono8;BinningX=1;BinningY=1;RegionX=290;RegionY=130;Width=1000;Height=1000;MulticastEnable=Off"||-200|false
gripper_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8ea5e463.psi.ch/axis-cgi/mjpg/video.cgi?camera=1 reopen||-200|false
monitoring_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8ea5e463.psi.ch/axis-cgi/mjpg/video.cgi?camera=2 reopen||-200|
config/settings.properties
+5 -4
View File
@@ -1,12 +1,13 @@
#Tue Sep 08 11:33:09 CEST 2020
#Mon Sep 28 11:16:27 CEST 2020
dry_mount_counter=0
mounted_sample_position=D55
room_temperature_enabled=false
pin_offset=0.0
pin_offset=4.0
puck_types=true
imaging_enabled=false
dry_timestamp=1.599547021734E9
dry_timestamp=1.601024255965E9
roi_h=1000
led_level=100.0
led_level=0.0
beamline_status_enabled=false
force_dry_mount_count=15
roi_y=123
config/variables.properties
+2 -2
View File
@@ -1,2 +1,2 @@
#Tue Sep 08 08:54:33 CEST 2020
FileSequentialNumber=247
#Wed Sep 16 14:05:05 CEST 2020
FileSequentialNumber=251
devices/B1.properties
+1 -1
View File
@@ -1,3 +1,3 @@
#Mon Apr 29 16:18:33 CEST 2019
#Wed Sep 16 08:50:16 CEST 2020
detection=Mechanical
disabled=false
devices/led_ctrl_1.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Fri Aug 21 12:46:01 CEST 2020
#Wed Sep 16 13:43:58 CEST 2020
minValue=0.0
unit=V
offset=0.0
devices/led_ctrl_2.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Fri Aug 21 12:46:01 CEST 2020
#Wed Sep 16 13:43:58 CEST 2020
minValue=0.0
unit=V
offset=0.0
devices/led_ctrl_3.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Fri Aug 21 12:46:01 CEST 2020
#Wed Sep 16 13:43:58 CEST 2020
minValue=0.0
unit=V
offset=0.0
devices/smart_magnet.properties
+6 -6
View File
@@ -1,8 +1,8 @@
#Tue Sep 17 13:46:27 CEST 2019
holdingCurrent=50.0
mountCurrent=30.0
remanenceCurrent=-10.0
restingCurrent=30.0
reverseCurrent=-10.0
#Thu Sep 24 14:17:37 CEST 2020
reverseTime=0.2
unmountCurrent=20.0
holdingCurrent=50.0
restingCurrent=30.0
reverseCurrent=-10.0
remanenceCurrent=-10.0
mountCurrent=30.0
devices/smc_current.properties
+5 -5
View File
@@ -1,9 +1,9 @@
#Wed Jan 30 11:33:15 CET 2019
maxValue=70.0
minValue=-50.0
#Tue Sep 15 15:20:57 CEST 2020
offset=0.0
maxValue=90.0
precision=2
resolution=NaN
scale=0.003
sign_bit=0
resolution=NaN
minValue=-50.0
unit=mA
sign_bit=0
script/devices/RobotSC.py
+1 -1
View File
@@ -85,7 +85,7 @@ class RobotSC(RobotTCP):
def get_gonio(self):
pin_offset = get_pin_offset()
print "Pin offset = " + str(pin_offset)
self.start_task('getGonio', pin_offset)
self.start_task('getGonio', pin_offset)
self.wait_task_finished(TASK_WAIT_ROBOT_POLLING)
self.assert_gonio()
self.last_command_position = "gonio"
script/motion/dry.py
+1 -1
View File
@@ -1,5 +1,5 @@
DEFAULT_DRY_HEAT_TIME = 40.0
DEFAULT_DRY_SPEED = 0.5
DEFAULT_DRY_SPEED = 0.45
DEFAULT_DRY_WAIT_COLD = 30.0
def dry(heat_time=None, speed=None, wait_cold = None):
script/tasks/ColdPositionTimeout.py
+16 -15
View File
@@ -1,20 +1,21 @@
cold_position_timeout = int(get_setting("cold_position_timeout"))
if cold_position_timeout > 0:
if robot.last_command_position == "cold":
if (time.time() - robot.last_command_timestamp) > cold_position_timeout:
if robot.is_cold():
log("Detected cold position timeout", False)
if get_context().state == State.Ready:
if robot.state == State.Ready:
if feedback_psys_safety.take() == True:
#TODO: Chan
get_context().evalLine("dry(wait_cold = -1)") #Dry and park : use get_context().evalLine to change application state
if "Locked" == eh_door_lock.getValue():
cold_position_timeout = int(get_setting("cold_position_timeout"))
if cold_position_timeout > 0:
if robot.last_command_position == "cold":
if (time.time() - robot.last_command_timestamp) > cold_position_timeout:
if robot.is_cold():
log("Detected cold position timeout", False)
if get_context().state == State.Ready:
if robot.state == State.Ready:
if feedback_psys_safety.take() == True:
#TODO: Chan
get_context().evalLine("dry(wait_cold = -1)") #Dry and park : use get_context().evalLine to change application state
else:
raise Exception("Cannot clear cold position: feedback_psys_safety = False ")
else:
raise Exception("Cannot clear cold position: feedback_psys_safety = False ")
raise Exception("Cannot clear cold position: robot state: " + str(robot.state))
else:
raise Exception("Cannot clear cold position: robot state: " + str(robot.state))
else:
raise Exception("Cannot clear cold position: system state: " + str(get_context().state))
raise Exception("Cannot clear cold position: system state: " + str(get_context().state))