From a7c3f87f3098e4a993eec4dce1c498a7e544c016 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Tue, 14 Dec 2021 09:33:24 +0100 Subject: [PATCH] --- config/config.properties | 28 ++++++++++++++-------------- config/settings.properties | 4 ++-- devices/A2.properties | 4 ++-- devices/A4.properties | 4 ++-- devices/B4.properties | 4 ++-- devices/C1.properties | 4 ++-- devices/F3.properties | 4 ++-- devices/led_ctrl_1.properties | 2 +- devices/led_ctrl_2.properties | 2 +- devices/led_ctrl_3.properties | 2 +- devices/smart_magnet.properties | 6 +++--- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/config/config.properties b/config/config.properties index c2691f2..1705ebe 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,37 +1,37 @@ -#Fri Aug 14 09:27:15 CEST 2020 +#Tue Dec 14 09:19:00 CET 2021 +autoSaveScanData=true +simulation=false +commandExecutionEvents=false +logDaysToLive=30 +dataScanSaveOutput=false +userAuthenticator= +logLevelConsole=Off +scanStreamerPort=-1 +dataScanSaveScript=false +dataScanSaveSetpoints=false +parallelInitialization=false +versionTrackingManual=true hostName=null userManagement=false instanceName=X06SA -autoSaveScanData=true -simulation=false dataServerPort=-1 hideServerMessages=true serverPort=8080 versionTrackingEnabled=true dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name} serverEnabled=true -commandExecutionEvents=false -logDaysToLive=30 dataScanReleaseRecords=false depthDimension=0 dataScanPreserveTypes=false logLevel=Fine -dataScanSaveOutput=false dataScanFlushRecords=true logPath={logs}/{date}_{time} dataLayout=table terminalEnabled=false notificationLevel=null -userAuthenticator= -logLevelConsole=Off terminalPort=3579 -scanStreamerPort=-1 -dataScanSaveScript=false -dataScanSaveSetpoints=false -parallelInitialization=false -createSessionFiles=true +createSessionFiles=false versionTrackingLogin={context}/svcusr-hlapp_robot -versionTrackingManual=true versionTrackingRemote=git@git.psi.ch\:tell/X06SA.git dataProvider=txt saveCommandStatistics=true diff --git a/config/settings.properties b/config/settings.properties index ed711d1..173a52f 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,11 +1,11 @@ -#Tue Nov 09 12:57:43 CET 2021 +#Tue Dec 14 09:33:20 CET 2021 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.636458500926E9 +dry_timestamp=1.639415113596E9 roi_h=1000 led_level=0.0 beamline_status_enabled=false diff --git a/devices/A2.properties b/devices/A2.properties index 790bea4..a3e483b 100644 --- a/devices/A2.properties +++ b/devices/A2.properties @@ -1,3 +1,3 @@ -#Mon Nov 01 15:55:42 CET 2021 +#Thu Nov 11 10:57:12 CET 2021 detection=Mechanical -disabled=true +disabled=false diff --git a/devices/A4.properties b/devices/A4.properties index 2c26c5c..322e83e 100644 --- a/devices/A4.properties +++ b/devices/A4.properties @@ -1,3 +1,3 @@ -#Thu Oct 28 09:20:17 CEST 2021 +#Thu Nov 11 10:57:04 CET 2021 detection=Mechanical -disabled=true +disabled=false diff --git a/devices/B4.properties b/devices/B4.properties index a8453b9..9d7d1ea 100644 --- a/devices/B4.properties +++ b/devices/B4.properties @@ -1,3 +1,3 @@ -#Sat Dec 14 17:27:09 CET 2019 +#Tue Nov 30 10:14:54 CET 2021 detection=Mechanical -disabled=false +disabled=true diff --git a/devices/C1.properties b/devices/C1.properties index 28ed6d7..17a0a42 100644 --- a/devices/C1.properties +++ b/devices/C1.properties @@ -1,3 +1,3 @@ -#Thu Sep 19 08:23:31 CEST 2019 +#Thu Dec 09 10:15:52 CET 2021 detection=Mechanical -disabled=false +disabled=true diff --git a/devices/F3.properties b/devices/F3.properties index befbdf7..a8919f4 100644 --- a/devices/F3.properties +++ b/devices/F3.properties @@ -1,3 +1,3 @@ -#Mon Nov 01 15:55:32 CET 2021 +#Thu Nov 11 10:57:23 CET 2021 detection=Mechanical -disabled=true +disabled=false diff --git a/devices/led_ctrl_1.properties b/devices/led_ctrl_1.properties index 847c74b..d79cdc5 100644 --- a/devices/led_ctrl_1.properties +++ b/devices/led_ctrl_1.properties @@ -1,4 +1,4 @@ -#Tue Oct 05 15:05:31 CEST 2021 +#Fri Nov 12 07:49:19 CET 2021 minValue=0.0 unit=V offset=0.0 diff --git a/devices/led_ctrl_2.properties b/devices/led_ctrl_2.properties index 847c74b..d79cdc5 100644 --- a/devices/led_ctrl_2.properties +++ b/devices/led_ctrl_2.properties @@ -1,4 +1,4 @@ -#Tue Oct 05 15:05:31 CEST 2021 +#Fri Nov 12 07:49:19 CET 2021 minValue=0.0 unit=V offset=0.0 diff --git a/devices/led_ctrl_3.properties b/devices/led_ctrl_3.properties index 847c74b..d79cdc5 100644 --- a/devices/led_ctrl_3.properties +++ b/devices/led_ctrl_3.properties @@ -1,4 +1,4 @@ -#Tue Oct 05 15:05:31 CEST 2021 +#Fri Nov 12 07:49:19 CET 2021 minValue=0.0 unit=V offset=0.0 diff --git a/devices/smart_magnet.properties b/devices/smart_magnet.properties index 35f69ae..5c27fa6 100644 --- a/devices/smart_magnet.properties +++ b/devices/smart_magnet.properties @@ -1,8 +1,8 @@ -#Thu Sep 24 14:17:37 CEST 2020 +#Fri Nov 12 16:40:51 CET 2021 reverseTime=0.2 unmountCurrent=20.0 holdingCurrent=50.0 -restingCurrent=30.0 +restingCurrent=60.0 reverseCurrent=-10.0 remanenceCurrent=-10.0 -mountCurrent=30.0 +mountCurrent=60.0