From 06b13bad4ae6d35713182d40d34682e65b8a1964 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Tue, 5 Apr 2022 09:18:44 +0200 Subject: [PATCH] pre-gripper sensor updates --- config/config.properties | 17 +++++++++++++++-- config/devices.properties | 6 +++--- config/settings.properties | 4 ++-- config/setup.properties | 29 ++++++++++++++++------------- config/variables.properties | 6 ++++-- devices/E1.properties | 4 ++-- devices/F3.properties | 4 ++-- devices/led_ctrl_1.properties | 2 +- devices/led_ctrl_2.properties | 2 +- devices/led_ctrl_3.properties | 2 +- 10 files changed, 47 insertions(+), 29 deletions(-) diff --git a/config/config.properties b/config/config.properties index 1705ebe..7fc2b4b 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Tue Dec 14 09:19:00 CET 2021 +#Wed Mar 02 10:28:17 CET 2022 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -6,14 +6,20 @@ logDaysToLive=30 dataScanSaveOutput=false userAuthenticator= logLevelConsole=Off +filePermissionsConfig=Default scanStreamerPort=-1 dataScanSaveScript=false dataScanSaveSetpoints=false +notifiedTasks= parallelInitialization=false +dataTransferPath= +saveConsoleSessionFiles=false versionTrackingManual=true +dataTransferMode=Off hostName=null userManagement=false instanceName=X06SA +disableEmbeddedAttributes=false dataServerPort=-1 hideServerMessages=true serverPort=8080 @@ -26,12 +32,19 @@ dataScanPreserveTypes=false logLevel=Fine dataScanFlushRecords=true logPath={logs}/{date}_{time} +filePermissionsLogs=Default dataLayout=table +disableDataFileLogs=false +sessionHandling=Off terminalEnabled=false -notificationLevel=null +notificationLevel=Off +filePermissionsScripts=Default terminalPort=3579 +dataTransferUser= +filePermissionsData=Default createSessionFiles=false versionTrackingLogin={context}/svcusr-hlapp_robot +noBytecodeFiles=false versionTrackingRemote=git@git.psi.ch\:tell/X06SA.git dataProvider=txt saveCommandStatistics=true diff --git a/config/devices.properties b/config/devices.properties index 3543c69..d20f580 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -11,9 +11,9 @@ 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|COM3 50 35|||true puck_detection=ch.psi.mxsc.PuckDetection|tell6s-raspberrypi:5556||| -#th2e=ch.psi.pshell.modbus.ModbusTCP|129.129.109.200:502||| -#temperature=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 1||10000| -#humidity=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 5||10000| +th2e=ch.psi.pshell.modbus.ModbusTCP|129.129.109.200: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| wago=ch.psi.pshell.modbus.ModbusTCP|tell6s-wago:502||| led_ok_1=ch.psi.pshell.modbus.DigitalInput|wago 0||1000| diff --git a/config/settings.properties b/config/settings.properties index 2e2db3f..a21473f 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,11 +1,11 @@ -#Thu Feb 10 09:43:08 CET 2022 +#Tue Apr 05 08:55:24 CEST 2022 dry_mount_counter=0 room_temperature_enabled=false pin_offset=-0.0 cryopos_in=5.0 puck_types=true imaging_enabled=false -dry_timestamp=1.644482454943E9 +dry_timestamp=1.649141147348E9 roi_h=1000 led_level=0.0 beamline_status_enabled=false diff --git a/config/setup.properties b/config/setup.properties index 87a13e8..9ee0324 100644 --- a/config/setup.properties +++ b/config/setup.properties @@ -1,20 +1,23 @@ -#Tue Sep 17 15:06:05 CEST 2019 -configFile={config}/config.properties +#Wed Mar 02 10:28:17 CET 2022 +scriptPath={home}/script +sessionsPath={outp}/sessions +pluginsPath={home}/plugins configFileDevices={config}/devices.properties +consoleSessionsPath={sessions}/console +libraryPath={script}; {script}/Lib configFilePlugins={config}/plugins.properties -configFileSettings={config}/settings.properties -configFileTasks={config}/tasks.properties -configFileVariables={config}/variables.properties -configPath={home}/config contextPath={outp}/context +extensionsPath={home}/extensions +configPath={home}/config +configFileSessions={config}/sessions.properties +userSessionsPath={sessions}/user dataPath={outp}/data devicesPath={home}/devices -extensionsPath={home}/extensions -imagesPath={outp}/images -libraryPath={script}; {script}/Lib +configFileVariables={config}/variables.properties +configFileSettings={config}/settings.properties logPath={outp}/log -pluginsPath={home}/plugins -scriptPath={home}/script -scriptType=py -sessionsPath={outp}/sessions wwwPath={home}/www +configFile={config}/config.properties +imagesPath={outp}/images +scriptType=py +configFileTasks={config}/tasks.properties diff --git a/config/variables.properties b/config/variables.properties index 13c80a3..663ce78 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,4 @@ -#Tue Jan 18 09:56:14 CET 2022 -FileSequentialNumber=303 +#Wed Mar 16 11:01:10 CET 2022 +LastRunDate=220316 +FileSequentialNumber=314 +DaySequentialNumber=2 diff --git a/devices/E1.properties b/devices/E1.properties index 826b858..5ba53e8 100644 --- a/devices/E1.properties +++ b/devices/E1.properties @@ -1,3 +1,3 @@ -#Fri Feb 04 14:52:58 CET 2022 +#Thu Mar 03 10:13:51 CET 2022 detection=Mechanical -disabled=true +disabled=false diff --git a/devices/F3.properties b/devices/F3.properties index a8919f4..4d23d1b 100644 --- a/devices/F3.properties +++ b/devices/F3.properties @@ -1,3 +1,3 @@ -#Thu Nov 11 10:57:23 CET 2021 +#Wed Mar 23 09:53:12 CET 2022 detection=Mechanical -disabled=false +disabled=true diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties index b375396..040bbbd 100644 --- a/devices/led_ctrl_1.properties +++ b/devices/led_ctrl_1.properties @@ -1,4 +1,4 @@ -#Tue Jan 18 09:08:10 CET 2022 +#Wed Mar 16 11:04:48 CET 2022 minValue=0.0 unit=V offset=0.0 diff --git a/devices/led_ctrl_2.properties b/devices/led_ctrl_2.properties index b375396..040bbbd 100644 --- a/devices/led_ctrl_2.properties +++ b/devices/led_ctrl_2.properties @@ -1,4 +1,4 @@ -#Tue Jan 18 09:08:10 CET 2022 +#Wed Mar 16 11:04:48 CET 2022 minValue=0.0 unit=V offset=0.0 diff --git a/devices/led_ctrl_3.properties b/devices/led_ctrl_3.properties index b375396..040bbbd 100644 --- a/devices/led_ctrl_3.properties +++ b/devices/led_ctrl_3.properties @@ -1,4 +1,4 @@ -#Tue Jan 18 09:08:10 CET 2022 +#Wed Mar 16 11:04:48 CET 2022 minValue=0.0 unit=V offset=0.0