diff --git a/config/settings.properties b/config/settings.properties index f74284f..efb046d 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,10 +1,11 @@ -#Wed May 12 16:45:18 CEST 2021 -dry_mount_counter=2 +#Thu May 27 18:01:34 CEST 2021 +dry_mount_counter=0 +mounted_sample_position=X18 room_temperature_enabled=false pin_offset=-0.0 puck_types=true imaging_enabled=false -dry_timestamp=1.620830387256E9 +dry_timestamp=1.621263350745E9 roi_h=1000 led_level=0.0 beamline_status_enabled=false diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties index bbd4924..26842ec 100644 --- a/devices/led_ctrl_1.properties +++ b/devices/led_ctrl_1.properties @@ -1,8 +1,8 @@ -#Thu May 06 08:23:39 CEST 2021 +#Wed May 19 08:00:41 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 bbd4924..26842ec 100644 --- a/devices/led_ctrl_2.properties +++ b/devices/led_ctrl_2.properties @@ -1,8 +1,8 @@ -#Thu May 06 08:23:39 CEST 2021 +#Wed May 19 08:00:41 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 bbd4924..26842ec 100644 --- a/devices/led_ctrl_3.properties +++ b/devices/led_ctrl_3.properties @@ -1,8 +1,8 @@ -#Thu May 06 08:23:39 CEST 2021 +#Wed May 19 08:00:41 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/motion/trash.py b/script/motion/trash.py index 8b37f2c..1e91df5 100644 --- a/script/motion/trash.py +++ b/script/motion/trash.py @@ -14,9 +14,13 @@ def trash(): robot.assert_cleared() #robot.assert_in_known_point() + was_cold = robot.is_cold() + #Enabling enable_motion() + robot.move_gonio() + robot.get_gonio() robot.move_heater(to_bottom = False) robot.move_heater(to_bottom = True) @@ -31,6 +35,9 @@ def trash(): robot.move_heater(to_bottom = False) - robot.move_cold() + if was_cold: + robot.move_cold() + else: + robot.move_home() \ No newline at end of file