diff --git a/config/setup.properties b/config/setup.properties index 2c449f32..c62464e5 100644 --- a/config/setup.properties +++ b/config/setup.properties @@ -1,21 +1,22 @@ -#Tue Feb 19 09:43:41 CET 2019 -configFile={config}/config.properties -configFileDevices={config}/devices.properties +#Fri Sep 20 17:21:43 CEST 2019 +scriptPath={home}/script +sessionsPath={home}/sessions configFileImageSources={config}/imaging.properties +pluginsPath={home}/plugins +configFileDevices={config}/devices.properties +libraryPath={script}; {script}/Lib configFilePlugins={config}/plugins.properties -configFileSettings={config}/settings.properties -configFileTasks={config}/tasks.properties +contextPath={home}/context +extensionsPath={home}/extensions configFileUpdateStrategy={config}/update.properties configPath={home}/config -contextPath={home}/context dataPath=~/Data1 devicesPath={home}/devices -extensionsPath={home}/extensions -imagesPath={outp}/images -libraryPath={script}; {script}/Lib +configFileVariables={config}/variables.properties +configFileSettings={config}/settings.properties logPath={home}/log -pluginsPath={home}/plugins -scriptPath={home}/script -scriptType=py -sessionsPath={home}/sessions wwwPath={home}/www +configFile={config}/config.properties +imagesPath={outp}/images +scriptType=py +configFileTasks={config}/tasks.properties diff --git a/devices/ExitSlitY.properties b/devices/ExitSlitY.properties index 334226ab..313cbca2 100644 --- a/devices/ExitSlitY.properties +++ b/devices/ExitSlitY.properties @@ -1,17 +1,18 @@ -#Wed May 01 10:58:53 CEST 2019 -defaultSpeed=0.4 -estbilizationDelay=0 -hasEnable=false -homingType=None -maxSpeed=0.5 -maxValue=5.0 -minSpeed=0.001 -minValue=-1.0 +#Fri Sep 20 17:21:48 CEST 2019 offset=0.0 +maxValue=5.0 precision=5 -resolution=0.002 rotation=false scale=1.0 -sign_bit=0 +estbilizationDelay=0 +maxSpeed=0.5 +resolution=0.002 +homingType=None startRetries=1 +minValue=-1.0 unit=mm +defaultSpeed=0.4 +hasEnable=false +sign_bit=0 +monitorByPosition=false +minSpeed=0.001 diff --git a/devices/ManipulatorPhi.properties b/devices/ManipulatorPhi.properties index 261c940e..2021539e 100644 --- a/devices/ManipulatorPhi.properties +++ b/devices/ManipulatorPhi.properties @@ -1,18 +1,19 @@ -#Tue Jul 03 13:27:04 CEST 2018 -accessType=ReadWrite -defaultSpeed=6.0 -estbilizationDelay=0 -hasEnable=true -homingType=None -maxSpeed=6.0 -maxValue=180.0 -minSpeed=0.6 -minValue=-180.0 +#Fri Sep 20 17:21:48 CEST 2019 offset=0.0 +maxValue=180.0 precision=4 -resolution=0.5 rotation=false scale=1.0 -sign_bit=0 +estbilizationDelay=0 +maxSpeed=6.0 +resolution=0.5 +homingType=None +accessType=ReadWrite startRetries=3 +minValue=-180.0 unit=deg +defaultSpeed=6.0 +hasEnable=true +sign_bit=0 +monitorByPosition=false +minSpeed=0.6 diff --git a/devices/ManipulatorTheta.properties b/devices/ManipulatorTheta.properties index 331bf9dc..9b44f3c4 100644 --- a/devices/ManipulatorTheta.properties +++ b/devices/ManipulatorTheta.properties @@ -1,18 +1,19 @@ -#Tue Jul 03 13:27:04 CEST 2018 -accessType=ReadWrite -defaultSpeed=0.5 -estbilizationDelay=0 -hasEnable=true -homingType=None -maxSpeed=0.5 -maxValue=200.0 -minSpeed=0.001 -minValue=-12.0 +#Fri Sep 20 17:21:48 CEST 2019 offset=0.0 +maxValue=200.0 precision=4 -resolution=0.1 rotation=false scale=1.0 -sign_bit=0 +estbilizationDelay=0 +maxSpeed=0.5 +resolution=0.1 +homingType=None +accessType=ReadWrite startRetries=3 +minValue=-12.0 unit=deg +defaultSpeed=0.5 +hasEnable=true +sign_bit=0 +monitorByPosition=false +minSpeed=0.001 diff --git a/devices/ManipulatorTilt.properties b/devices/ManipulatorTilt.properties index e30cdf25..c3261183 100644 --- a/devices/ManipulatorTilt.properties +++ b/devices/ManipulatorTilt.properties @@ -1,18 +1,19 @@ -#Tue Jul 03 13:27:04 CEST 2018 -accessType=ReadWrite -defaultSpeed=1.4 -estbilizationDelay=0 -hasEnable=true -homingType=None -maxSpeed=1.4 -maxValue=28.0 -minSpeed=0.1 -minValue=-28.0 +#Fri Sep 20 17:21:48 CEST 2019 offset=0.0 +maxValue=28.0 precision=4 -resolution=0.02 rotation=false scale=1.0 -sign_bit=0 +estbilizationDelay=0 +maxSpeed=1.4 +resolution=0.02 +homingType=None +accessType=ReadWrite startRetries=3 +minValue=-28.0 unit=deg +defaultSpeed=1.4 +hasEnable=true +sign_bit=0 +monitorByPosition=false +minSpeed=0.1 diff --git a/devices/ManipulatorX.properties b/devices/ManipulatorX.properties index f7f54a65..9cd91d9a 100644 --- a/devices/ManipulatorX.properties +++ b/devices/ManipulatorX.properties @@ -1,18 +1,19 @@ -#Mon Aug 12 11:58:58 CEST 2019 -accessType=ReadWrite -defaultSpeed=0.126 -estbilizationDelay=0 -hasEnable=true -homingType=None -maxSpeed=0.126 -maxValue=15.0 -minSpeed=0.001 -minValue=-15.0 +#Fri Sep 20 17:21:48 CEST 2019 offset=0.0 +maxValue=15.0 precision=4 -resolution=0.01 rotation=false scale=1.0 -sign_bit=0 +estbilizationDelay=0 +maxSpeed=0.126 +resolution=0.01 +homingType=None +accessType=ReadWrite startRetries=3 +minValue=-15.0 unit=mm +defaultSpeed=0.126 +hasEnable=true +sign_bit=0 +monitorByPosition=false +minSpeed=0.001 diff --git a/devices/ManipulatorY.properties b/devices/ManipulatorY.properties index 88b8c171..9cd91d9a 100644 --- a/devices/ManipulatorY.properties +++ b/devices/ManipulatorY.properties @@ -1,18 +1,19 @@ -#Mon Aug 12 15:45:57 CEST 2019 -accessType=ReadWrite -defaultSpeed=0.126 -estbilizationDelay=0 -hasEnable=true -homingType=None -maxSpeed=0.126 -maxValue=15.0 -minSpeed=0.001 -minValue=-15.0 +#Fri Sep 20 17:21:48 CEST 2019 offset=0.0 +maxValue=15.0 precision=4 -resolution=0.01 rotation=false scale=1.0 -sign_bit=0 +estbilizationDelay=0 +maxSpeed=0.126 +resolution=0.01 +homingType=None +accessType=ReadWrite startRetries=3 +minValue=-15.0 unit=mm +defaultSpeed=0.126 +hasEnable=true +sign_bit=0 +monitorByPosition=false +minSpeed=0.001 diff --git a/devices/ManipulatorZ.properties b/devices/ManipulatorZ.properties index 9023916f..57053ca2 100644 --- a/devices/ManipulatorZ.properties +++ b/devices/ManipulatorZ.properties @@ -1,18 +1,19 @@ -#Mon Aug 12 14:18:17 CEST 2019 -accessType=ReadWrite -defaultSpeed=1.6 -estbilizationDelay=0 -hasEnable=true -homingType=None -maxSpeed=1.8 -maxValue=130.0 -minSpeed=0.2 -minValue=100.0 +#Fri Sep 20 17:21:48 CEST 2019 offset=0.0 +maxValue=130.0 precision=4 -resolution=0.01 rotation=false scale=1.0 -sign_bit=0 +estbilizationDelay=0 +maxSpeed=1.8 +resolution=0.01 +homingType=None +accessType=ReadWrite startRetries=3 +minValue=100.0 unit=mm +defaultSpeed=1.6 +hasEnable=true +sign_bit=0 +monitorByPosition=false +minSpeed=0.2 diff --git a/devices/dummy.properties b/devices/dummy.properties index cc630710..c445eaad 100644 --- a/devices/dummy.properties +++ b/devices/dummy.properties @@ -1,18 +1,19 @@ -#Tue Jul 03 13:27:04 CEST 2018 -accessType=ReadWrite -defaultSpeed=1.0 -estbilizationDelay=0 -hasEnable=false -homingType=None -maxSpeed=100.0 -maxValue=1000000.0 -minSpeed=0.001 -minValue=0.0 +#Fri Sep 20 17:21:48 CEST 2019 offset=0.0 +maxValue=1000000.0 precision=3 -resolution=NaN rotation=false scale=1.0 -sign_bit=0 +estbilizationDelay=0 +maxSpeed=100.0 +resolution=NaN +homingType=None +accessType=ReadWrite startRetries=1 +minValue=0.0 unit= +defaultSpeed=1.0 +hasEnable=false +sign_bit=0 +monitorByPosition=false +minSpeed=0.001