8c2588a5ed
merged changes for lakeshore and ccu4
2025-03-07 07:37:11 +01:00
95dc8b186e
improve error handling
2025-03-06 17:22:21 +01:00
265dbb1a57
gui: add org- and app-name to QtApplication
...
for a better path name of stored configuration
2025-03-06 16:57:55 +01:00
73e9c8915b
logdif.py: leave on every input except bare return
...
Change-Id: I3d53c7b45fb9ef09a61be5af13a2cdc4d32d5c7d
2025-02-13 09:40:27 +01:00
2e99e45aea
WIP new version of ultrasound
...
Change-Id: Iadb83396a64e277f6f0a37f7a96d92105648c4fe
2025-01-28 09:40:36 +01:00
b7bc81710d
frappy_demo.test: add parameter for testing error messages
...
Change-Id: Ifbf9d6829be373417d3bf1ff398d2aee283d8c9a
2025-01-17 15:01:11 +01:00
eee63ee3df
config: do not override equipment_id with name
...
In the previous code, the equipment_id was overridden by the
server name when the interface argument was given over
the commandline. This was leftover from the previous config
file format, where the config files not neccessarly needed
an equipment_id.
Change-Id: I2fc248372a7d2f61cc0690804268d6d066a0a9fa
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35391
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2025-01-17 15:00:20 +01:00
fd43687465
equipment_id for merged configs and routed nodes
...
Add a new custom module property 'original_id' indicating
the equipment_id the modules originally belongs to.
This property is only given, when distinct from the equipment_id
of the SEC node.
It happens when multiple config files are given, for all modules
but the ones given in the first file, and for routed modules,
when multiple nodes are routed or own modules are given.
+ fix an issue in router: additional modules were ignore in case
of a single node.
+ small cosmetic changes in config.py reducing IDE complains
Change-Id: If846c47a06158629cef807d22b91f69e4f416563
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35396
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2025-01-17 15:00:20 +01:00
a25a368491
take over changes from ultrasound PC
...
Change-Id: I1eae717a5963e618d87ddf52db991d428a046d24
2025-01-09 11:23:12 +01:00
4397d8db1a
WIP: old oxford devices (ILM, IPS, IGH...)
...
Change-Id: I4ca0dc6149d257818d300db4d886a1e33e8210be
2025-01-09 10:09:33 +01:00
e60ac5e655
move start_ramp_to_target to SimpleMagfiield
...
Change-Id: Iab3fe8738c560bf5ac2f11a4a34428a8ffd6a7c2
2024-12-20 15:49:33 +01:00
0b5b40cfba
frappy_psi.ccu4: some smaller updates
...
Change-Id: I128ac57aad951fd8ad3bdf663c69c85644063645
2024-12-18 15:40:05 +01:00
2a617fbaf0
make UPD listener work when 'tcp://' is omitted on interface
...
'tcp://' may be omitted on interfaces
add missing 'tcp://' earlier in code, so we do not need to check
for missing 'tcp://' again.
Change-Id: Ie9b4dbd168aebdb6edfe71dbd2cfc25e9229fe67
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35321
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-12-18 09:29:58 +01:00
72d09ea73a
fix bug in change 35001 (better error message)
...
fix bug in error message
Change-Id: I8151d20f840818fc26d42348f73e740cdb20e03d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35287
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-12-10 16:30:19 +01:00
1ae19d03b3
frappy_psi.sea: fix case when bool is implemented as text
...
introduce SeaBool for this
Change-Id: I9c6b6ee7d33f11b173d612efc044fce8a563f626
2024-12-10 16:29:07 +01:00
41cb107f50
an error on a write must not send an error update
...
Change-Id: I07a991bcf26e87121160a2e604f8842eba23ebaf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35281
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-12-10 10:28:25 +01:00
8b0c4c78a9
pylint: increase max number of positional arguments
...
Change-Id: Id88270b3c3c1efb56f47def733c1e9c745f1ab18
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35282
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-12-10 10:28:25 +01:00
7ac10d2260
better message when a parameter is overridden by an invalid value
...
happens e.g. then writing status = StatusType(...) instead of
status = Parameter(datatype=StatusType(...)) on the class level
+ improve doc strings
Change-Id: I05a0b0b0da4438a40b525da40018bb5b09fd5303
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35001
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-12-10 10:28:25 +01:00
6cbb3a094b
frappy_psi.pulse: fix fatal errors
...
even when a module is work in progress, it should not raise
an error on import
Change-Id: I2f91301ba2b0c574ea344c36a74da0f893aa326d
2024-12-06 11:58:45 +01:00
405d316568
adapt temperature and temperature_regulation importance
...
- temperature_regulation on VTI should have higher importance (27)
than temperature on sample stick, when Drivable (25)
2024-12-03 15:32:57 +01:00
ac92a6ca3d
sea cfg: set visibility of calibration points to expert
2024-12-03 15:23:01 +01:00
a9e3489325
ma7: use new config type with sea_path and frappy.sea.LscDrivable
2024-12-03 15:19:45 +01:00
654a472a7e
frappy_psi.sea: more improvements
...
- add sea_path property
- add LscDrivable (config of these modules is easier to understand)
Change-Id: I616dc94de6e784f6d8cfcf080d9a8408cbf73d93
2024-12-03 15:12:02 +01:00
ddc72d0ea7
sea: fix parameter name mapping
...
- rel_path = ['tm', '.', 'set'] should mean:
'tm': tm parameters first, with /<obj?/tm as main value
'.': then all parameters directly at top level, except 'set'
'set': all parameters below 'set'
driving happens at object level
- better name mangling (the 1st appearance of the same shortname
is kept short)
2024-11-28 18:06:14 +01:00
ede07e266c
add ori2
2024-11-28 18:05:02 +01:00
4b543d02a0
varioxb: fix config, om not yet available
2024-11-28 18:05:02 +01:00
a4d5d8d3b7
frappy.server: remove comment about opts in SecNode/Dispatcher
...
The options given in the node configuration may be used
for both SecNode (equipment_id) and Dispatcher (when the
frappy.protocol.router.Router is used as dispatcher).
It is correct that both remove the options known to them.
Change-Id: I2a34073e4e5490dcf8db577d9cb74788c0cb657b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34989
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-11-27 17:38:14 +01:00
b37e625df3
frappy.server: use server name for SecNode name
...
no need to configure the name of SecNode and Dispatcher
Change-Id: I5199bbd77c74e4fe56b527a5a565a8285b0d831e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34988
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-27 17:38:14 +01:00
1dbd7c145a
frappy.server bug fix: server name must not be a list
...
followup error from change 34893
this bug appears in HasComlog, only when comlog is switched on
Change-Id: Ic0db5ae0b0af9981b0c91ebacf2eb6cd704aaa58
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34987
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-11-27 17:38:14 +01:00
2aa27f1ea5
updated sync_branches for sinq branch
...
Change-Id: Ic3330c4049b527dc98704fbbd94180dcd4930cb1
2024-11-27 17:38:14 +01:00
b28cdefe8a
follow up change for 'better order of accessibles' (34904)
...
slight change to make it compatible with py 3.6/3.7, where
reversed(<dict>) was not allowed.
Change-Id: Id440870b5523a866b3afb470ba5db9cd6a9bb0ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35002
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-11-27 16:30:06 +01:00
e0e442814f
fix description of ts in ma11stick
2024-11-26 13:48:37 +01:00
66895f4f82
improve lakeshore demo
...
use super call for read_status
TODO: update tutorial!
Change-Id: I2dd5631908dc370c6e6286587099e25a0e5ee867
2024-11-26 13:40:13 +01:00
49bf0d21a9
frappy_psi.bkpower: improve doc
...
Change-Id: I0736d1d8a40b0140bfdbf5aca189b8ddc5b22973
2024-11-26 13:39:34 +01:00
e8cd193d0d
fix bug when overriding a property with bare value
...
the bare value must be converted to a updated property.
add also a test for this
Change-Id: I261daaaa8e12d7f739d8b2e8389c1b871b26c5b3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34985
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-19 14:03:35 +01:00
142add9109
add sim-server again based on socketserver
...
- fix ls370test config file
+ fix issues with frappy_psi.ls370res
+ add frappy_psi.ls370sim
Change-Id: Ie61e3ea01c4b9c7c1286426504e50acf9413a8ba
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34957
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-19 14:03:28 +01:00
c2673952f4
[deb] Release v0.20.4
2024-11-19 14:01:20 +01:00
9fc2aa65d5
Lib/config: Create a list of pathes only for confdir
...
Under some condition (no general config file) it's possible that the
piddir and logdir as well are lists of pathes which creates some errors
during the server start
This problems occurs at least in NICOS test suite where no general
config file is defined.
Change-Id: I94c5db927923834c1546dbc34e2490b07b0bf111
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34952
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Jens Krueger <jens.krueger@tum.de >
2024-11-19 14:01:20 +01:00
09fbaedb16
frappy.client: catch all errors in handleError callback
...
put try/execpt around handleError callback
Change-Id: I3d97f085556665189da848e52a7148248f55eb0e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34955
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-11-15 10:39:47 +01:00
5deaf4cfd9
PSI: Fix import error on ThermoFisher module
...
Change-Id: I691d8f5057fdb19ba14c109399417a7ee9962637
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34954
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-11-15 10:39:47 +01:00
81f7426739
frappy.lib.multievent: avoid deadlock
...
use RLock instead of Lock, as queued actions might call
the set/clear methods recursively
Change-Id: Id43aa8669955e6be9f61379d039a4f65eb7b2dc4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34950
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
c69e516873
remove unused file
...
Change-Id: I969bfb22f2196227abe8c5ecef628a15e6eb75f1
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34939
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-15 10:39:47 +01:00
64732eb0c8
[deb] Release v0.20.3
2024-11-15 10:39:47 +01:00
1535448090
add generalConfig to etc
...
Change-Id: I768b136c803d5e197e3653d1b84e147b62a97676
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34924
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
554996ffd3
fixup test for cfg_editor utils to run from non-checkout, and fix names, and remove example code
...
Change-Id: I6224244392e2a2d0928065ba24abcbe822096084
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34934
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
2d824978a9
[deb] Release v0.20.2
2024-11-15 10:39:47 +01:00
35dd166fee
fix frappy-server cfgfiles command
...
frappy-server <name> errors after 34893
Change-Id: Ifba758fbabc3aef32e20b683f1c1edbfea711a75
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34913
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2024-11-15 10:39:47 +01:00
aee99df2d0
server: better handling of cfgfile argument
...
No reason to keep stringly-typed data on that level
Change-Id: Iba8d88301bf36ef6051031d1916d1bac84ede546
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34893
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-11-15 10:39:47 +01:00
8e05090795
generalConfig: fix the case when confdir is a list of paths
...
convert all env variable values containing ':' into a list of paths
+ fix one case where an env variable is not converted to a Path
+ remove unused _gcfg_help
Change-Id: Ibc51ab4606ca51e0e87d0fedfac1aca4952f3270
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34872
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 >
2024-11-15 10:39:47 +01:00
eac58982d9
server: service discovery over UDP.
...
implement RFC-005
- server broadcasts once on startup and answers to broadcasts
- small tool for listening on the port and sending broadcasts
Change-Id: I02d1184d6be62bef6f964eb9d238220aef062e94
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34851
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2024-11-15 10:39:47 +01:00
