17a44ef42a
fixed dilsc, fist try before tests
...
Change-Id: Iaac5f07c27879c7c17be2e25defde19e9ddd1566
2024-04-29 12:18:12 +02:00
fcdee8e3ec
gui: sort qt imports
...
Change-Id: Id8dfdd7b07bff6e337eb71a436dd51762f9b5fa7
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33389
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-04-08 17:01:20 +02:00
dddf74df9e
frappy.client: catch errors on callbacks
...
buggy updates or errors in callbacks are now converted into
error updates, buggy error updates are skipped.
-> the receive thread should no longer crash
Change-Id: I97e3999db73e64f73dfbc380fac3d7685b6ca31c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33386
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-04-08 17:01:03 +02:00
ac251ea515
test: add uri attach test
...
Change-Id: I8a021c53c9987ed03ce31c8481f73573b943d1f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33417
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-04-08 17:01:03 +02:00
9e4f9b7b95
gui: more specialized input widgets
...
Change-Id: I8b768b2069ae28a58d540165bd95f31ad7e984e0
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33390
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-04-08 17:01:03 +02:00
4f65ae7e46
frappy.client: cleanup properly after a reply timeout
...
when a reply to a request is not received within 10 s a timeout
error is raised, but any further requests with the same identifier
will be blocked - fix this
Change-Id: Id2fbc8bb6e6ecfd54bba1fa57b62e626e49b54c8
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33385
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-04-08 17:01:03 +02:00
a73b7e7d88
gui: catch invalid inputs
...
Change-Id: Ie0525e4ef9a94085da811e7eaa2e0b7430bade95
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33388
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-04-08 17:01:03 +02:00
76a78871b4
core: cover errors in handler setup()
...
Change-Id: I0bb2f07e26717205c013dfedec6e1beca2947d17
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33239
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-04-08 17:00:24 +02:00
118e22ee44
core: introduce common handler class
...
- make RequestHanlder based on socketserver.BaserequestHandler
- split handle() into subfunctions
- rework TCPRequestHandler
Change-Id: I62452e21c03b9cb9937673ce9c8663765798f863
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32984
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 >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-04-08 17:00:24 +02:00
c63f98f3cb
dispatcher: consistent handling of missing timestamps
...
Like in `read` replies (line 193), `update` now omits the timestamp
instead of returning {"t": 0}.
Change-Id: Iaee0fccae81040cdd6075b0e4a8600c032aec03d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33382
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 >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-04-08 17:00:09 +02:00
6514a1b2ee
core: add websocket interface
...
Change-Id: Ic62abeef6fb73f4a1b3d29f9225ba164de9e3e93
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33240
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-04-08 17:00:09 +02:00
aeec940659
follow up fix: handler export=True correctly
...
this seems to be broken in change 33266
Change-Id: I4da78f297976daeac0a0709b9c86e6e28fc122bf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33268
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-04-08 17:00:09 +02:00
4571af8534
follow up fix for change 33168
...
triggerPoll must be set on attached io
Change-Id: If3fa1016efa6047371380790f60db246d87b3628
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33269
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-04-08 16:59:19 +02:00
adfb561308
add cetoni pump for flowsas project
2024-04-03 11:31:38 +02:00
70a31b5cae
attocube: remove seperate pyanc350 python module
...
- implement positioner as an io class
- proper shut down behaviour
Change-Id: If04176f779809fd5b08f586556cac668cf188479
2024-03-28 10:12:18 +01:00
8ee97ade63
adjust cfg foe attocube to current example
2024-03-27 17:13:58 +01:00
1715f95dd4
frappy_psi.attocube: add lock protection to hw access
...
in order to avoid sporadic timeout problems
Change-Id: I36f67ae72b65e9c1f3179cae942b0a7d94584e55
2024-03-27 17:08:24 +01:00
db29776dd5
reworked attocube
...
- step_mode: soft closed loop, stepwise, reading encoder after a delay
- calib_steps command to determine step size
Change-Id: I27bdffb4d564ac9c55a6473704ac2de6ad92bac8
2024-03-25 16:47:13 +01:00
a2905d9fbc
improve attocube driver
...
- driving in an extra thread, hoping not to miss end of travel
status bits (does not work always)
- maxtry parameter for trying several times
TODO: move by step (in an other thread)
Change-Id: I89b51d1f6926f2fd26ec22d43aede377b5231583
2024-03-22 14:38:23 +01:00
16b826394f
fixes for attocube
...
Change-Id: Id5eeb749ba010fec59d1c2f8a3258ee34a47e246
2024-03-20 16:59:04 +01:00
ea8570d422
wip: fix attocube
2024-03-20 16:12:03 +01:00
1169e0cd09
improve sea interface
...
Change-Id: I58fb4b10ef9466f90e4cd58b6c67bcfb11c493e3
2024-03-08 15:59:16 +01:00
7d02498b3d
improve async behaviour of parmod.Driv
...
Change-Id: I3889614a0deaba4ef13b86c6600b6f96bc502a39
2024-03-08 15:58:17 +01:00
694b121c01
fix more stop doc strings
...
Change-Id: Id7ea0a6d0c959e980beee8fbea73932c701977d7
2024-03-08 15:38:34 +01:00
0f50de9a7f
fix command doc string handling and change default stop doc string
...
- fix inheritance of command description
- when no stop method is given, then the description should indicate
that stop is a no-op -> add missing doc strings to stop methods
- add test to make sure stop command doc strings are given
when implemented
Change-Id: If891359350e8dcdec39a706841d61d4f8ec8926f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33266
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-03-08 15:34:08 +01:00
b454f47a12
fix docstring in frappy.error.OutOfRangeError
...
Change-Id: I006c061a5d88ac7c97808efd56faece927916e78
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33183
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-03-08 15:34:02 +01:00
6e7be6b4c7
simplify callbacks
...
on Module, use one single callback list 'paramsCallback' instead of
'valueCallbacks', 'errorCallbacks'. Redesign the mechanism to
avoid most of the closures.
Change-Id: Ie7f68f6bf97ab3f3cd961faa20b0e77730e5b37d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33118
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-03-08 15:33:52 +01:00
af28511403
fixes for proxy modules
...
- for the case when the remote module name does not match,
'read', 'change' and 'do' does not work
- a proxy to an IO class has enablePoll == False, but it needs
a triggerPoll for modules relying on it to work
- a proxy on a communicator module has a status even when the
remote does not - this needs 2 fixes
Change-Id: Icd44da4c2984f27ce7147dec633739f9176012ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33168
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-03-08 15:33:45 +01:00
9d9d31693b
bugfix in automatic creation if attached io
...
srv.modules does no longer exist
Change-Id: Ibc52fe35f27ad110e60947702d97ee40f359b7c5
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33167
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-03-08 15:33:39 +01:00
3a7fff713d
move StructParam to frappy/extparams.py
...
+ typos and fixes in doc strings
Change-Id: Ib3e9add84ce2a6fb5c33770cae7f2da3f5655506
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33033
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-02-26 13:43:10 +01:00
2acab33faa
add FloatEnumParam
...
for the use case where a parameter is a selection of discrete
float parameters
declaring a parameter as FloatEnumParam will create effectively
two parameters, one with datatype FloatRange and another with
datatype Enum, influencing each other automatically.
in a later change StructParam should be moved from
frappy/structparam.py to frappy/extparams.py
Change-Id: Ica3fd8dcaf6e9439e8178390f220dec15e52cc86
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32975
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-02-26 13:43:10 +01:00
8c589cc138
simulation: extra_params might be a list
...
- still accept comma separated string
- remove legacy naming '.extra_params'
Change-Id: I497cf7722d0b39dd31c516383449a4cc4e7dcb7d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32968
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-02-26 13:43:10 +01:00
2b42e3fa0a
flamesample: improve comments to parmod.SwitchDriv
2024-02-23 10:13:31 +01:00
5b0da3ba98
fixes on 2023-11-27
...
- ls372 autorange: wait one sec. more for switching
- keep only one channel, even after target is reached
- intermediate target only when T is raise, but not when lowered
2024-02-23 10:13:05 +01:00
c80b4ac5fb
fixes for flamesample
...
- fixes in SwitchDrive
- increase range when reading is zero in autorange
- add debugging log msgs
2024-02-23 10:10:38 +01:00
8cb9154bb5
flamesample: use odd fraction for limits
...
workaround for problems when driving exactly to the limit
2024-02-23 10:10:29 +01:00
813d1b76ef
remove 1K plate heater configuration
...
this heater does not exist
2024-02-19 12:47:52 +01:00
183709b7ce
frappy_mlz seop: add count to ampl and phase cmds
...
Change-Id: Id7faca31269bb481ec4010f1e0aec2591f0299d6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32030
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-02-02 14:25:27 +01:00
2cdf1fc58e
fix import order in entangle.py
...
import order
Change-Id: I54450bb64cb5cbea3d29072b6095b8b9e3962aa6
2024-02-02 14:21:44 +01:00
ffaa9c83bd
introduce FrozenParam
...
For the case when the readback of a parameter does not reflect the
change immediately.
May also be used on Writable.target or Drivable.target with a short
BUSY period.
+ bug fix in an error message in frappy.datatypes.IntRange
Change-Id: I5e1c871629f9e3940ae80f35cb6307f404202b4a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31981
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-02-02 14:11:25 +01:00
f9a0fdf7e4
add frappy_psi/calcurve.py and calibtest.py
...
Change-Id: I5b9aae0ac3bcd76d846c08717201e6c32df4b675
2024-01-31 17:09:17 +01:00
7dfb2ff4e3
logdif.py: only one commit needs to be new enough
...
+ fixe intendation
Change-Id: I4b0c393767925532e1f105e80a215839a02214af
2024-01-29 15:48:43 +01:00
84c0017c03
synced most of wip to mlz
...
Change-Id: Ifc5eb0d8ccf693535ab474553759f5622b3a3c8f
2024-01-29 14:31:13 +01:00
2126956160
adopt missing changes while cherry-picking from mlz
...
Change-Id: Icda4d581e8f0ebd22fc22f2661965bf98a821a34
2024-01-29 14:29:23 +01:00
4cdd3b0709
remove more coding cookies
...
mainly from frappy_psi
Change-Id: I192811459aebe97f3076888cd31a308a51e6aa49
2024-01-29 14:14:09 +01:00
15d38d7cc1
all: remove coding cookies
...
Change-Id: I53a4d79c3ebc50b8aed43a5ef1fa6538f8059a47
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32251
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-01-29 14:06:06 +01:00
9904d31f0b
[deb] Release v0.18.1
2024-01-29 13:51:25 +01:00
b07d2ae8a3
mlz: entangle fix limit check
...
Change-Id: Ib430262057026054ac71053d25dfda340b48227a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32921
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-01-29 13:51:20 +01:00
7d7cb02f17
mlz: Zapf fix unit handling and small errors
...
Change-Id: Iaa5ed175582d8399cc0c69ba72c3ab8e6e51ecf6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32920
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 >
2024-01-29 13:51:15 +01:00
1017925ca0
[deb] Release v0.18.0
2024-01-29 13:51:10 +01:00
