Georg Brandl
0f34418435
systemd: enable indication of reloading/stopping
...
Change-Id: I6dd1b3a50234fb0304fb1a5318f2f22d35d464ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34896
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2024-11-15 10:39:47 +01:00
Alexander Zaft
1423800ff4
server: fix windows ctrl-c
...
thread.join() blocks indefinetely, not allowing python to handle the
interrupt. Same is true for sleep on windows, but when we only sleep a
second, this is fine. Instead of joining the threads, keep track of them
manually.
Change-Id: I559fe06d9ce005a15388c881e4f076d996aea9dc
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34894
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-11-15 10:39:47 +01:00
Alexander Zaft
e333763105
generalconfig: streamlined config discovery
...
determine generalconfig file location in order:
- command line argument
- environment variable
- git location (../cfg)
- local location (cwd)
- global location (/etc/frappy)
Change-Id: Ie34bcbd5188837075ee7bb7d5029d676ae72378e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34839
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-11-15 10:39:47 +01:00
Alexander Zaft
c09e02a01e
Revert "config: allow using Prop(...)"
...
This reverts commit ba59bd549860797f5bdf15cadfea539754d833cd.
Reason for revert: unnecessary
Change-Id: I4bf46a1de2e699049572f376e84fa39db5dae76c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34888
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-11-15 10:39:47 +01:00
Alexander Zaft
337be1b2bc
config: fix typo
...
Change-Id: Ie90993d9b2d387780fa3faa28fd8d4523f7fc866
2024-11-15 10:39:47 +01:00
Alexander Zaft
752942483f
config: allow using Prop(...)
...
Still maps to the same logic, but it might be a bit confusing to
configure properties with prop = Param(...)
Change-Id: I6bde6a0b015095a8b765d98cb2780f0d42de7e6e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34886
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
2024-11-15 10:39:47 +01:00
0204bdfe2f
fix playground
...
- fix initialization
- add description
Change-Id: Ic210c26edfec709bafa902e32eae04350d571acd
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34874
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-11-15 10:39:47 +01:00
facaca94eb
better order of accessibles: 'value' 'status' and 'target' first
...
- predefined parameters/commands appear first, in the order
defined in frappy.params.PREDEFINED_ACCESSIBLES
- other (custom) parameters by inheritance order
- remove paramOrder attribute (not used currently)
Change-Id: If4c43189e4837dba057dc0a430ac6c3d1ae10829
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34904
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-11-15 10:39:47 +01:00
0f0a177254
frappy_psi.sea: bugfix: revert change of updateEvent to udpateItem
...
revert some of change 34813
SeaClient is based on ProxyClient, not SecopClient
-> updateItem is not defined there
Change-Id: Ib3049038481917ec7a11b9fb2d285cedff5febbb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34873
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-11-15 10:39:47 +01:00
l_samenv
ada696e72b
add peltier cfg
2024-11-14 16:09:31 +01:00
l_samenv
1d70a90270
add addon ah2500sea
2024-11-14 16:04:55 +01:00
l_samenv
20da7592da
add PE stick
...
example of how to do a software calibration on a mercury channel
with hardcoded wrong calib curve
2024-11-14 15:40:46 +01:00
l_samenv
e750e69045
ma11stick/ovenstick: fix double meaning entry
2024-11-14 15:39:43 +01:00
l_samenv
11a65b485b
fix ah2700 / ah2550 settings
2024-11-14 15:39:43 +01:00
edf5a5568b
frappy_psi.sea: fix buf, revert change of updateEvent to udpateItem
...
this is not possible in ProxyClient
2024-10-24 13:29:26 +02:00
f382a01d86
fix case where confdir is a list of paths
2024-10-24 11:46:23 +02:00
Alexander Zaft
3c69dcb170
core: fix Dispatcher and SECNode opts handling
...
both tried to consume everything before, also making the check for
unknown options afterwards pointless
Change-Id: I7e44c088163e0b99ac509a2c0f757270807d97ab
Fixes : #4912
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34837
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2024-10-23 09:27:35 +02:00
Alexander Zaft
b889a86461
server: show interfaces as custom property
...
Change-Id: I129be1228b8a04386db5fe370ebdc2ec6ce8050a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34838
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-10-23 09:27:35 +02:00
Alexander Zaft
c7143a6dc7
server: fix positional argument lint
...
Change-Id: Ib718826e7bbce2c6fcc9b39879c30baec1ecaa5a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34845
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-10-23 09:27:35 +02:00
Alexander Zaft
c2a3821000
sim: make amagnet sim cfg startable again
...
Change-Id: I1e7b7dd6e4069c616f49edbe4e223f501a000398
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34844
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
2024-10-23 09:27:35 +02:00
Alexander Zaft
1cebf3998f
simulation: fix extra_params default, ccidu1 cfg
...
Change-Id: I80672f1c070054871708961bc6641457f8e409ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34843
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2024-10-23 09:26:48 +02:00
Alexander Zaft
bea994aaa2
test_server: basic description checks
...
Change-Id: I732ac2349f7e7ab2579f67cc6e51989703531087
2024-10-23 09:26:48 +02:00
Georg Brandl
bc0925fca7
pylint: do not try to infer too much
...
Change-Id: I1aabf4c59fc47e888e8cd096a8228842f35ff769
2024-10-23 09:26:48 +02:00
Jenkins system
09235cb145
[deb] Release v0.20.1
2024-10-23 09:26:48 +02:00
Georg Brandl
824d3e7b7a
lib: there might be no confdir in "cfg"
...
Change-Id: I0832de4564a2c1ff439c486ae6cbaa776ebf1e59
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34833
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2024-10-23 09:26:48 +02:00
Georg Brandl
dab963f1bb
remove sim-server
...
asyncore is deprecated for a long time and now removed in 3.12
Change-Id: I32eb18797dd13663de08ebedc38ce3de4b5ede93
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34830
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2024-10-23 09:26:44 +02:00
Georg Brandl
b93254b553
remove old unused parse module
...
Change-Id: Ie94217504a65c21a7a8aa7221f9028a689476ffd
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34831
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2024-10-23 09:25:39 +02:00
Georg Brandl
ec667c8151
remove unused test class
...
Change-Id: I887a66befa834a72bc684dc5edbcb5862a0d0b71
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34832
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2024-10-23 09:25:39 +02:00
Georg Brandl
56c7bbc831
gui: do not add a console logger when there is no sys.stdout
...
Change-Id: Icfd39bd508b5d482c902e6e781cbc557085b0c2e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34829
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2024-10-23 09:25:39 +02:00
Jenkins system
c3a87e43be
[deb] Release v0.20.0
2024-10-23 09:25:39 +02:00
Georg Brandl
1fcd8d13fc
setup: fill long_description and url
...
Change-Id: Ib5db4d9c33f205d181ed78c65265601caf23a53d
2024-10-23 09:25:39 +02:00
Georg Brandl
f697b9ad57
setup: fix classifiers
...
Change-Id: I473785df9c1157a77d02c3e1114bb6633d01149f
2024-10-23 09:25:39 +02:00
Georg Brandl
e4a14bc27f
update declared version to 1.0 final
...
Change-Id: Iec2564a5c95baf95de5f7e63ed1890334477c70f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34793
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-10-23 09:25:39 +02:00
03867c1f43
ma6stick: fix for ts (heater not working?)
2024-10-22 10:58:02 +02:00
16abfdc65e
fix ma7_samplehead_cfg and thermalcond_cfg
2024-10-22 10:52:23 +02:00
601ad9d301
eurotherm_cfg: fix meaning
2024-10-22 09:28:39 +02:00
4892c2fd8f
frappy_psi/parmod: fix Driv
...
registering updates should be done in initModules
2024-10-22 09:28:39 +02:00
25986d67aa
add more datatype tests
...
check from_string and to_string are counterparts
redesign standard value checks for this
Change-Id: I825cdba5955596096fd11ab52de571f05845d7ae
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34737
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2024-10-17 08:08:17 +02:00
f8d8cbd76d
add Datatype.to_string as counterpart of .from_string
...
This allows simple UIs using stringified versions in
text input.
- add frappy.client.SecopClient.setParameterFromString
- fix datatype tests
+ add updateItem to CallbackObject (for doc)
Change-Id: Ic7792bdc51ba0884637b2d4acc0e9433c669314d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34736
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2024-10-17 08:08:17 +02:00
f9f713811e
do not fail when generalConfig.init() is called twice
...
Change-Id: I7132b71f906fc8a77b6fedcdcc2c7d4a3e48830a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34818
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2024-10-17 08:08:16 +02:00
Enrico Faulhaber
72eb00fb27
add test for importing custom modules
...
related: #4882
Change-Id: I605de7fd43be146c84f4324d2a8eebe0aa11da79
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34814
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2024-10-17 08:08:16 +02:00
Georg Brandl
7111d73226
install libgl1 for pyqt6
...
Change-Id: I873f97fb497364d9c647797a899cf348c430214b
2024-10-17 08:08:16 +02:00
Georg Brandl
19d5756eb0
install pytango for testing
...
Change-Id: I04e0dbc6d59b388dbcf6657b8815642fcdc25094
2024-10-17 08:07:11 +02:00
Georg Brandl
d6b31222b6
new setuptools needs new importlib_metadata
...
Change-Id: Ie4220f7ec2c11b3dcf64c65b3ed97a3d9129af5c
2024-10-17 08:07:11 +02:00
Georg Brandl
b3a2f33151
ci/Dockerfile: do no use pytango from upstream
...
Change-Id: Ie002aff67e0fb4d6daf6f621c58be8c5ab71af9d
2024-10-17 08:07:11 +02:00
Georg Brandl
380c8108eb
remove old "buffer" message
...
Change-Id: I010f535ec746ef15ccfc2929a2e62ccb83894c33
2024-10-17 08:07:11 +02:00
Enrico Faulhaber
cde09694a5
ci: also install gui requirements for additional tests
...
Change-Id: Idc40699d470fb6449366a1cd75a3207cabcdd4a4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34815
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-10-17 08:07:11 +02:00
73a54dfc44
frappy_psi.sea: avoid error on import
...
the previous code raised an error when generalConfig.init() was
not called before importing. defer evaluation of seaconfdir to
the time it is used
+ use updateItem instead of updateEvent to avoid pylint complaint
Change-Id: I0da0891a8d4091102d2a149705f5546e2f6fd187
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34813
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2024-10-17 08:07:11 +02:00
Georg Brandl
025eb5fff5
fix descriptive data
...
- remove unspecified "version" and "interface" properties
- add frappy version to "firmware" property
- keep custom node props with underscores
Change-Id: Ib047e4765a90f2833f9e41af69a665554dd20737
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34792
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
2024-10-17 08:07:11 +02:00
Alexander Zaft
f36af47b98
psi: change open calls in sea
...
Change-Id: I4fe235027df4ea935d84e29895eb280f620afbdf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34665
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-10-17 08:07:11 +02:00
