From 69bb01835b05899b28b10fb4184fd57c83ff5386 Mon Sep 17 00:00:00 2001 From: gac-x04sa Date: Mon, 29 Oct 2018 17:07:57 +0100 Subject: [PATCH] Startup --- config/config.properties | 3 ++- devices/alpha.properties | 3 ++- devices/delta.properties | 3 ++- devices/energy.properties | 3 ++- devices/gamma.properties | 3 ++- devices/hrox.properties | 3 ++- devices/hroy.properties | 3 ++- devices/hroz.properties | 3 ++- devices/hx.properties | 3 ++- devices/hy.properties | 3 ++- devices/hz.properties | 3 ++- devices/jjd.properties | 3 ++- devices/jjr.properties | 3 ++- devices/jjw.properties | 3 ++- devices/mox1.properties | 3 ++- devices/mox2.properties | 3 ++- devices/nu.properties | 3 ++- devices/oa.properties | 3 ++- devices/omegaH.properties | 3 ++- devices/omegaV.properties | 3 ++- devices/phi.properties | 3 ++- devices/prhr.properties | 3 ++- devices/prhw.properties | 3 ++- devices/prvd.properties | 3 ++- devices/prvu.properties | 3 ++- devices/pshr.properties | 3 ++- devices/pshw.properties | 3 ++- devices/psvd.properties | 3 ++- devices/psvu.properties | 3 ++- devices/thy.properties | 3 ++- devices/transm.properties | 3 ++- devices/trx.properties | 3 ++- devices/um1.properties | 3 ++- devices/um2.properties | 3 ++- devices/um3.properties | 3 ++- devices/um4.properties | 3 ++- devices/xv.properties | 3 ++- devices/y1.properties | 3 ++- devices/y2.properties | 3 ++- devices/y3.properties | 3 ++- script/test/TestStr | 14 ++++++++++++++ 41 files changed, 94 insertions(+), 40 deletions(-) create mode 100644 script/test/TestStr diff --git a/config/config.properties b/config/config.properties index 3d9ffc0..0adb277 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,5 +1,6 @@ -#Fri Dec 15 15:03:01 CET 2017 +#Mon Oct 29 17:07:47 CET 2018 autoSaveScanData=true +commandExecutionEvents=false createSessionFiles=false dataLayout=default dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name} diff --git a/devices/alpha.properties b/devices/alpha.properties index bd9fbb5..6f1aad8 100644 --- a/devices/alpha.properties +++ b/devices/alpha.properties @@ -1,4 +1,4 @@ -#Fri Aug 17 11:16:30 CEST 2018 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=4.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/delta.properties b/devices/delta.properties index 8289d34..4d64b0c 100644 --- a/devices/delta.properties +++ b/devices/delta.properties @@ -1,4 +1,4 @@ -#Fri Aug 17 11:13:05 CEST 2018 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=4.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/energy.properties b/devices/energy.properties index 055b5f6..1287e1d 100644 --- a/devices/energy.properties +++ b/devices/energy.properties @@ -1,4 +1,4 @@ -#Wed Apr 18 11:06:35 CEST 2018 +#Mon Oct 29 17:07:49 CET 2018 maxValue=23.0 minValue=8.0 offset=0.0 @@ -6,4 +6,5 @@ precision=4 resolution=0.001 rotation=false scale=1.0 +sign_bit=0 unit=keV diff --git a/devices/gamma.properties b/devices/gamma.properties index 0dee65c..4aabcf9 100644 --- a/devices/gamma.properties +++ b/devices/gamma.properties @@ -1,4 +1,4 @@ -#Fri Aug 17 11:16:31 CEST 2018 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=4.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/hrox.properties b/devices/hrox.properties index 8934561..b21f152 100644 --- a/devices/hrox.properties +++ b/devices/hrox.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:38 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/hroy.properties b/devices/hroy.properties index 8934561..b21f152 100644 --- a/devices/hroy.properties +++ b/devices/hroy.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:38 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/hroz.properties b/devices/hroz.properties index e4a3b00..7516512 100644 --- a/devices/hroz.properties +++ b/devices/hroz.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:38 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.002 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/hx.properties b/devices/hx.properties index 44957d4..b959e38 100644 --- a/devices/hx.properties +++ b/devices/hx.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:37 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.002 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/hy.properties b/devices/hy.properties index 44957d4..b959e38 100644 --- a/devices/hy.properties +++ b/devices/hy.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:37 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.002 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/hz.properties b/devices/hz.properties index 09d7639..1ad4cde 100644 --- a/devices/hz.properties +++ b/devices/hz.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:37 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.002 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/jjd.properties b/devices/jjd.properties index 4b53d1e..db27c04 100644 --- a/devices/jjd.properties +++ b/devices/jjd.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:35 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/jjr.properties b/devices/jjr.properties index 89aad34..4bd840a 100644 --- a/devices/jjr.properties +++ b/devices/jjr.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:35 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/jjw.properties b/devices/jjw.properties index 655ab0d..77ec3f6 100644 --- a/devices/jjw.properties +++ b/devices/jjw.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:35 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/mox1.properties b/devices/mox1.properties index 80b2d1c..f68cb0a 100644 --- a/devices/mox1.properties +++ b/devices/mox1.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:39 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.05 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=6 resolution=1.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/mox2.properties b/devices/mox2.properties index dcfdd68..9e4c3a9 100644 --- a/devices/mox2.properties +++ b/devices/mox2.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:39 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.05 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=6 resolution=1.0E-5 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/nu.properties b/devices/nu.properties index c2b77aa..415194d 100644 --- a/devices/nu.properties +++ b/devices/nu.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:31:45 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=4.0 estbilizationDelay=100 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.01 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=dg diff --git a/devices/oa.properties b/devices/oa.properties index 1ab1732..b5cdb9c 100644 --- a/devices/oa.properties +++ b/devices/oa.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:39 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=2.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.05 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/omegaH.properties b/devices/omegaH.properties index 24df2fd..4ef40e4 100644 --- a/devices/omegaH.properties +++ b/devices/omegaH.properties @@ -1,4 +1,4 @@ -#Fri Aug 17 11:16:31 CEST 2018 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.6 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/omegaV.properties b/devices/omegaV.properties index ea3a570..641881e 100644 --- a/devices/omegaV.properties +++ b/devices/omegaV.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 15:55:56 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=6.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/phi.properties b/devices/phi.properties index b90a800..ccdd31b 100644 --- a/devices/phi.properties +++ b/devices/phi.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:31:50 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=6.0 estbilizationDelay=100 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=5.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/prhr.properties b/devices/prhr.properties index 2458914..8c6b91e 100644 --- a/devices/prhr.properties +++ b/devices/prhr.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:38 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=1.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/prhw.properties b/devices/prhw.properties index f6b8210..8c6b91e 100644 --- a/devices/prhw.properties +++ b/devices/prhw.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:39 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=1.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/prvd.properties b/devices/prvd.properties index 2458914..8c6b91e 100644 --- a/devices/prvd.properties +++ b/devices/prvd.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:38 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=1.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/prvu.properties b/devices/prvu.properties index 2458914..8c6b91e 100644 --- a/devices/prvu.properties +++ b/devices/prvu.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:38 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=1.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/pshr.properties b/devices/pshr.properties index dbfe387..4807d27 100644 --- a/devices/pshr.properties +++ b/devices/pshr.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:36 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=1.953125E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/pshw.properties b/devices/pshw.properties index e8c73db..1140a06 100644 --- a/devices/pshw.properties +++ b/devices/pshw.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:36 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=2.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/psvd.properties b/devices/psvd.properties index e993810..2d59f1b 100644 --- a/devices/psvd.properties +++ b/devices/psvd.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:36 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=2.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/psvu.properties b/devices/psvu.properties index dcc535d..d715fb3 100644 --- a/devices/psvu.properties +++ b/devices/psvu.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:36 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=2.0E-4 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/thy.properties b/devices/thy.properties index 8de3793..5b5517f 100644 --- a/devices/thy.properties +++ b/devices/thy.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:32:44 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.2 estbilizationDelay=100 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.005 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=deg diff --git a/devices/transm.properties b/devices/transm.properties index cd54776..f76250c 100644 --- a/devices/transm.properties +++ b/devices/transm.properties @@ -1,8 +1,9 @@ -#Thu Oct 18 17:36:38 CEST 2018 +#Mon Oct 29 17:07:49 CET 2018 maxValue=1.0 minValue=0.0 offset=0.0 precision=5 resolution=NaN scale=1.0 +sign_bit=0 unit= diff --git a/devices/trx.properties b/devices/trx.properties index a3d3da6..38a3b38 100644 --- a/devices/trx.properties +++ b/devices/trx.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:32:37 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=2.0 estbilizationDelay=100 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.005 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/um1.properties b/devices/um1.properties index 387f3e3..9460b0c 100644 --- a/devices/um1.properties +++ b/devices/um1.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:36 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=0.0025 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/um2.properties b/devices/um2.properties index 387f3e3..9460b0c 100644 --- a/devices/um2.properties +++ b/devices/um2.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:36 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=0.0025 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/um3.properties b/devices/um3.properties index 3ce6011..9460b0c 100644 --- a/devices/um3.properties +++ b/devices/um3.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:37 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=0.0025 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/um4.properties b/devices/um4.properties index 3ce6011..9460b0c 100644 --- a/devices/um4.properties +++ b/devices/um4.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:37 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.5 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=5 resolution=0.0025 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/xv.properties b/devices/xv.properties index 0a1d8ae..d2a20ba 100644 --- a/devices/xv.properties +++ b/devices/xv.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:14:34 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=1.0 estbilizationDelay=0 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.005 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/y1.properties b/devices/y1.properties index dc96edb..575b584 100644 --- a/devices/y1.properties +++ b/devices/y1.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:32:11 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.15 estbilizationDelay=100 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.01 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/y2.properties b/devices/y2.properties index cd8786b..ba4e6e9 100644 --- a/devices/y2.properties +++ b/devices/y2.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:32:17 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.15 estbilizationDelay=100 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.01 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/devices/y3.properties b/devices/y3.properties index a911f6e..814adbf 100644 --- a/devices/y3.properties +++ b/devices/y3.properties @@ -1,4 +1,4 @@ -#Mon Dec 18 16:32:26 CET 2017 +#Mon Oct 29 17:07:49 CET 2018 defaultSpeed=0.15 estbilizationDelay=100 hasEnable=false @@ -12,5 +12,6 @@ precision=4 resolution=0.01 rotation=false scale=1.0 +sign_bit=0 startRetries=1 unit=mm diff --git a/script/test/TestStr b/script/test/TestStr new file mode 100644 index 0000000..fe4e769 --- /dev/null +++ b/script/test/TestStr @@ -0,0 +1,14 @@ + +class StrDev(DeviceBase, Readable): + def __init__(self): + DeviceBase.__init__(self, "StrDev") + self.index = 0 + + def read(self): + self.index = self.index + 1 + return "Test" + str(self.index) #str(time.time()) + + + + +strdev = StrDev();