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

Second guiding tool

Browse Source
This commit is contained in:
gac-S_Changer
2021-08-03 15:47:36 +02:00
parent c5d26d76a3
commit 70db0321ad
11 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
+3 -1
View File
@@ -32,9 +32,11 @@ smc_magnet_status=ch.psi.pshell.modbus.DigitalInput|wago 10||1000|
smc_mounted_1=ch.psi.pshell.modbus.DigitalInput|wago 11||1000|
smc_mounted_2=ch.psi.pshell.modbus.DigitalInput|wago 12||1000|
#spare_di1=ch.psi.pshell.modbus.DigitalInput|wago 13||1000|
#spare_di2=ch.psi.pshell.modbus.DigitalInput|wago 14|||
#spare_di2=ch.psi.pshell.modbus.DigitalInput|wago 14||1000|
tool_suna=ch.psi.pshell.modbus.DigitalInput|wago 15||1000|
tool_psi=ch.psi.pshell.modbus.DigitalInput|wago 16||1000|
guiding_tool_park_2=ch.psi.pshell.modbus.DigitalInput|wago 17||1000|
#inputs=ch.psi.pshell.modbus.DigitalInputArray|wago 0 32|||
relays=ch.psi.pshell.modbus.DigitalOutputArray|wago 0 16||1000|
release_local_safety=ch.psi.pshell.modbus.DigitalOutput|wago 0|||
release_psys_safety=ch.psi.pshell.modbus.DigitalOutput|wago 1|||
config/settings.properties
+3 -3
View File
@@ -1,10 +1,10 @@
#Wed Jun 23 15:21:19 CEST 2021
dry_mount_counter=10
#Tue Aug 03 15:47:03 CEST 2021
dry_mount_counter=0
room_temperature_enabled=true
pin_offset=-0.0
puck_types=true
imaging_enabled=false
dry_timestamp=1.624437082387E9
dry_timestamp=1.626022970894E9
roi_h=1000
led_level=0.0
beamline_status_enabled=false
devices/C1.properties
+1 -1
View File
@@ -1,3 +1,3 @@
#Wed Apr 07 10:58:15 CEST 2021
#Tue Aug 03 11:50:02 CEST 2021
detection=Mechanical
disabled=false
devices/D1.properties
+1 -1
View File
@@ -1,3 +1,3 @@
#Tue Sep 22 08:45:39 CEST 2020
#Tue Aug 03 11:48:24 CEST 2021
detection=Mechanical
disabled=false
devices/E4.properties
+1 -1
View File
@@ -1,3 +1,3 @@
#Tue Aug 27 11:23:47 CEST 2019
#Tue Aug 03 11:43:46 CEST 2021
detection=Mechanical
disabled=false
devices/E5.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Wed Jun 02 10:32:23 CEST 2021
#Tue Aug 03 11:35:27 CEST 2021
detection=Mechanical
disabled=true
disabled=false
devices/F4.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Wed Jun 02 10:36:29 CEST 2021
#Tue Aug 03 11:35:45 CEST 2021
detection=Mechanical
disabled=true
disabled=false
devices/led_ctrl_1.properties
+2 -2
View File
@@ -1,8 +1,8 @@
#Thu May 27 08:24:48 CEST 2021
#Mon Jul 12 12:26:04 CEST 2021
minValue=0.0
unit=V
offset=0.0
maxValue=1.0
maxValue=0.4
precision=2
sign_bit=0
scale=3.0E-4
devices/led_ctrl_2.properties
+2 -2
View File
@@ -1,8 +1,8 @@
#Thu May 27 08:24:48 CEST 2021
#Mon Jul 12 12:26:04 CEST 2021
minValue=0.0
unit=V
offset=0.0
maxValue=1.0
maxValue=0.4
precision=2
sign_bit=0
scale=3.0E-4
devices/led_ctrl_3.properties
+2 -2
View File
@@ -1,8 +1,8 @@
#Thu May 27 08:24:48 CEST 2021
#Mon Jul 12 12:26:04 CEST 2021
minValue=0.0
unit=V
offset=0.0
maxValue=1.0
maxValue=0.4
precision=2
sign_bit=0
scale=3.0E-4
script/local.py
+5 -2
View File
@@ -177,7 +177,9 @@ def system_check(robot_move=True):
if not feedback_psys_safety.read():
raise Exception("Psys safety not released")
if not guiding_tool_park.read():
raise Exception("Guiding tool not parked")
raise Exception("Guiding tool 1 not parked")
if not guiding_tool_park_2.read():
raise Exception("Guiding tool 2 not parked")
def system_check_msg():
try:
@@ -358,9 +360,10 @@ def assert_mount_position():
def is_puck_loading():
guiding_tool_parked = guiding_tool_park.read() and guiding_tool_park_2.read()
return robot.state == State.Ready and robot.take()["pos"] == 'pPark' and \
feedback_psys_safety.take() == False and \
not guiding_tool_park.read()
not guiding_tool_parked
def set_pin_offset(val):
if abs(val) >5: