diff --git a/config/config.properties b/config/config.properties index 0b4b39a..7bf478c 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,33 +1,33 @@ -#Tue Mar 19 08:37:33 CET 2019 +#Thu Oct 31 15:04:03 CET 2019 autoSaveScanData=true -commandExecutionEvents=false -createSessionFiles=true -dataLayout=default -dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name} -dataProvider=h5 -dataScanFlushRecords=true -dataScanPreserveTypes=false -dataScanReleaseRecords=false -dataServerPort=-1 -depthDimension=0 -hideServerMessages=true -hostName=null -instanceName=X06SA -logDaysToLive=30 -logLevel=Fine -logLevelConsole=Off -logPath={logs}/{date}_{time} -notificationLevel=null -saveCommandStatistics=true -scanStreamerPort=-1 -serverEnabled=true -serverPort=8080 simulation=false -terminalEnabled=false -terminalPort=3579 +commandExecutionEvents=false +logDaysToLive=30 userAuthenticator= -userManagement=false -versionTrackingEnabled=true -versionTrackingLogin={context}/svcusr-hlapp_robot +logLevelConsole=Off +scanStreamerPort=-1 versionTrackingManual=true +hostName=null +userManagement=false +instanceName=X06SA +dataServerPort=-1 +hideServerMessages=true +serverPort=8080 +versionTrackingEnabled=true +dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name} +serverEnabled=true +dataScanReleaseRecords=false +depthDimension=0 +dataScanPreserveTypes=false +logLevel=Fine +dataScanFlushRecords=true +logPath={logs}/{date}_{time} +dataLayout=table +terminalEnabled=false +notificationLevel=null +terminalPort=3579 +createSessionFiles=true +versionTrackingLogin={context}/svcusr-hlapp_robot versionTrackingRemote=git@git.psi.ch\:tell/X06SA.git +dataProvider=txt +saveCommandStatistics=true diff --git a/config/devices.properties b/config/devices.properties index 5c89c68..c911e5a 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -7,7 +7,7 @@ mscan_pin=ch.psi.pshell.serial.TcpDevice|mscan-tell6s-pin:2001||| mscan_pin_cmd=ch.psi.pshell.serial.TcpDevice|mscan-tell6s-pin:2003||| mscan_puck=ch.psi.pshell.serial.TcpDevice|mscan-tell6s-puck:2001||| mscan_puck_cmd=ch.psi.pshell.serial.TcpDevice|mscan-tell6s-puck:2003||| -ue=LaserUE|COM4|||true +ue=LaserUE|COM3|||true puck_detection=ch.psi.mxsc.PuckDetection|tell6s-raspberrypi:5556||| wago=ch.psi.pshell.modbus.ModbusTCP|tell6s-wago:502||| led_ok_1=ch.psi.pshell.modbus.DigitalInput|wago 0||1000| diff --git a/config/plugins.properties b/config/plugins.properties index a3380ea..1522a96 100644 --- a/config/plugins.properties +++ b/config/plugins.properties @@ -1,6 +1,7 @@ +MXSC-1.10.0\ -\ Back.jar=disabled Commands.java=disabled Recovery.java=disabled -MXSC-1.10.0.jar=enabled +MXSC-1.10.0.jar=disabled WagoPanel.java=enabled LaserUEPanel.java=enabled BarcodeReaderPanel.java=enabled diff --git a/config/settings.properties b/config/settings.properties index ae6e8fe..30724a6 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,18 +1,18 @@ -#Wed Sep 25 11:32:39 CEST 2019 -barcode_reader_scan_pucks=false -beamline_status_enabled=false -cold_position_timeout=3600 +#Wed Jan 22 08:53:02 CET 2020 dry_mount_counter=0 -dry_timestamp=1.569403361248E9 -force_dry_mount_count=8 -force_dry_timeout=0 -imaging_enabled=false -led_level=0.0 +room_temperature_enabled=false pin_offset=0.0 puck_types=true +imaging_enabled=false +dry_timestamp=1.579679582092E9 roi_h=1000 +led_level=0.0 +beamline_status_enabled=false +force_dry_mount_count=8 +roi_y=123 +barcode_reader_scan_pucks=false +cold_position_timeout=3600 +force_dry_timeout=0 roi_w=1000 -roi_x=288 -roi_y=124 -room_temperature_enabled=false +roi_x=289 valve_control=false diff --git a/config/variables.properties b/config/variables.properties index ff86a2b..d457b07 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Tue Sep 24 12:05:29 CEST 2019 -FileSequentialNumber=24 +#Tue Jan 21 14:03:38 CET 2020 +FileSequentialNumber=138 diff --git a/devices/A3.properties b/devices/A3.properties index e34c6cb..d21184c 100644 --- a/devices/A3.properties +++ b/devices/A3.properties @@ -1,3 +1,3 @@ -#Thu Jun 06 15:40:30 CEST 2019 +#Tue Jan 21 09:46:43 CET 2020 detection=Mechanical disabled=false diff --git a/devices/A5.properties b/devices/A5.properties index 8b9ee93..adcc5f3 100644 --- a/devices/A5.properties +++ b/devices/A5.properties @@ -1,3 +1,3 @@ -#Thu Jun 06 15:40:38 CEST 2019 +#Tue Jan 21 09:46:49 CET 2020 detection=Mechanical disabled=false diff --git a/devices/B3.properties b/devices/B3.properties index 8b811a9..e2eed82 100644 --- a/devices/B3.properties +++ b/devices/B3.properties @@ -1,3 +1,3 @@ -#Mon Apr 29 16:40:05 CEST 2019 +#Tue Nov 19 11:00:48 CET 2019 detection=Mechanical disabled=false diff --git a/devices/B4.properties b/devices/B4.properties index 39c7a01..074e71d 100644 --- a/devices/B4.properties +++ b/devices/B4.properties @@ -1,3 +1,3 @@ -#Wed Aug 21 15:20:23 CEST 2019 +#Sat Dec 14 17:27:09 CET 2019 detection=Mechanical disabled=false diff --git a/devices/B5.properties b/devices/B5.properties index bb45e5a..f768e0f 100644 --- a/devices/B5.properties +++ b/devices/B5.properties @@ -1,3 +1,3 @@ -#Wed Aug 21 15:20:26 CEST 2019 +#Wed Dec 11 08:55:08 CET 2019 detection=Mechanical disabled=false diff --git a/devices/C4.properties b/devices/C4.properties index eb44bbb..61fba0c 100644 --- a/devices/C4.properties +++ b/devices/C4.properties @@ -1,3 +1,3 @@ -#Thu Sep 19 08:23:41 CEST 2019 +#Wed Dec 11 08:56:26 CET 2019 detection=Mechanical disabled=false diff --git a/devices/D4.properties b/devices/D4.properties index c934ce8..dbc4454 100644 --- a/devices/D4.properties +++ b/devices/D4.properties @@ -1,3 +1,3 @@ -#Thu Sep 19 08:23:55 CEST 2019 +#Wed Dec 11 08:56:41 CET 2019 detection=Mechanical disabled=false diff --git a/devices/F5.properties b/devices/F5.properties index a73b981..7dd87c9 100644 --- a/devices/F5.properties +++ b/devices/F5.properties @@ -1,3 +1,3 @@ -#Thu Jun 06 15:46:43 CEST 2019 +#Tue Nov 19 13:13:57 CET 2019 detection=Mechanical disabled=false diff --git a/devices/img.properties b/devices/img.properties index 96f9c93..8ef03e0 100644 --- a/devices/img.properties +++ b/devices/img.properties @@ -1,24 +1,24 @@ -#Tue Jul 23 10:11:03 CEST 2019 -colormap=Grayscale -colormapAutomatic=false -colormapMax=18.133 -colormapMin=6.4 -flipHorizontally=false -flipVertically=false -grayscale=false +#Wed Oct 30 16:03:50 CET 2019 +spatialCalOffsetY=-482.0 invert=false -rescaleFactor=1.0 -rescaleOffset=0.0 -roiHeight=955 -roiWidth=956 -roiX=20 -roiY=24 -rotation=210.3274314256251 +colormapMin=6.4 +spatialCalOffsetX=-476.0 +rotation=90.5119714057 rotationCrop=true scale=1.0 -spatialCalOffsetX=-478.0 -spatialCalOffsetY=-478.0 -spatialCalScaleX=0.4915561854227953 -spatialCalScaleY=0.49182558383480557 +rescaleFactor=1.0 +grayscale=false spatialCalUnits=mm +flipVertically=false +roiHeight=964 +spatialCalScaleX=0.49344173073372655 +spatialCalScaleY=0.48738915251539194 +flipHorizontally=false +colormapAutomatic=false +colormapMax=18.133 +roiY=17 +roiX=25 +rescaleOffset=0.0 +roiWidth=952 transpose=false +colormap=Grayscale diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties index 15ced94..2ef71aa 100644 --- a/devices/led_ctrl_1.properties +++ b/devices/led_ctrl_1.properties @@ -1,9 +1,9 @@ -#Tue Sep 24 17:37:46 CEST 2019 -maxValue=1.0 +#Tue Jan 21 11:05:02 CET 2020 minValue=0.0 -offset=0.0 -precision=2 -resolution=NaN -scale=3.0E-4 -sign_bit=0 unit=V +offset=0.0 +maxValue=1.0 +precision=2 +sign_bit=0 +scale=3.0E-4 +resolution=NaN diff --git a/devices/led_ctrl_2.properties b/devices/led_ctrl_2.properties index 15ced94..2ef71aa 100644 --- a/devices/led_ctrl_2.properties +++ b/devices/led_ctrl_2.properties @@ -1,9 +1,9 @@ -#Tue Sep 24 17:37:46 CEST 2019 -maxValue=1.0 +#Tue Jan 21 11:05:02 CET 2020 minValue=0.0 -offset=0.0 -precision=2 -resolution=NaN -scale=3.0E-4 -sign_bit=0 unit=V +offset=0.0 +maxValue=1.0 +precision=2 +sign_bit=0 +scale=3.0E-4 +resolution=NaN diff --git a/devices/led_ctrl_3.properties b/devices/led_ctrl_3.properties index 15ced94..2ef71aa 100644 --- a/devices/led_ctrl_3.properties +++ b/devices/led_ctrl_3.properties @@ -1,9 +1,9 @@ -#Tue Sep 24 17:37:46 CEST 2019 -maxValue=1.0 +#Tue Jan 21 11:05:02 CET 2020 minValue=0.0 -offset=0.0 -precision=2 -resolution=NaN -scale=3.0E-4 -sign_bit=0 unit=V +offset=0.0 +maxValue=1.0 +precision=2 +sign_bit=0 +scale=3.0E-4 +resolution=NaN diff --git a/plugins/LaserUE.java b/plugins/LaserUE.java index 37dd6ee..e7f1083 100644 --- a/plugins/LaserUE.java +++ b/plugins/LaserUE.java @@ -16,7 +16,7 @@ import java.io.IOException; public class LaserUE extends SerialPortDevice{ final Readable readable; static final double RANGE_MIN = 1.0; - static final double RANGE_MAX = 30.0; + static final double RANGE_MAX = 35.0; public LaserUE(String name, String port) { super(name, port, 921600, SerialPortDeviceConfig.DataBits.DB_8, SerialPortDeviceConfig.StopBits.SB_1, SerialPortDeviceConfig.Parity.None); this.setMode(Mode.FullDuplex); diff --git a/plugins/MXSC-1.12.0.jar b/plugins/MXSC-1.12.0.jar new file mode 100644 index 0000000..28b5464 Binary files /dev/null and b/plugins/MXSC-1.12.0.jar differ diff --git a/script/devices/Hexiposi.py b/script/devices/Hexiposi.py index 75f6261..7b8e5ce 100644 --- a/script/devices/Hexiposi.py +++ b/script/devices/Hexiposi.py @@ -171,4 +171,4 @@ class hexiposi_position(ReadonlyRegisterBase): add_device(hexiposi_position(), True) hexiposi_position.polling = 1000 -hexiposi.set_deadband(0.7) +hexiposi.set_deadband(1.0) diff --git a/script/motion/dry.py b/script/motion/dry.py index b77d5dd..b48cf27 100644 --- a/script/motion/dry.py +++ b/script/motion/dry.py @@ -1,5 +1,5 @@ DEFAULT_DRY_HEAT_TIME = 35.0 -DEFAULT_DRY_SPEED = 0.4 +DEFAULT_DRY_SPEED = 0.5 DEFAULT_DRY_WAIT_COLD = 30.0 def dry(heat_time=None, speed=None, wait_cold = None): diff --git a/script/tools/CheckGripper.py b/script/tools/CheckGripper.py new file mode 100644 index 0000000..603c756 --- /dev/null +++ b/script/tools/CheckGripper.py @@ -0,0 +1,23 @@ + + + +vector = [1.0,0.0] + + + +class GripperTool(RegisterBase): + def doRead(self): + return 1.0 if robot.is_tool_open() else 0.0 + + def doWrite(self, val): + if val: + robot.open_tool() + else: + robot.close_tool() + + +add_device(GripperTool("gripper_tool"), True) + + +vscan(gripper_tool, [laser_distance,], vector, latency = 3, passes=50) +