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

improve handling of dry_timestamp

Browse Source
This commit is contained in:
gac-S_Changer
2020-10-06 10:04:51 +02:00
parent ef934bc30a
commit 539a51dc66
13 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
+4
View File
@@ -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|
config/settings.properties
+5 -4
View File
@@ -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
devices/dew_point.properties
+6
View File
@@ -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
devices/humidity.properties
+6
View File
@@ -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
devices/led_ctrl_1.properties
+1 -1
View File
@@ -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
devices/led_ctrl_2.properties
+1 -1
View File
@@ -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
devices/led_ctrl_3.properties
+1 -1
View File
@@ -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
devices/temperature.properties
+6
View File
@@ -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
devices/th2e.properties
+8
View File
@@ -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
plugins/MXSC-1.15.0.jar
BIN
View File
Binary file not shown.
script/local.py
+1 -1
View File
@@ -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:
script/motion/dry.py
+1 -1
View File
@@ -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):
script/motion/move_cold.py
+7 -3
View File
@@ -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