diff --git a/config/devices.properties b/config/devices.properties index 439fff4..eafe62f 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -55,3 +55,7 @@ led_ctrl_1=ch.psi.pshell.modbus.ProcessVariable|wago 0||| led_ctrl_2=ch.psi.pshell.modbus.ProcessVariable|wago 1||| led_ctrl_3=ch.psi.pshell.modbus.ProcessVariable|wago 2||| smc_current=ch.psi.pshell.modbus.ProcessVariable|wago 3||| +th2e=ch.psi.pshell.modbus.ModbusTCP|129.129.110.:502||| +temperature=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 1||10000| +humidity=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 5||10000| +dew_point=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 9||10000| diff --git a/config/settings.properties b/config/settings.properties index 3007787..6a8bdd9 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,11 +1,12 @@ -#Tue Sep 08 11:53:11 CEST 2020 -dry_mount_counter=1 +#Tue Oct 06 10:03:09 CEST 2020 +dry_mount_counter=7 +mounted_sample_position=C11 room_temperature_enabled=false -pin_offset=0.0 +pin_offset=0.508 puck_types=true pin_cleaner_timer=60 imaging_enabled=false -dry_timestamp=1.599556340515E9 +dry_timestamp=1.601971335576E9 roi_h=1000 led_level=0.0 beamline_status_enabled=false diff --git a/devices/dew_point.properties b/devices/dew_point.properties new file mode 100644 index 0000000..feb40c3 --- /dev/null +++ b/devices/dew_point.properties @@ -0,0 +1,6 @@ +#Tue Sep 08 12:55:58 CEST 2020 +unit=null +offset=0.0 +precision=-1 +sign_bit=0 +scale=1.0 diff --git a/devices/humidity.properties b/devices/humidity.properties new file mode 100644 index 0000000..feb40c3 --- /dev/null +++ b/devices/humidity.properties @@ -0,0 +1,6 @@ +#Tue Sep 08 12:55:58 CEST 2020 +unit=null +offset=0.0 +precision=-1 +sign_bit=0 +scale=1.0 diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties index eb9cf02..f753782 100644 --- a/devices/led_ctrl_1.properties +++ b/devices/led_ctrl_1.properties @@ -1,4 +1,4 @@ -#Mon Sep 07 09:39:40 CEST 2020 +#Fri Oct 02 14:37:21 CEST 2020 minValue=0.0 unit=V offset=0.0 diff --git a/devices/led_ctrl_2.properties b/devices/led_ctrl_2.properties index eb9cf02..f753782 100644 --- a/devices/led_ctrl_2.properties +++ b/devices/led_ctrl_2.properties @@ -1,4 +1,4 @@ -#Mon Sep 07 09:39:40 CEST 2020 +#Fri Oct 02 14:37:21 CEST 2020 minValue=0.0 unit=V offset=0.0 diff --git a/devices/led_ctrl_3.properties b/devices/led_ctrl_3.properties index eb9cf02..f753782 100644 --- a/devices/led_ctrl_3.properties +++ b/devices/led_ctrl_3.properties @@ -1,4 +1,4 @@ -#Mon Sep 07 09:39:40 CEST 2020 +#Fri Oct 02 14:37:21 CEST 2020 minValue=0.0 unit=V offset=0.0 diff --git a/devices/temperature.properties b/devices/temperature.properties new file mode 100644 index 0000000..feb40c3 --- /dev/null +++ b/devices/temperature.properties @@ -0,0 +1,6 @@ +#Tue Sep 08 12:55:58 CEST 2020 +unit=null +offset=0.0 +precision=-1 +sign_bit=0 +scale=1.0 diff --git a/devices/th2e.properties b/devices/th2e.properties new file mode 100644 index 0000000..8565b5e --- /dev/null +++ b/devices/th2e.properties @@ -0,0 +1,8 @@ +#Tue Sep 08 12:55:58 CEST 2020 +offsetWriteAnalogOutput=0 +offsetWriteDigitalOutput=0 +offsetReadAnalogOutput=0 +offsetReadDigitalInput=0 +offsetReadAnalogInput=0 +offsetReadDigitalOutput=0 +timeout=1000 diff --git a/plugins/MXSC-1.15.0.jar b/plugins/MXSC-1.15.0.jar new file mode 100644 index 0000000..bc87d7c Binary files /dev/null and b/plugins/MXSC-1.15.0.jar differ diff --git a/script/local.py b/script/local.py index 92e9ba8..00444d7 100644 --- a/script/local.py +++ b/script/local.py @@ -252,7 +252,7 @@ except: print >> sys.stderr, traceback.format_exc() try: - hexiposi.set_offset(16.5) + hexiposi.set_offset(16.3) hexiposi.polling=500 except: print >> sys.stderr, traceback.format_exc() diff --git a/script/motion/dry.py b/script/motion/dry.py index a34a3ed..eedc09c 100644 --- a/script/motion/dry.py +++ b/script/motion/dry.py @@ -1,5 +1,5 @@ DEFAULT_DRY_HEAT_TIME = 40.0 -DEFAULT_DRY_SPEED = 0.3 +DEFAULT_DRY_SPEED = 0.35 DEFAULT_DRY_WAIT_COLD = 40.0 def dry(heat_time=None, speed=None, wait_cold = None): diff --git a/script/motion/move_cold.py b/script/motion/move_cold.py index 89c8920..b4af5ab 100644 --- a/script/motion/move_cold.py +++ b/script/motion/move_cold.py @@ -1,8 +1,12 @@ -def move_cold(): +def move_cold(reset_timestamp=False): """ """ - print "move_cold" - + if reset_timestamp: + set_setting("dry_timestamp",time.time()) + print "move_cold and resetting dry_timestamp" + else: + print "move cold" + if robot.simulated: time.sleep(3.0) return