42637ef6f4
minor fixes
...
Change-Id: I41aa50b1742fb0e24ff5a34d6d9ba98a6b4c4905
2021-06-08 15:18:48 +02:00
071f933982
trinamic and persistent
...
- remove methods from Modules existing in secop.persistent
- do reset on start when encoder matched and motor was power cycled
2021-06-08 15:08:54 +02:00
d06cb0414d
persistent module fixed
2021-06-08 07:39:46 +02:00
fe5a2caac7
experimental persistent mixin
...
- still contains changes in mouduls/params ...
2021-06-04 12:19:04 +02:00
1409959f53
remove debug print statement
2021-05-06 16:27:09 +02:00
10147b0db5
first tries with uniax stick
2021-04-30 17:28:05 +02:00
e2f258658c
add cfg/deleop directory
...
Change-Id: Ia9f15af8bb68a8306a9d966ef2b217d587f0ab28
2021-04-29 11:12:21 +02:00
3d67fef557
treat raised error message in modules.py correctly when arg is not a list
...
Change-Id: I4082a65849c71b3f212f2c8c345a6881f972d107
2021-04-29 11:12:21 +02:00
eb3d35e1a6
fixed doule entry tcoil1 in ma7.cfg
...
Change-Id: I547e7dcb6cca72004dd3ea8e56a0601e7bf8771a
2021-04-29 11:12:21 +02:00
2863c2bca0
added cfg files for SINQ Frappy
...
Change-Id: Icb1ea5e2e1f9aedd77a6bac7ed6b14458aea4aa7
2021-04-29 11:12:21 +02:00
390c955a8a
improve comments (poller.py)
2021-04-29 11:12:20 +02:00
539d97a733
updated README.md
...
the procedure may still need to be discussed
Change-Id: Iddf60ac93309ef2131d55f3858e11d6111a976b4
2021-04-29 11:12:20 +02:00
1fd16bbc43
pollOneParam has no return value (avoid pylint complaint)
...
Change-Id: Iab75c970e106617ffd4e612d358da491312ca54b
2021-04-29 11:12:20 +02:00
5e77a43f6c
fix 'ts' value
2021-04-29 11:12:20 +02:00
3e7b008a59
fix handling of unknown sea messages
2021-04-29 11:10:09 +02:00
2f96a2db92
added trinamic.cfg
2021-04-27 17:33:14 +02:00
fab950550d
trinamic driver and bytesio module
...
Change-Id: Id634e7514fecab6fd6bc3edf81e25ad41c2bb12f
2021-04-27 16:42:29 +02:00
801eab4b13
fix issue with a module based on a SEA subobject
...
Change-Id: I15102ef0e17cd4414e8699e2967292b3853d2ac0
2021-04-27 16:00:45 +02:00
06551b17e2
improve more errors during startup
...
errors from a module a combined with a header and intended
details
Change-Id: I4be7bc2f8455fb0e3c9346f3bb23ac88e7589604
2021-04-27 16:00:26 +02:00
4a0796a1bd
fix poller issue with dynamic interval
...
calculating next due must also be done when current poll was not due
Change-Id: I18d9cbc61aa6ca66f3fc2dc4cdfa1fce29a87705
2021-04-27 15:02:13 +02:00
48d5fe5ea2
forward config description with describe method
2021-04-12 14:47:29 +02:00
331dc544ad
use different names for seaconn in different frappy services
2021-04-09 11:46:24 +02:00
a5cc98d0b0
various improvements on the sea client
2021-04-08 10:22:53 +02:00
d3fc01689f
improve more handling of errors when starting server
...
+ add shutdown method to server (and dispatcher)
2021-04-08 10:21:44 +02:00
dec286460d
starting TcpServer in case of Address already in use
...
try several times, in case this is a restart. It seems that
allow_reuse_address = True is not always enough
2021-04-08 10:19:03 +02:00
d768d84ea1
check if configured item is available before setting
...
if neither a property nor a parameter exists for a given
configured item, just an attribute was created
2021-04-08 10:16:24 +02:00
4d8390c1fe
better error message when validating int
2021-04-08 10:15:42 +02:00
6ec8348355
Merge branch 'wip' of git.psi.ch:sinqdev/frappy into wip
2021-04-08 10:14:41 +02:00
10dad6da47
client: change online state before callback
...
the client in NICOS is referring to the online state within the
callback.
+ better error handling
2021-04-08 10:11:04 +02:00
185bf7bc88
improved softcal
...
+ removed debug code from ls370
2021-03-18 14:01:28 +01:00
499ae69f29
improved k2601b
...
- read back mode
- mode has now 4 values
Change-Id: I0576c73b225cb16e7f890a9479d3b002c52b71ba
2021-03-18 13:56:57 +01:00
4d7e5d3cdc
remove debug print statements
...
Change-Id: I51dc66b9cecb0f5e84bef36d1b4a541ddefcfbc2
2021-03-18 13:41:49 +01:00
48230334af
fix inheritance problem with mixin
...
- a mixin should not inherit from module then it has Parameters
- Parameters in mixins must be complete, not just overrides
- check precedence of read_<param> or handler
Change-Id: I72d9355a1982770d1a99d9552a20330103c97edb
2021-03-18 13:32:54 +01:00
6538500881
more fixes for sea
...
Change-Id: I195bcdbe5f6b274e65dd431ed13a123c74a8d5bf
2021-03-11 15:57:04 +01:00
bcf57f53c3
fix access to sea config dir
...
- removed unused property json_path
- do not take the first directory in config path, but the first
directory with a sea subdirectory
Change-Id: I4f0d72936ca616134c38568d88c57a33a3397ec6
2021-03-11 15:53:57 +01:00
fb01f81cb6
fix user friendly reporting of config errors
...
Change-Id: I42ec1ad2e18a0363fb7317c86743ff2f6665f049
2021-03-11 15:33:21 +01:00
3b03e578bb
user friendly reporting of config errors
...
Config errors are collected first, and raised after processing
all modules. This is more user friendly.
+ remove redundant check for predefined accessibles in modules.py
+ fixed error handling for exporting parameters in params.py
+ fixed handling of bare attributes overwriting properties
Change-Id: I894bda291ab85ccec3d771c4903393c808af0a2a
2021-03-08 10:47:22 +01:00
804581546d
user friendly reporting of config errors
...
Config errors are collected first, and raised after processing
all modules. This is more user friendly.
+ remove redundant check for predefined accessibles in modules.py
+ fixed error handling for exporting parameters in params.py
+ fixed handling of bare attributes overwriting properties
Change-Id: I894bda291ab85ccec3d771c4903393c808af0a2a
2021-03-08 10:33:20 +01:00
1ca35cf8e9
improved softcal
...
- better error handling
- bug fix
Change-Id: I43bdd4aa35723f43f9e4baf2723af812f04689d3
Change-Id: I5990c75a7a8153e95abee9548475783ee893bd08
2021-03-08 10:25:39 +01:00
adc9a6da71
fixed bugs from syntax migration
...
- a new wrapper for a read function is not only to be created when
the a new read method is in the class dict, but also when
it is inherited, but not yet wrapped
- a handler must not be ignored, when a write method is inherited
- a proxy class must not call checkProperties
+ remove trailing spaces in tutorial_helevel.rst
Change-Id: I16024c14232ea200db91a1bc07ec23326219ab68
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25093
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2021-03-08 10:22:58 +01:00
7f22a270e6
make softcal more tolerant reading .340 files
...
accept tab instead of space in 'Data Format' header keyword
Change-Id: I77e5500da5eaed6fd1097723533bc86207fa73d8
2021-03-08 10:21:23 +01:00
7d133bacfe
update checklist for git branch sync in README.md
...
Change-Id: I788fba8cd748be090f82442ad20c839f206e5e3c
2021-03-03 14:47:47 +01:00
1760881f56
fixed bugs from syntax migration
...
- a new wrapper for a read function is not only to be created when
the a new read function is in the class dict, but also when
it inherited, but not yet wrapped
- a proxy class must not call checkProperties
2021-03-03 14:40:36 +01:00
04692bd1aa
added README.md
...
this should be the only file not matching mlz branch
now in sync with 316cf9738db29920a99e29813513ed1da048994a
'added README.md'
Change-Id: I826fd8c782f95fde3f8f4ef15b15b8b8f99d9973
2021-03-03 11:04:15 +01:00
ffafd7344c
removed obsolete files from merge
...
Change-Id: I98c6d06a680ef6885f38d4b3e6b3f51aa7ebd022
2021-03-03 10:19:59 +01:00
b1bf5e866d
improve tutorial_helevel
...
- fix indent of query method
- add remark about the CCU4 cid command
2021-03-03 10:17:05 +01:00
e4748ef9c9
do not export pollintervals in ppms driver
2021-03-03 10:16:52 +01:00
b4bb172ada
Merge branch 'wip'
...
Change-Id: I3ba389775ce9b02269ca9c20a42ec1bddf6c5d21
2021-03-03 09:46:20 +01:00
4fd9c17bcb
move historywriter to secop_psi
...
as historywriter currently could be used at psi only
secop_psi is a better place for it
+ add comment about a general config file
Change-Id: I9b0e74d3da83ac485bd4bcc13475695c3140822c
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25077
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2021-03-03 09:06:14 +01:00
76c6ebe92c
fixed errors during migration
...
- reference.rst did still contain do_<something>
- trailing commas in secop_demo/cryo.py
Change-Id: I5bb8bd310576366c8cfe406f0ec770fa40bcab5b
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25079
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2021-03-03 09:06:01 +01:00