From 70db0321adaf50da9b5b13db6b4db0da7a71cfd5 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Tue, 3 Aug 2021 15:47:36 +0200 Subject: [PATCH] Second guiding tool --- config/devices.properties | 4 +++- config/settings.properties | 6 +++--- devices/C1.properties | 2 +- devices/D1.properties | 2 +- devices/E4.properties | 2 +- devices/E5.properties | 4 ++-- devices/F4.properties | 4 ++-- devices/led_ctrl_1.properties | 4 ++-- devices/led_ctrl_2.properties | 4 ++-- devices/led_ctrl_3.properties | 4 ++-- script/local.py | 7 +++++-- 11 files changed, 24 insertions(+), 19 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index dd55966..dedaded 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -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||| diff --git a/config/settings.properties b/config/settings.properties index 7c9a453..b418e07 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -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 diff --git a/devices/C1.properties b/devices/C1.properties index 35e2f58..97ecfb7 100644 --- a/devices/C1.properties +++ b/devices/C1.properties @@ -1,3 +1,3 @@ -#Wed Apr 07 10:58:15 CEST 2021 +#Tue Aug 03 11:50:02 CEST 2021 detection=Mechanical disabled=false diff --git a/devices/D1.properties b/devices/D1.properties index 61f54c3..eb0607e 100644 --- a/devices/D1.properties +++ b/devices/D1.properties @@ -1,3 +1,3 @@ -#Tue Sep 22 08:45:39 CEST 2020 +#Tue Aug 03 11:48:24 CEST 2021 detection=Mechanical disabled=false diff --git a/devices/E4.properties b/devices/E4.properties index c44f3ec..6c7467d 100644 --- a/devices/E4.properties +++ b/devices/E4.properties @@ -1,3 +1,3 @@ -#Tue Aug 27 11:23:47 CEST 2019 +#Tue Aug 03 11:43:46 CEST 2021 detection=Mechanical disabled=false diff --git a/devices/E5.properties b/devices/E5.properties index 544fe17..be89ec2 100644 --- a/devices/E5.properties +++ b/devices/E5.properties @@ -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 diff --git a/devices/F4.properties b/devices/F4.properties index 255288d..826104f 100644 --- a/devices/F4.properties +++ b/devices/F4.properties @@ -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 diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties index 84b5b6a..c13fa2a 100644 --- a/devices/led_ctrl_1.properties +++ b/devices/led_ctrl_1.properties @@ -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 diff --git a/devices/led_ctrl_2.properties b/devices/led_ctrl_2.properties index 84b5b6a..c13fa2a 100644 --- a/devices/led_ctrl_2.properties +++ b/devices/led_ctrl_2.properties @@ -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 diff --git a/devices/led_ctrl_3.properties b/devices/led_ctrl_3.properties index 84b5b6a..c13fa2a 100644 --- a/devices/led_ctrl_3.properties +++ b/devices/led_ctrl_3.properties @@ -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 diff --git a/script/local.py b/script/local.py index 981ac72..95be620 100644 --- a/script/local.py +++ b/script/local.py @@ -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: