diff --git a/config/settings.properties b/config/settings.properties index bf3038d..b263c4d 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,11 +1,11 @@ -#Thu Apr 14 19:07:11 CEST 2022 -dry_mount_counter=0 +#Tue Dec 13 02:42:36 CET 2022 +dry_mount_counter=12 room_temperature_enabled=false pin_offset=-0.0 cryopos_in=5.0 puck_types=true imaging_enabled=false -dry_timestamp=1.649665486041E9 +dry_timestamp=1.670892576058E9 roi_h=1000 led_level=0.0 beamline_status_enabled=false diff --git a/config/variables.properties b/config/variables.properties index 6fe0452..dca71b5 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Thu Apr 07 09:44:08 CEST 2022 -LastRunDate=220407 -FileSequentialNumber=318 +#Sun Nov 06 05:52:40 CET 2022 +LastRunDate=221106 +FileSequentialNumber=330 DaySequentialNumber=4 diff --git a/devices/A2.properties b/devices/A2.properties index a3e483b..c18e801 100644 --- a/devices/A2.properties +++ b/devices/A2.properties @@ -1,3 +1,3 @@ -#Thu Nov 11 10:57:12 CET 2021 +#Tue Sep 13 11:05:36 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/A3.properties b/devices/A3.properties index 5950398..fcd73f7 100644 --- a/devices/A3.properties +++ b/devices/A3.properties @@ -1,3 +1,3 @@ -#Tue Mar 10 08:15:12 CET 2020 +#Tue Sep 13 11:05:59 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/B1.properties b/devices/B1.properties index d0db30a..181aa96 100644 --- a/devices/B1.properties +++ b/devices/B1.properties @@ -1,3 +1,3 @@ -#Wed Sep 16 08:50:16 CEST 2020 +#Wed Nov 09 16:49:21 CET 2022 detection=Mechanical disabled=false diff --git a/devices/B2.properties b/devices/B2.properties index f9b121a..b5a9f48 100644 --- a/devices/B2.properties +++ b/devices/B2.properties @@ -1,3 +1,3 @@ -#Thu Nov 12 09:42:34 CET 2020 +#Tue Sep 13 11:06:23 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/B3.properties b/devices/B3.properties index 4889b46..0a5daeb 100644 --- a/devices/B3.properties +++ b/devices/B3.properties @@ -1,3 +1,3 @@ -#Tue Nov 19 11:00:48 CET 2019 +#Tue Sep 13 11:06:46 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/B4.properties b/devices/B4.properties index 437d7ba..03e186f 100644 --- a/devices/B4.properties +++ b/devices/B4.properties @@ -1,3 +1,3 @@ -#Tue Jan 18 08:14:20 CET 2022 +#Wed Nov 02 08:29:43 CET 2022 detection=Mechanical disabled=false diff --git a/devices/C2.properties b/devices/C2.properties index 2081656..0f1a04a 100644 --- a/devices/C2.properties +++ b/devices/C2.properties @@ -1,3 +1,3 @@ -#Thu Nov 12 10:06:30 CET 2020 +#Tue Sep 13 11:07:03 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/F1.properties b/devices/F1.properties index e9cab7d..5ac0c73 100644 --- a/devices/F1.properties +++ b/devices/F1.properties @@ -1,3 +1,3 @@ -#Tue Aug 18 13:58:36 CEST 2020 +#Sat Nov 26 10:33:20 CET 2022 detection=Mechanical -disabled=false +disabled=true diff --git a/devices/F2.properties b/devices/F2.properties index 6e9df7a..66228ee 100644 --- a/devices/F2.properties +++ b/devices/F2.properties @@ -1,3 +1,3 @@ -#Tue Sep 10 08:18:28 CEST 2019 +#Mon Oct 03 15:49:00 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/F3.properties b/devices/F3.properties index 022d348..539f95e 100644 --- a/devices/F3.properties +++ b/devices/F3.properties @@ -1,3 +1,3 @@ -#Thu Apr 14 13:15:22 CEST 2022 +#Fri Oct 28 09:25:14 CEST 2022 detection=Mechanical disabled=false diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties index 2e780fe..c6677d1 100644 --- a/devices/led_ctrl_1.properties +++ b/devices/led_ctrl_1.properties @@ -1,8 +1,8 @@ -#Wed Apr 13 09:35:00 CEST 2022 +#Wed Nov 16 08:59:01 CET 2022 minValue=0.0 unit=V offset=0.0 -maxValue=0.4 +maxValue=1.0 precision=2 sign_bit=0 scale=3.0E-4 diff --git a/devices/led_ctrl_2.properties b/devices/led_ctrl_2.properties index 2e780fe..c6677d1 100644 --- a/devices/led_ctrl_2.properties +++ b/devices/led_ctrl_2.properties @@ -1,8 +1,8 @@ -#Wed Apr 13 09:35:00 CEST 2022 +#Wed Nov 16 08:59:01 CET 2022 minValue=0.0 unit=V offset=0.0 -maxValue=0.4 +maxValue=1.0 precision=2 sign_bit=0 scale=3.0E-4 diff --git a/devices/led_ctrl_3.properties b/devices/led_ctrl_3.properties index 2e780fe..c6677d1 100644 --- a/devices/led_ctrl_3.properties +++ b/devices/led_ctrl_3.properties @@ -1,8 +1,8 @@ -#Wed Apr 13 09:35:00 CEST 2022 +#Wed Nov 16 08:59:01 CET 2022 minValue=0.0 unit=V offset=0.0 -maxValue=0.4 +maxValue=1.0 precision=2 sign_bit=0 scale=3.0E-4 diff --git a/plugins/MXSC-1.15.0.jar b/plugins/MXSC-1.15.0.jar index 82a2afa..6baf6e1 100644 Binary files a/plugins/MXSC-1.15.0.jar and b/plugins/MXSC-1.15.0.jar differ diff --git a/script/local.py b/script/local.py index 0115b2a..f7662d6 100644 --- a/script/local.py +++ b/script/local.py @@ -94,6 +94,14 @@ cold_position_timeout = get_setting("cold_position_timeout") if cold_position_timeout is None: set_setting("cold_position_timeout", 0) +def blower_on(): + robot.evaluate("doFOut1=true") + + +def blower_off(): + robot.evaluate("doFOut1=false") + + def is_room_temperature_enabled(): setting = get_setting(ROOM_TEMPERATURE_ENABLED_PREFERENCE) diff --git a/script/motion/mount.py b/script/motion/mount.py index edac8e4..62e6d7e 100644 --- a/script/motion/mount.py +++ b/script/motion/mount.py @@ -183,7 +183,7 @@ def mount(segment, puck, sample, force=True, read_dm=False, auto_unmount=False): robot.close_tool() # closes gripper if is_normal: - cryopos.moveAsync(12.0) + cryopos.moveAsync(15.0) if count_mount: try: