4c71e44cd2
changed sign of temperature offset adjustment of d and F in razorbill
2024-07-18 15:41:35 +02:00
5d0c980e22
added razorbill.py frappy file
2024-07-18 15:39:18 +02:00
f1bbdec2b3
post experiment commit, code is operational
2024-07-16 09:49:14 +02:00
2bdf9c6542
ACM1219: add checkHWIdent
...
waiting 0.5 sec before the first communication helps to start
properly
+ added usb dev names for box
2024-07-03 14:09:13 +02:00
1fba0fad42
ACM1219: remove wait_before
2024-07-03 11:35:19 +02:00
0a5de1ebc2
Updated the ACM1219 driver
2024-07-02 15:54:25 +02:00
92c53ad3ba
added GNU license
2024-06-17 20:20:54 +02:00
802d4e0c99
made displacement and force calibrations writable and updated capacitance channel descriptions
2024-06-17 20:19:33 +02:00
ee040ce98a
added RP100, ACM1219, and dummy classes, and razorbillUC220T config file
2024-06-17 20:11:36 +02:00
b1f9c74269
frappy.client.readParameter: handle connection errors correctly
...
update cache in case of connection errors, as they are not handled
in the rx thread
Change-Id: Icf3377020ec314fcef2982a4e6dc64356f787273
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33744
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-05-28 17:29:55 +02:00
63210c9924
SecopClient.online must be True while activating
...
as callbacks trigger by updates while activating may check for
online state
+ remove unused imports
Change-Id: I37df839abf6b7225389b803347234a3d0bc8d799
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33745
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-05-28 17:29:55 +02:00
47c5e297d4
[deb] Release v0.19.0
2024-05-28 17:29:55 +02:00
6cd83eabcc
fix LimitsType to be actually used and validated
...
Change-Id: Id0f67e91f4ff57d4c29c33960e736c8c3ae77209
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33683
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-05-28 17:29:37 +02:00
caaefec6db
Fix abslimits reading from entangle device
...
Fixes : #4864
Related: #4866
Change-Id: I393a35784766c0e09367a90debfc8b59b290626e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33672
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-05-28 17:29:37 +02:00
6dfb3bcee8
add config for the Entangle simulation server
...
Change-Id: I9e7564707fc98d3b5dc3182d7837b222aefef582
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33692
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-05-28 17:29:37 +02:00
d492f7326f
frappy_psi.parmod: make async
2024-05-07 10:25:02 +02:00
7929c37027
frappy_psi.sea: better timeout behaviour
...
timeout parameter not only for requests but also for connects
this might avoid blocking situations
2024-05-07 10:23:21 +02:00
76349e38f9
add cfg files from zebra: Ma10heat, ma10high_t, ma6_sampleheat
2024-05-03 08:25:50 +02:00
647d87f70f
frappy.client: avoid shutdown callback sent twice
...
in case th rx thread crashes, the shutdown callback is called twice
-> improve cleanup code in __rxthread
Change-Id: I0d20aa4304d94b17565b018ad8528d61bbbcbc83
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33614
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 >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-05-03 08:14:10 +02:00
798c268eb4
hvolt_long_cfg.py
2024-05-02 16:36:43 +02:00
9467f5233c
increase mercury timeout
...
+ set try_cnt for IPS to 0 (do no longer know why)
2024-05-02 14:54:52 +02:00
a7ff73a34d
set comlog automatically on
2024-05-02 14:54:52 +02:00
bf018e74ba
add backlash to MA10 motor
2024-05-02 14:47:36 +02:00
801f80af7f
add cfg files for gas stick
2024-05-02 14:47:36 +02:00
26fa5371e9
add piezo/thermalc from sans
2024-05-02 13:06:40 +02:00
2bad1ffee5
update haake/ma7/ma11/ovenstick from sans
2024-05-02 11:47:33 +02:00
b2b77c70ea
SecopClient.__del__ must not call callbacks
...
otherwise a nasty deadlock might happen in NICOS
Change-Id: Ie1a333979b77683ce35683aede042ce86159fe65
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33583
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-05-02 08:40:32 +02:00
192cde605e
frappy.client.SecopClient: add the option to use no logging at all
...
using a dummy NullLogger
Change-Id: I1f12c7307d3d8e37243488b8a11c6abcf087af86
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33582
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-05-02 08:40:32 +02:00
c7d23e40e9
frappy.client.interactive: improve logging and error handling
...
- redesign logging, using python logging
- stop watching when an erro happens during update
Change-Id: Ibe96569ecc45df429b571232374c451de3f82f1f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33431
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-05-02 08:38:49 +02:00
2561e82086
frappy.client: improve error handling more
...
- implement a 'handleError' callback
- SecopClient.handleError is registered as a callback and by default
logs errors up to a limited number of times
- the cache is customized to return an item indicating an undefined value,
helping to avoid follow up errors.
+ frappy.errors: cosmetic fix
+ frappy.client: cosmetic changes
Change-Id: I4614e1d27c7aea3a1a722176c6be55f8563597cd
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33429
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-05-02 08:38:49 +02:00
55c96ffe4f
add FW cfg
2024-04-30 09:24:07 +02:00
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
bb14d02884
bug fix in frappy.io.BytesIO.checkHWIdent
...
missing f for f string
Change-Id: Ie67384e5b7e514728041a72bd08c850abb31639e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32786
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-01-29 13:51:04 +01:00
4c499cf048
remove py35 compatibility code
...
as f-strings are heavily used now, compatibility to py35
can be removed
Change-Id: I1ae4912ad4cbde8419b74845217943bd061053f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32754
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-01-29 13:50:50 +01:00
e403396941
fix playground after change 32249
...
as modules are now stored on secnode instead of dispatcher
Change-Id: Iccda3d97269693a893c06a4e094a9c1dbcf7df0b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32746
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-01-29 13:50:00 +01:00
5b42df4a5e
frappy.secnode: fix strange error message
...
when get_module_instance is called a second time after
it failed, the 'cls' element in opts is missing:
move opts dict copy from create_modules to get_module_instance
Change-Id: Ie046f133a8fdbbb1c39643ca16dc5447a9d2d065
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32745
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 >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-01-29 13:49:55 +01:00
841ef224f6
modify arguments of Dispatcher.announce_update
...
- 'pname' argument is not needed
- change 'modulename' argument to 'moduleobj'
(needed for further change)
Change-Id: Ib21f8ad06d9b2be4005ff3513088a85e29785c94
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32744
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-01-29 13:49:39 +01:00
8142ba746d
fix missing import in change message
...
Transported values in a change must be converted first.
As this is only relevant for the exotic "scaled" and "blob"
datatypes, this was not detected yet.
- add tests
- suppress warning PytestUnhandledThreadExceptionWarning in tests
+ change import_value methods to raise no other exceptions than
WrongTypeError and RangeError
+ simplify Command.do: as import_value already raises the
appropriate error, no more try/except is needed
Change-Id: I299e511468dc0fcecff4c20cf8a917da38b70786
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32743
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-01-29 13:49:30 +01:00
5358412b7a
core: better error on export of internal type
...
more descriptive error when trying to export OrType, NoneOr, ValueType
and DataTypeType
Change-Id: If13815e9d2b177042b24a1bb62b1ad1d1d88b502
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32737
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-01-29 13:49:21 +01:00
010f0747e1
frappy_psi.sea: workaround for bug in sea
...
hdb path should not contain duble slash. replace double slash
by single slash
Change-Id: Ia2ce3be9a75d68fcc7efe3eb3dbd19a7907a73ff
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32705
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-01-29 13:49:08 +01:00
047c52b5a5
core: better command handling
...
* check argument of do
* automatically set optional struct members from function signature
Change-Id: I95684f1826c1318ea92fad2bd4c9681d85ea72f5
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32501
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-01-29 13:48:37 +01:00
f846c5cb31
datatypes: fix optional struct export
...
Change-Id: Ia2758dfba75f36a91bf1676e8ead555cec3ead53
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32500
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-01-29 13:47:18 +01:00
0e4a427bc3
mlz: handle unconfigured abslimits
...
- if there are no abslimits configured, get them from the hardware.
- check if the ranges are compatible
Change-Id: If72e31a56c299cb628ed8ff66d4340a87d4bd1d4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32625
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-01-29 13:47:09 +01:00
2d8b609a3c
core: formatting and update server docstring
...
Change-Id: Ic0dd4c5239f27679c89f6b3742b9c5f8b71f33f6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32514
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-01-29 13:47:00 +01:00
6e3865b345
core: allow multiple interfaces
...
Change-Id: Ib8c0baef85a6dd69cddafe1c4973e42136d1588b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32489
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-01-29 13:46:47 +01:00
0004dc7620
implement pfeiffer TPG vacuum reading
...
this is an example where StringIO.communicate has to be extended
Change-Id: Iff6bb426ee7960904993574531de84793152e21d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32385
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-01-29 13:36:18 +01:00
158477792f
add StringIO.writeline, improve StringIO.multicomm
...
- StringIO.writeline sends a command and does not expect a reply
- StringIO.multicomm and BytesIO.multicomm is improved in order
to insert individual delays in between lines and individual
noreply flags
+ fix a bug in tutorial_t_control
+ improve readability of frappy.lib.classdoc.indent_description
Change-Id: I9dea113e19147684ec41aca5267a79816bbf202c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32267
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-01-29 13:34:45 +01:00
fd0e762d18
doc: drop latex support, add pdf support
...
latexpdf fails with error message "Too deply nested".
We want to avoid reducing the nesting level of doc strings
in frappy.lib.classdoc (less nice output) or a level of
nesting in method doc strings.
- latex removed from Jenkinsfile
- added support for rst2pdf
Change-Id: Ieb3355ef506e636e7e43a726c68327e3b1154469
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32406
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-01-29 13:34:39 +01:00
a16ec6cc91
mlz/demo: move old examples to Attached
...
change very early version of module attachments in GarfieldMagnet and
MagnetigField to use Attached
Change-Id: I616ad17bc72cd93d86e1b3e3609543cfe90edcd8
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32250
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-01-29 13:34:29 +01:00
777a2cb6a9
core: move module handling out of dispatcher
...
Split module handling code from the dispatcher.
The new class for managing Modules is called SecNode.
* change logging to no longer need a reference to modobj
* modules get a reference to the secnode obj instead of the
dispatcher
* intermediate usage fixes for frappy_psi/sea
Change-Id: Ifee4bb47aa7a4508bb4a47c9a5873b7e2d5faf67
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32249
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-01-29 13:33:47 +01:00
cb3e98f86d
added logdif.py
...
a tool the compare commits in branches
Change-Id: I503941b76bb567ea4c3d33b986406a910154fda6
2024-01-29 12:58:45 +01:00
a8bafde64e
add test cfg for lockin 7270
...
Change-Id: Ic6d66b625feb44e8130266901f1296adcb11f532
2024-01-29 10:58:21 +01:00
36c512d50b
frappy_psi/SR.py: got changes from develop branch
...
+ move soft auto range from read_value to doPoll
Change-Id: I0bf8ac15f8515e55cd9131be33615908ffc99c12
2024-01-29 10:29:33 +01:00
17b7a01ce1
Driver for ThermoHaake Phoenix P1 Circulator
...
Change-Id: I0573eeac2e40b4715072661c819701186733bf94
2024-01-29 10:29:33 +01:00
be66faa591
frappy_psi/thermofisher: version through gerrit
...
Change-Id: I6999e84d1c5efd0625c6df89e97dad46e5a8cd59
2024-01-29 10:29:33 +01:00
e27b4f72b5
newset version of oksanas drivers
...
Change-Id: Ia6d8b727e48e96a14b75feeef5d3e6c002cb82a0
2024-01-29 10:29:33 +01:00
bc7922f5c8
iono pi max demo (drums)
...
+ fix spacing in ionopimax.py
2024-01-25 09:40:10 +01:00
99a58933ec
ionopimax: Add LogVoltageInput
2024-01-18 08:40:33 +01:00
9e000528d2
add vacuum furnace cfg file
2024-01-11 16:33:06 +01:00
4a2ce62dd8
added drivers for small furnace
2024-01-11 16:28:06 +01:00
9e6699dd1e
more robust calculation for heater resistivity
...
and check is is in the allowed range 10 .. 100 Ohm
Change-Id: If485480c0974d953165c37f7354dc2818f68b30b
2023-12-15 16:00:26 +01:00
416cdd5a88
Autogain function for SR830 lock-in driver
...
Change-Id: If07ec9182e5153e1237b9818ce555162f54e0ae5
2023-12-11 08:31:43 +01:00
1bd188e326
For the lockin830 get_par/set_par are implemented.
...
Change-Id: I5b6707a07d936d24528173a2edae49a148081ff9
2023-12-11 08:31:36 +01:00
f7b29ee959
SR830: moved dicts out of class
...
Change-Id: If056b1bf4e81c3b609ded087dff2b40c7119903f
2023-12-11 08:31:29 +01:00
f6a0ccb38b
Changed write_range, write_tc methods
...
Change-Id: I335f97bd54deaccf0552b27deb3a7dfe73074e4c
2023-12-11 08:31:17 +01:00
b93a0cd87b
New driver for lock-in amplifier SR830
...
Change-Id: I45c5a06460f4b84cade0eae53188b058510c4473
2023-12-11 08:31:11 +01:00
be6ba73c89
workaround for bug in sea
...
fix double slash in hdb path
Change-Id: I68ab79c5240abb9fcccbbe5f817f740df2bb5ea6
2023-12-05 14:10:03 +01:00
c075738584
ips_mercury: add NOT_FOUND action
2023-12-04 15:47:18 +01:00
0fa2e8332d
do not complain when no output module is configured
2023-12-04 15:46:50 +01:00
afb49199a1
fixes in mb11/dil5 cfg files
...
- add flowpars
- increase om range to -360
- add sea config
2023-12-04 15:45:00 +01:00
416fe6ddc0
frappy.client: fix the case then timestamp is missing
...
the previous version failed when timestamp was missing
Change-Id: I77e1fb81b19fb4ee2749d731bafacbac46132f8e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32404
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 >
2023-11-30 09:17:11 +01:00
e3cb5d2e60
frappy.io: change default to retry_first_idn=True
...
Looked at this code again, and wondered why the default is not True.
It is far more probable that the programmer just forgets to set
this property to True than it would harm to do so.
Change-Id: I439aedbdfc9c2b12737e3ce1694e90550ddf0e78
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32270
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 >
2023-11-30 09:16:57 +01:00
998367a727
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2023-11-23 15:57:17 +01:00
ab918a33ae
cc: replace bool by enum in cc.hav and cc.nav
2023-11-23 15:56:23 +01:00
397ec2efbd
add pdld laser driver
...
2 modules: a switch (on/off) and the power (set: target, readback:value)
2023-11-14 09:17:11 +01:00
67032ff59b
ma6: set backlash
2023-10-27 15:11:19 +02:00
03c356590b
frappy_psi.phytron: implement limit switches
2023-10-02 16:58:09 +02:00
06bec41ed3
ma6: make ts drivable
2023-10-02 16:56:23 +02:00
4cd6929d4b
fix ma15 sea config
2023-10-02 16:55:42 +02:00
a89f7a3c44
configs for sample heat stick
2023-10-02 16:54:52 +02:00
a4330081b7
proxy: fix command wrapper
...
bugfix: return only value of execCommand result, not qualifiers
Change-Id: Iff14779050daa9886e9f7d0396317c5a41695cd1
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32235
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-10-02 13:49:08 +02:00
3b997d7d86
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-09-22 13:29:23 +02:00
612295d360
add ill2
2023-09-22 13:29:04 +02:00
9e39a43193
fix fs config
2023-09-22 13:27:54 +02:00
6adfafaa27
more consistent ori1 stick json file
2023-09-22 13:27:10 +02:00
f6c4090b96
fix simulation
...
+ some fixed in sim_uniax
Change-Id: Ia8703ed988aa904bb2694339f0d3175b28fcb33e
2023-09-19 16:05:52 +02:00
ecef2b8974
more cfg file fixes
...
Change-Id: I0ba86cd17bb07f480cac6f20994ee854c6e811ae
2023-09-19 15:04:02 +02:00
96a7e2109b
cleanup cfg files
2023-09-19 14:43:48 +02:00
2f3c68a5c5
improvements for flame
...
- frappy_psi.channelswitcher: use isBusy instead of checking value and target
- frappy_psi.ls372: remove underflow mechanism
- frappy_psi.parmod.SwitchDriv: switch the controlled module also when not buys
2023-09-19 14:17:08 +02:00
e9a195d61e
flamedil as of 2023-07-04
2023-09-19 14:17:08 +02:00
6ac3938b78
flamedil as of 2023-07-03
2023-09-19 14:17:08 +02:00
b4cfdcfc1a
flame sample combined T
2023-09-19 14:16:21 +02:00
d32fb647a6
frappy_psi.ls372: add TemperatureSensor and TemperatureLoop
2023-09-19 14:14:12 +02:00
abf7859fd6
frappy_psi.cryoltd: fixes after frappy upgrade
2023-09-19 14:14:12 +02:00
55ea2b8cc4
frappy_psi.triton: try to fix channel selection before condense action
2023-09-19 14:14:12 +02:00
27600e3ddf
fix bad cfg files
...
Change-Id: Iacba12a2679777dd4ea2892751d82a63221b1361
2023-09-19 14:07:20 +02:00
6b4244f071
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2023-09-19 11:01:06 +02:00
1d81fc6fcd
frappy_psi.sea: small fixes
...
- changes in return value of frappy_config command in sea
- do not store sea manager
Change-Id: I5bc1d9a281ad2285b90d3649b4c702a3501d451d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32166
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-09-19 10:58:07 +02:00
dfce0bdfbc
phytron.py: improve status
...
better analysis of hardware status code
Change-Id: I667b443649db43ff3e572e0a50685aabc9ba2ca2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32165
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-09-19 10:57:59 +02:00
c39aef10aa
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-09-14 11:10:12 +02:00
45dd87060b
improve client shutdown time
...
in SecopClient.disconnect joinng the reconnect thread may take
up to 10 s, because of the time.sleep(10) call in the reconnect
thread.
change the _shutdown attribute from bool to an Event, and
use Event.wait instead of time.sleep
Change-Id: Icea6a14ad73df0b3d26ef45806f4c05e6bf18492
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32137
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-09-14 09:10:39 +02:00
8019b359c4
change FloatRange arguments minval/maxval to min/max
...
in the previous version FloatRange(max=100) was neither working
properly nor complaining, because the maxval=None default was
overriding the value for max.
possible fixes:
- raise an error when min/max used as argument (confusing for
the programmer, as it is a property)
- allow both versions minval/maxval and min/max (more code)
- use min/max and a pylint directive here (the only thing to
take care is not to use the min/max builtin in __init__)
this change uses the last option for the fix
Change-Id: Iff0e0c4d0d7b165003bdeffa67a93a1cd7f29eea
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31982
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-09-14 09:09:25 +02:00
4c5109e5a3
fix frappy_demo.lakeshore
...
reading back the target does not work properly, because
a) the readback value might be delayed
b) there is no command to read back the target, SETP?1
is returning the working setpoint, which might be distinct
in case of a ramp
Change-Id: I0da2dbfc1a8ddbecbae6d0456ff64e008bc56336
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31983
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-09-14 09:09:09 +02:00
bf4b3e5683
psi: improve sea interface
...
- get return value from teh frappy-config script in order
to detect failures
- call config_check not more than once within 1 sec
Change-Id: Ibe42e846521206463f2761d452aea7e558a36854
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32139
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-09-14 09:09:00 +02:00
af34fef1e1
fix missing .poll attribute in simulation
...
using super() in SimBase.__new__ fixes the problem
Change-Id: I18d0ba6ac476c2edb0d973090bcb09508a983d6a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32136
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-09-14 09:08:50 +02:00
5e1c22ba28
further fixes after change 31470
...
- get_module is to be called when io is autocreated
- register_module is missing in playground
Change-Id: I28884575b71320667107c494473b0fc5d4363a50
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32123
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 >
2023-09-14 09:08:36 +02:00
0bc4a63aa7
add parmod.Par
...
the reasonly class frappy_psi.parmod.Par represents a parameter
or a component of a tuple parameter
Change-Id: I47208c9d7a6fc377cd56b82cc6a9e8cdb433fe8e
2023-09-14 09:05:00 +02:00
cb2c10655c
improve shutdown time
...
on shutdown, time.sleep(10) is blocking the reconnect thread.
change the _shutdown attribute from bool to an Event, and
use Event.wait instead of time.sleep
Change-Id: Icea6a14ad73df0b3d26ef45806f4c05e6bf18492
2023-09-13 17:22:58 +02:00
6c49abea74
fix frappy/playground.py after change 31470
...
assumptions about dispatcher in playground.py are no longer
valid.
- let Dispatcher class in playground inherit from real dispatcher
+ improve log messages
Change-Id: I2a9a9d532dabadc590543660c445c021dd2f2891
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31967
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 >
2023-09-11 14:12:14 +02:00
dee8f8929e
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-09-08 10:46:13 +02:00
2e143963df
stickmotor addon: add backlash -1
2023-09-08 10:45:18 +02:00
4bc82c2896
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-09-06 08:39:22 +02:00
833a68db51
ma10: improve sea cfg
2023-09-06 08:38:49 +02:00
b9f046a665
hvolt_short stick: make hcp writable
2023-09-06 08:38:06 +02:00
9d9b5b2694
frappy_psi.phytron: further improvements
...
unfortunaely, sometimes communication errors happen.
workaround: try several times reading the status
Change-Id: I2788c6c9b4145246cdd51c31b246abffee60f93b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32032
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-08-28 14:17:26 +02:00
255adbf8d9
frappy_psi.phytron: further improvements
...
unfortunaely, sometimes communication errors happen.
workaround: try several times reading the status
Change-Id: I2788c6c9b4145246cdd51c31b246abffee60f93b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32032
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-08-25 08:21:16 +02:00
bc0133f55a
add zapf to requirements-dev
...
Change-Id: I6dddd8d4c590253f1039b89edae561fa90b40811
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31725
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-08-18 16:32:16 +02:00
09e59b93d8
Revert "add zapf to requirements-dev.txt"
...
This reverts commit e67a46cd015c0a1a32d5a4f114b963dd17a7c266.
Reason for revert: required version available from pypi
Change-Id: Ib4f8b0cf62da58e84545511c7521ea93b7ff1342
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31724
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-08-18 16:32:16 +02:00
2474dc5e72
interactive client: improve keyboard interrupt
...
- when driving a module with <module>(<target>),
keyboard interrupt should send stop()
- make sure keyboard interrupt does not only stop
the current driving, but also skips other code
on the same command line
Change-Id: Ib4d2c4111dc0f23bf07385065766fb9b4a611454
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31926
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-08-18 16:32:16 +02:00
9dab41441f
frappy_mlz: Add Zapf PLC
...
adds a zapf-based PLC connection scanner.
Change-Id: Icc0ded7e7a8cc5a83d7527d9b26b37c49e9b8674
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31471
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 >
2023-08-18 16:32:16 +02:00
4af46a0ea2
add zapf to requirements-dev.txt
...
Change-Id: Ia4de696051cee1e00676e777b7dd2c0a90a0c504
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31719
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-08-18 16:32:16 +02:00
b844b83352
core: do not call register_module on error
...
Dispatcher.get_module_instance returns None on failure.
If that is the case, the dispatcher should not try to register the
None value as a module.
Change-Id: Ie33b8debc2a829d480d56cafc1eb0ab610181d67
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31713
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2023-08-18 16:32:16 +02:00
3b63e32395
frappy_mlz: fix one-off error in barcode reader
...
cut of one byte too much in barcode decode
Change-Id: I5f1f8475f197b13af836d685dc6da5a9ee824dc2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31728
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-08-18 16:32:16 +02:00
5168e0133d
dispatcher: change logging calls to debug
...
Some logging calls should not have landed as log.info in the dynamic
modules patch. This fixes that.
Change-Id: I666fc7c9b5c65ddbed1c26ea456becce7870e744
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31707
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-08-18 16:32:16 +02:00
9ea6082ed8
frappy_mlz: Zebra fixes after basic test
...
Some fixes after the device was tested with socat ptys and NICOS.
Change-Id: I3e9dba2be2547d493c435d1da9844c932a2df4e6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31662
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 >
2023-08-18 16:32:16 +02:00
f205cf76aa
mlz: Add Zebra Barcode Reader
...
Adds a Barcode reader device (for now, only for ANTARES). Not yet
tested with real hardware.
Change-Id: I25f097466be89d152f47b9d05ece8f562e4b34d6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31412
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 >
2023-08-18 16:32:16 +02:00
db9ce02028
Revert "revert commits done before MZ holidays"
...
This reverts commit d2885bdd72
.
2023-08-18 16:32:16 +02:00
c4a39306e4
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-08-17 14:10:29 +02:00
024de0bd32
insert pressure reading into ccrpe_cfg
2023-08-17 14:07:44 +02:00
d2d63c47e1
frappy_psi.phytron: stop motor before restart
...
restarting the phytron motor without prior stop leads
to funny behaviour.
- send stop before restart
- stop motor when moving but status not busy
- restart when motor drives the wrong way
+ better status text when stopping
Change-Id: I82cd59297b3c79a354a4eeb5ba03fc65bedf755f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31929
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-08-14 14:32:01 +02:00
565e8e6fd3
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-08-10 14:35:03 +02:00
89bc7f6dfe
add ori7
2023-08-10 14:34:51 +02:00
c69fe1571a
add hvolt_short
2023-08-09 17:39:19 +02:00
c40033a816
update old cfg files
...
- change secop_psi to frappy_psi
- remove interface and name in Node
Change-Id: I69242de250c9ecf52e001fce6396347dbf3fedcb
2023-08-09 17:36:02 +02:00
da37175cbb
frappy/protocol/interface/tcp.py: use SECoP_DEFAULT_PORT
...
import SECoP_DEFAULT_PORT instead of defining DEF_PORT
Change-Id: I02ee420d200f90b61f8c79e1cb5ee3e0913955e9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31913
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 >
2023-08-07 16:15:30 +02:00
2020928289
improve error message on client when host/port is bad
...
for host name without port, None was used for the port
leading to a confusing error message
- do not call parse_host_port with None as defaultport argument
- improve error message when connection fails
+ fix an error in last line of parse_ipv6_host_and_port
+ fix some issues breaking PEP 8 rules
Change-Id: I437360be96449c164f0080e3c60f1685825d4780
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31911
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 >
2023-08-07 16:15:30 +02:00
9df6794678
fix haake_cfg
2023-08-07 16:10:55 +02:00
41f3b7526e
fix ma7.config.json
2023-08-07 16:10:30 +02:00
f80624b48d
MA7: add unit=T to mf
2023-07-11 15:36:14 +02:00
9e2e6074c8
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2023-07-11 13:27:57 +02:00
5a13888498
sMA6 encoder mode to CHECK
...
after Oksana experienced that it works
2023-07-11 11:27:20 +02:00
5a8a6b88ff
frappy.client.interactive: bug fixes
...
- correct behaviour with the following untypical message sequence:
- send change target
- receive status idle
- receive status busy
- receive changed target
- add 'exception' to Logger
Change-Id: I614b2a2c2e09ef1b43544838ccb2fa43357dd50d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31632
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 >
2023-07-11 10:59:42 +02:00
b84b7964e3
frappy_psi.sea: further bug fixes
...
- in SEA, it is not guaranteed that the is_running state is set
before the run command returns. as a consequence, we have to
wait in SeaDrivable.write_target for is_running being set
- syncio has always to be reconnected after asynio
Change-Id: Ia46cff11de86868ce0627faaf6f776282bd7a8f4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31631
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 >
2023-07-11 10:59:42 +02:00
6c5dddc449
ma7: sea confg: make ta/tb visible
2023-07-10 10:55:43 +02:00
78fa49ef74
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-07-07 15:46:05 +02:00
d92b154292
frappy_psi.sea: avoid multiple connections
...
the _connect was sometimes started in parallel from
startModules and the first call to doPoll.
remove the first one, and protect the second one
with a lock
Change-Id: I079439e150efd5d005130cef475f6326f933ecbd
2023-07-07 15:40:20 +02:00
073fe1a08b
frappy.io: make error reporting consistent
...
- fix mechanism to avoid multiple error messages in log files
Change-Id: I688071f9b06da1a81eb12d63adb549042171c7c8
2023-07-07 15:40:20 +02:00
f80c793cd9
consmetic changes to ma6_sample_heat_cfg.py
2023-07-06 14:49:06 +02:00
519e9e2ed7
MA6: set om.encoder_mode to 'NO'
2023-07-06 14:48:09 +02:00
14036160f7
add special configurations m6/ma7 sampleheat
2023-07-06 13:06:06 +02:00
131dc60807
MA7/MA11: make ts drivable
2023-07-06 13:04:36 +02:00
49722a858f
update haake + eurotherm cfg
2023-07-06 13:04:11 +02:00
c61b674382
disable encoder for MA11 stick rotation
2023-07-06 12:57:07 +02:00
091543be56
add FW (old power rack, via SEA)
2023-07-06 12:53:19 +02:00
d2885bdd72
revert commits done before MZ holidays
...
they are all not neccessary for SINQ SE operation
Change-Id: Ic9adcccf685752ab90bb6b86005ac8e04b302855
2023-07-06 08:03:15 +02:00
975593dd6b
update to gerrit version
...
Change-Id: Ifdaa28dd961a529cd9197c4c3639744f108b0a6a
2023-07-05 17:33:05 +02:00
4fe28363d3
server: add option to dynamically create devices
...
add module which scans a connection and registers new devices depending
on the answer.
* change module initialization to demand-based
* move code from server to dispatcher
- remove intermediate step in Attached __get__
TODO:
factor out dispatcher (regards to playground)
discuss factoring out of module creation code from server AND
dispatcher
Change-Id: I7af959b99a84c291c526aac067a4e2bf3cd741d4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31470
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 >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-07-05 17:16:41 +02:00
28b19dbf57
frappy_psi.thermofisher: add version through gerrit
...
Change-Id: I4b89d6ec803ad64c41720bc62493d2e4027df50e
2023-07-05 17:14:07 +02:00
05189d094a
add StructParam
...
adds a generic solution for creating parameters with struct datatype
with their members linked to individual parameters.
main use case: ctrlpars
read_*/write_* methods are either created for the main (structed)
parameter based on the corresponding methods of the individual
parameters or the methods for the individual parameters are created
based on the methods of the main parameter
+ disable pylint use-dict-literal
Change-Id: I7f1d9fb3d3b2226b548c2999bbfebe2ba5ac285e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31405
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-07-05 17:12:12 +02:00
47da14eef9
pylint: disable use-dict-literal
...
sometimes it is nicer to use dict(...) instead of {}
an objections against removing this check from pylint?
Change-Id: Ib08d3016b7ec3512111021a82685253cdcd42916
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31505
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 >
2023-07-05 17:11:40 +02:00
7904f243cb
server: add option to dynamically create devices
...
add module which scans a connection and registers new devices depending
on the answer.
* change module initialization to demand-based
* move code from server to dispatcher
- remove intermediate step in Attached __get__
TODO:
factor out dispatcher (regards to playground)
discuss factoring out of module creation code from server AND
dispatcher
Change-Id: I7af959b99a84c291c526aac067a4e2bf3cd741d4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31470
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 >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-07-05 17:10:56 +02:00
a2fed8df03
pylint: disable use-dict-literal
...
sometimes it is nicer to use dict(...) instead of {}
an objections against removing this check from pylint?
Change-Id: Ib08d3016b7ec3512111021a82685253cdcd42916
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31505
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 >
2023-07-05 17:08:48 +02:00
19f965bced
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-07-03 17:51:43 +02:00
3e4ea2515e
add ma15 cfg
2023-07-03 17:51:28 +02:00
714c820115
fixes in ori3 and dil5 config
2023-07-03 17:49:06 +02:00
a8e1d0e1e8
frappy_psi.sea: try to reconnect on failure
...
both .asynio and .syncio connection should be tried to reopen.
(fix from mlz gerrit)
Change-Id: I0da5bd9927865a1c55afb93a7a5b76c44fc8750e
2023-06-29 11:28:04 +02:00
d7a1604bd5
frappy_psi.sea: auto connect
...
on both .ssynio and /syncio try to reconnect after failure
2023-06-26 14:45:53 +02:00
b92095974b
camea filter addon
...
Change-Id: I1d80aa3bfc4e441ad8a69930b81d6cc25cee9511
2023-06-20 11:05:15 +02:00
8dc9c57e9d
entangle: fix tango guards for pytango 9.3
...
Change-Id: I666969f9c798971d5cd8a0c2f6564067ac3cde72
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31327
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2023-06-20 09:00:42 +02:00
7c95f1f8ee
config: fix merge_modules
...
Change-Id: I31d05afe300443e08fb08f9e6645401f52cfae39
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31323
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-06-20 08:05:55 +02:00
3786d2f209
frappy_psi.triton: fix HeaterOutput.limit
...
+ fix handling of control_active
Change-Id: Ic11933f6c1c4d9df07aa9d06ae4dca40b755e4ed
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31377
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-06-20 08:03:37 +02:00
138b84e84c
add a hook for reads to be done initially
...
inital reads from HW should be done in the thread started by
startModule, not in startModule itself.
- add a hook method 'initialReads' for this
+ add doc for init methods
+ fix some errors in doc
Change-Id: I914e3b7ee05050eea1ee8aff3461030adf08a461
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31374
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 >
2023-06-20 08:03:37 +02:00
997e8e26e9
frappy_psi.mercury: proper handling of control_active
...
Change-Id: I31e846fa6fdf6d642184e3736a66ffd53033bccf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31376
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 >
2023-06-20 08:03:37 +02:00
644d005dad
frappy.mixins.HasOutputModule
...
add 'set_control_active' method for overriding by subclasses
Change-Id: Ib344319862a4a0bf29efef16a63db09d1f314a82
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31375
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 >
2023-06-20 08:03:37 +02:00
36dfe968e8
frappy_psi.phytron: rename reset_error to clear_errors
...
use the command 'clear_errors' to return from an error state
+ make sure target is valid after clear_errors
Change-Id: I3c180500a05836d52bbb9a8ecbdb397adea03d0d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31337
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-06-20 08:03:37 +02:00
0932228596
frappy_psi.mercury/triton: add control_off command
...
frappy_psi.triton.TemperatureLoop has not output module to
deactivate control -> add control_off also to loops in
frappy_psi.mercury
Change-Id: I4dc4333134da34a8d3ae0f3c037a1e5b108c95a1
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31341
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 >
2023-06-20 08:03:37 +02:00
dff0c819de
io: followup fix for retry-first-ident
...
followup fix: no error was raised ever for the first identification
message.
Change-Id: I80f0f431add6dfd7b37d750b9fc661174aa8f217
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31318
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-06-20 08:02:13 +02:00
fd917724d8
io: add option to retry first ident request
...
Change-Id: I524c15387eaf2461e3dfe690250a55f058467b0b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31291
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2023-06-20 08:02:02 +02:00
bf43858031
GUI bugfix: use isChecked instead of checkState in BoolInput
...
Change-Id: I4896df13c117c6eeaaaaba80ca3da4b1982c3d9b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31346
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 >
2023-06-16 11:09:27 +02:00
f354b19cf0
frappy_psi.sea: fix extra_module_set
...
Change-Id: If5669fdd60c8505a47414f17cfcd8534cdc2abee
2023-06-06 16:50:48 +02:00
f304ac019e
fix cfg files (extra_modules/single_module)
...
Change-Id: I1821e1e0dc960d48a3e343c53195808798b7f969
2023-06-06 16:49:54 +02:00
9a9a22588f
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-06-06 16:46:31 +02:00
3e26dd49d0
jtccr: fix cfg for extra_modules / single_module
2023-06-06 16:45:31 +02:00
5a456a82b0
fix enum when SEA type is text
...
Change-Id: I873045a2dac8771b844431ccda70ce1b8ff1aee5
2023-06-05 13:56:00 +02:00
f6868da3b9
fix systemd bug
...
Change-Id: I8a3f1eddba9525589757d4612a5060267ea0c5db
2023-06-05 13:56:00 +02:00
ee31f8fb45
fix merge_status in HasConvergence
2023-06-05 13:03:38 +02:00
a6a3f80e30
remove sign=-1 from cfg files
2023-06-05 13:02:40 +02:00
ad36ab1067
frappy_psi.thermofisher improvements
...
- merge Loop with Sensor
- make convergence work
Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
2023-06-05 09:50:35 +02:00
f2d795cfba
frappy_psi.convergence: improvments
...
- merge_status
- empty string instead of 'approaching'
- dif <= tol
Change-Id: I6f10875f7ef5d2109c13d7448ede114b8e30d86e
2023-06-05 09:47:08 +02:00
c04337c3a4
frappy.client: missing exception method in dummy logger
...
Change-Id: Ie3a574c3060f2ac6833ff44e8074a19db6ea2f0b
2023-06-05 09:45:04 +02:00
57d5298c92
remove secop-server.spec
...
Change-Id: I8097a2918bc4e786bd270aeb436efebe9a3bd88f
2023-05-31 14:32:04 +02:00
9a6421a54f
up to date with develop/mlz
...
Change-Id: I5ea71bc99a2f0dffc3dbe37e1119eb188ef8a3f0
2023-05-31 14:27:36 +02:00
c5d429346d
update 2023-05-30 from gitmlz
...
Change-Id: I0b1eb2941692fde5c9d98f107fc38315625dcfdb
2023-05-31 14:16:12 +02:00
726665ebd8
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-05-31 08:43:19 +02:00
004533655f
frappy_psi.magfield: bug in progress check
...
must check for self.current (not self.value)
+ fix in mercury: __ramping must be initialized
2023-05-31 08:42:17 +02:00
c4d5d2e284
fix equipment_id in seadesc
...
Change-Id: Iecf5d3ae815373c0535ee9e1c230b2f48554f5b5
2023-05-30 15:12:36 +02:00
75f156beef
improve HasRamp
...
Change-Id: I0ddabb8b2681712637a18c392da5424d30a05b4b
2023-05-26 16:07:07 +02:00
459a80b4d2
add Drivable with alias value and target
...
together wih mixins HasConvergence and HasRamp
Change-Id: Ia36a8b44220e93cfeee98400f4276bfd7e40d82f
2023-05-25 17:54:28 +02:00
bef190b77d
software ramp mixin
...
+ fix frappy.lib.merge_status
Change-Id: I550eaeaab460a0d9ac1b027d59d4223dac4c0663
2023-05-25 17:53:36 +02:00
e4dbb90065
lakshore must not import from frappy_psi.mixins
...
Change-Id: I988bef545f98d5c42d56af3fe4d5aae6dbf19809
2023-05-25 17:52:27 +02:00
0cbaffd4b6
log.exception instead of log.error in callbacks
...
+ inhibit timestamps in future
Change-Id: Idef463558bf24e891573179474ffbebd4e81468f
2023-05-25 16:16:30 +02:00
1de5455ef6
add haakeuro
2023-05-25 09:56:25 +02:00
db94def694
newest version of okasanas drivers
2023-05-17 16:56:49 +02:00
1407514458
phytron
...
better handling of restart status
Change-Id: I28f97b49d39ed7c6b781f0d8edb218e63e1b1fc9
2023-05-16 09:39:20 +02:00
050a2dc8dc
phytron next version
...
with adaption of HasStates
Change-Id: I167ac8031bc5f7120c30031e7cfcb7587b42b61d
2023-05-15 11:12:52 +02:00
df4a37085a
frappy-cli: fix init(*...)
...
Change-Id: Iba8106a779ac399e6d72d247ea93e6c1e8cdbf94
2023-05-15 11:12:31 +02:00
6697462f15
phytron: next fix
...
Change-Id: I72debb43b02f07cf9ff79286293105f052314a35
2023-05-15 09:03:58 +02:00
84d0d44f38
phytron with HasStates
...
test version
Change-Id: Ifbaa35421a64faad32c87bbcf758c236f900cd0b
2023-05-15 08:33:14 +02:00
fa9525fd4c
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2023-05-11 10:42:38 +02:00
087036922a
move more code from bin/frappy-cli to frappy/client/interactive.py
2023-05-11 10:42:10 +02:00
1ce43a567b
fixes in sea cfg files
...
- json_file must be a string, not a list
- rel_path is no longer to be converted to a list
2023-05-10 16:36:32 +02:00
c46947afd4
update phytron driver
...
offset as storage only (after current draft specs)
Change-Id: I1a005f149a8bd562124e2d40e49416957f66e851
2023-05-10 14:32:26 +02:00
3099c813d1
add unit=s to pollinterval
...
Change-Id: I6a28fecd4b0d650042f2f031a1b64b801fc2885e
2023-05-10 14:32:11 +02:00
8039351395
mercury, ips, sea, triton, convergence
...
after gerrit
Change-Id: Iff14047ecc476589aef10c96fae9970133b8bd14
2023-05-09 14:57:34 +02:00
750b5a7794
add empty description to Mod() for Sea classes
...
Change-Id: I3890782b4e08291f73db0bfc4671c6cbc14f05d6
2023-05-09 08:19:03 +02:00
a9fe8577c3
improve mercury driver
...
less fancy but more readable commands
Change-Id: Ifcc6a03199167179d984235c9b1bc7e14c60b51b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31008
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-05 13:30:29 +02:00
74729872a8
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2023-05-05 13:25:10 +02:00
6b78e69dbe
add HasOffset feature
...
+ remove all other unused features
Change-Id: Idff48bdabf51e7fa23547eac761f11320c41861c
2023-05-05 13:23:14 +02:00
3b95013b69
improve and fix errors with parameter limits
...
- in order to work properly, readonly=True in limit parameters
has to be set before creating the write_* method
- more explicit: Use e.g. target_max=Limit()
- fix an error in the loop over the base classes when creating
the check_* method
- more concise error message when a limit is violated
+ fix an error in playground when using persistent parameters
Change-Id: Ibd557b55d6c0d9a2612cda4460b16e3c70e1bc9e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31017
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-05 13:21:37 +02:00
85166344d2
improve interactive client
...
- remove irrelevant traceback on remote errors
- add run() function to execute scripts
- when started with bin/frappy-cli, use separate namespace
Change-Id: Ic808a76fa76ecd8d814d52b15a6d7d2203c6a2f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30957
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-05 13:20:54 +02:00
ca6b7a65c0
improve mercury temperature loop
...
- remove appearance of Done
- add auto flow
- try up to 3 times in 'change' method if read back does not match
Change-Id: I98928307bda87190d34aed663023b157311d4495
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30981
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-05 13:20:38 +02:00
f528cc4808
fixes on HasConvergence and HasOutputModule
...
- HasConvergence must inherit from HasStates
- control_active should have a default
Change-Id: Ic8b430003fdb746bf76782b74fa04e43c700c2e2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31023
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-05 13:18:51 +02:00
3314241631
[WIP] phytron improvements
...
- Limits
- offset
- power cycle behaviour
Change-Id: Id2f717c362cd7e1e37f180c8130b0e086e724389
2023-05-05 13:16:41 +02:00
3fcd72b189
merge manually with mlz repo
...
as of 2023-05-04
Change-Id: I5926617c454844927799e20a489db20d538db100
2023-05-04 16:34:09 +02:00
5bc0b94c6d
fix mb11 slot for updated mercury driver
2023-05-04 15:25:05 +02:00
bbe70fb3cb
add missing files from secop_psi
...
- all of them have to be checked!
Change-Id: I89d55ca683d0b2710222f14c2c3cd42f8fbf3a1f
2023-05-03 11:24:47 +02:00
31be98c62e
MB11: increase persistent_limit to 11.1
...
Change-Id: I6849877212a8fc2ac16ef80d727581ae7f6c5e94
2023-05-02 16:49:35 +02:00
94070121c7
converted smamor
2023-05-02 16:43:09 +02:00
1961f91567
add switching_sensor
2023-05-02 16:39:34 +02:00
e38139089f
add hvolt_long and varioxstick (zebra)
2023-05-02 16:38:27 +02:00
e2c51b3dd1
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-05-02 16:35:50 +02:00
b77c222b72
add setsamp to ma02.config.json
2023-05-02 16:34:23 +02:00
b55af7b20b
add ma7two, oventwo and ovenstick (sans)
2023-05-02 16:32:04 +02:00
72add69b65
add rt and sch (from hrpt)
2023-05-02 16:19:07 +02:00
1a44c2d513
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2023-05-02 16:09:16 +02:00
0fb10a0a10
converted cfg files from camea
2023-05-02 16:07:38 +02:00
748ea1400a
improve interactive client
...
- remove irrelevant traceback on remote errors
- add run() function to execute scripts
- when started with bin/frappy-cli, use separate namespace
Change-Id: Ic808a76fa76ecd8d814d52b15a6d7d2203c6a2f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30957
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-02 15:54:32 +02:00
5784aa0f5d
improve mercury temperature loop
...
- remove appearance of Done
- add auto flow
- try up to 3 times in 'change' method if read back does not match
Change-Id: I98928307bda87190d34aed663023b157311d4495
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30981
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-02 15:54:14 +02:00
6c02f37bbb
issues with StructOf
...
- depending whether client or server side, handling of optional is different
- fix issues when struct is used as keyworded command arguments
Change-Id: I72b347b1a96ee3bce1f67dace4862c313c12c7a9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30972
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-02 15:52:51 +02:00
d6d564f4aa
a playground for debugging drivers
...
playground for trying out drivers by calling methods read_*
and write_* directly without starting a real SECoP server
Change-Id: Ia7d2366920d29794a4eda5d7bfb2b62d4930eb65
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30944
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2023-05-02 15:52:19 +02:00
da15df076a
fetched mlz version
...
- before some chamges in the gerrit pipline
Change-Id: I33eb2d75f83345a7039d0fb709e66defefb1c3e0
2023-05-02 15:25:11 +02:00
9fc6b6c0fd
add ill3 and ori1 stick
2023-05-02 09:31:09 +02:00
b19a8c2e5c
converter for creating python config files
...
+ testmode in server returns errors
+ fix in (old) statemachine
Change-Id: Icdfd6c3d8f70e717fecd61e8a54adad326be6000
2023-01-23 18:00:56 +01:00
68b45978a7
ppms.cfg: add target=0 in mf
...
Change-Id: Ibccf95b54ba93a0b0648c61b7630ae376bf3e70e
2023-01-23 18:00:20 +01:00
7d4dfdebbd
fix bug in k2601b
...
convert returned float (which is integer) to int
Change-Id: I8363f4d5188f2b1be89f1383da20c76522286424
2023-01-23 18:00:20 +01:00
6c325460f7
make doc when .git is not there
...
accept failure of secop.version.get_version()
Change-Id: Ia689bd4f56b848bc354c0d68826a3174f0746a97
2023-01-23 18:00:20 +01:00
c70b61e4e5
relax identification check
...
accept *,SECoP,*
Change-Id: Ieb56e9c57fc5eb18e025fbc2f1d17a9d6e3f0a97
2023-01-23 18:00:20 +01:00
589b857039
add driver for LakeShore 372
...
- including channelswitcher
2022-12-21 11:05:15 +01:00
ad4a6d2e09
improved cyoltd (flame magnet)
...
- use a statemachine
- do more control in frappy, switching from persistent to driven
internally
- a lot of fixes
2022-12-21 11:00:19 +01:00
766f15beee
improvements in magfield
...
- use HasTargetLimits instead of HasLimits
- move ramp_tmo parameter to SompleMagfield
- add last_target method
- fix progress check in SimpleMagfield.ramp_to_target
- better mechanism for setting to persistent mode after restart
- fix switching mode
- fix on_error
- fix condition for shortcut start_field_change -> check_switch_off
- remove direct status updates
- move check for manual switch heater operations to ips_mercury
2022-12-21 10:57:41 +01:00
79b8cd7b2d
fix inheritance of status codes attached to state functions
2022-12-21 10:38:11 +01:00
bd0f3a0b07
fixe in triton and mercury
2022-12-19 16:13:06 +01:00
c4f9f2ef4b
rename action to dil_action
2022-12-19 16:12:06 +01:00
0820d537c3
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-12-19 16:09:40 +01:00
1a6aa893e4
move persistent_field parameter from magnet.py to ips_magnet.py
...
'persistent_field' is in principle the same as 'value'.
however, on IPS it might be different, at least it is a seperate
HW parameter
2022-12-19 16:03:44 +01:00
b10c722ff6
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-12-19 15:13:20 +01:00
b7a1f17e5e
fix new statemachine with ips magfield
...
+ add on_error, on_restart etc. to states.py
+ add n_retry argument to mercury change/multichange
2022-12-19 15:12:00 +01:00
a0d14c30be
attocube: more robust moving
...
- try up to 10 times when end of travel or no more progress
- issue WARN instead of ERROR when moving did not work
2022-12-02 10:37:45 +01:00
e668b6a439
attocube: add offset and change to HasTargetLimits
2022-12-02 09:12:51 +01:00
3483c3374d
allow pollinterval = 0
2022-12-02 09:10:07 +01:00
d71a512454
new features HasTargetLimits and HasSimpleOffset
...
according to standard
2022-12-02 09:07:20 +01:00
b1608c4d7f
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-12-02 09:00:12 +01:00
e4c1f35e4a
add attocube
2022-12-02 08:54:26 +01:00
3ab7eb99ab
add flamemag / flamedil config
2022-11-30 14:14:47 +01:00
ef9d89993c
new specs of HasOffset and target_limits
2022-11-30 14:14:06 +01:00
9887ba0721
improve Attached
...
- allow a default value
- make copy method work properly
2022-11-30 14:11:05 +01:00
397ca350f8
add FLAMP furnace
2022-11-24 07:56:09 +01:00
99220400f1
add FS furnace
2022-11-24 07:55:36 +01:00
4e8636a620
heliox: make temperatures seperate modules
2022-11-24 07:50:24 +01:00
f14bd553a8
disable closed loop on MA10 rotator
2022-11-24 07:49:36 +01:00
2845a82236
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-11-23 22:41:49 +01:00
4f5cc3059e
add FT furnace
2022-11-23 22:41:23 +01:00
d845fedc03
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-11-21 14:38:40 +01:00
1b2e364f70
magfield adapted to new state machine
2022-11-21 14:37:53 +01:00
4405b2b02c
new state machine, HasStates mixin
2022-11-21 14:13:52 +01:00
49b9bfa11d
improvements for triton
...
- set cooldown channel befor setting action
- improve max heater setting
2022-11-15 16:57:52 +01:00
df428f4c0c
check readback and try up to 3 times when it does not match
2022-11-15 16:57:00 +01:00
0c93ca8c75
add comment "do not use mb11stick"
2022-10-18 16:41:04 +02:00
971c1dcfee
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-10-04 15:13:23 +02:00
498dbd4179
sea.py: fix status datatype
...
sea status is a string (not a tuple) and needs therefore
special treatment.
interestingly this bug did not yet appear ...
2022-10-04 15:11:57 +02:00
00b0a54f12
ramp unit must be $/min
2022-09-22 17:12:54 +02:00
48076edd99
improve magfield and ips_mercury
2022-09-22 17:12:30 +02:00
485e81bfb0
[deb] Release v0.13.1
...
Change-Id: Ib038475d75de7b2976bc463423c2493eb531c02a
2022-09-21 16:19:34 +02:00
0df50bb0f9
secop_mlz: minor rework entangle client
...
Change-Id: Ie406b4220c22cdbf302a1fd36f2d7407d81a47fa
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28951
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 >
2022-09-21 16:17:01 +02:00
de5f17695c
make startup faster in case of errors
...
When the io of one SECoP module fails, it takes ages to startup
because each parameter poll takes the time to wait for a timeout.
After the first communication error on an io, no more startup polls
are tried on the modules using this io.
Change-Id: I0d250953dfe91a7d68d2d2b108395cc25d471afe
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28588
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 >
2022-09-21 16:16:48 +02:00
e4aa2149f7
phytron: fix warning on repeated comm. error
...
log only a warning when several retries ware successful
Change-Id: I2f1dfba920b0841914da82229820bcdd4b97c6e9
2022-09-21 11:35:42 +02:00
9f656546df
fix undefined status in softcal
2022-09-20 12:07:11 +02:00
5affb9f31b
fix bug in persistent.py
...
- use dirname instead of basename
2022-09-20 12:07:11 +02:00
5e3bf96df1
rework of uniax
...
- try to deal with anomaly at 17 N
- reduce pid on overshoot
- use new statemachine
2022-09-20 12:07:11 +02:00
07995e2235
fix bug when restarting statemachine
...
fixed bad if clause
+ better debug message on restart/stop
2022-09-20 12:07:10 +02:00
54f091d0fe
disable encoder for ma6 stick motor
2022-09-19 11:38:33 +02:00
14a71427fa
jtccr: fix rel_paths
2022-09-19 11:37:56 +02:00
486be9604e
[WIP] uniax: removed do_ prefix
...
Change-Id: I98d56a8ece681515de8f05767c67686715212c09
2022-09-16 14:57:58 +02:00
a8f1495bc8
[WIP] uniax after changing to StateMachine
...
Change-Id: I0173f8c8eaaeb2526477d05803a615673297667d
2022-09-16 14:53:42 +02:00
3ab9821860
improve formatting of values
...
Change-Id: I4a9290e85ee2071a3f2cfe0d00bc7dc4dcb4caed
2022-09-16 08:06:45 +02:00
0b9e227669
state after discussion with users
...
- cirterium for "no substantial forece change" must be improved
2022-09-16 08:16:15 +02:00
befba09acc
fix main value unit
...
Change-Id: I27186e66bf065e015680a6925c5428714444c25e
2022-09-14 14:54:48 +02:00
554f265eb8
fix main value unit
...
Change-Id: I30c6107fae31b5087bac75d66db6be8dee78a757
2022-09-14 14:53:59 +02:00
4287ec6477
apply main unit also in structured types
...
Change-Id: I5a3efb167f2b460b847d8e7ac75a21848976b5f8
2022-09-14 14:50:39 +02:00
aad1c33742
improvements on interactive client
...
- add selective logging
- fix handling of exceptions
Change-Id: I7e2c2d4ed12302874c3bb2cc7bd707aa8e487341
2022-09-14 13:59:51 +02:00
b0315e133b
rework switch timing
...
- specific things in ips_mercury.py
- general things in magfield.py
Change-Id: I7c2bae815b9a80a17803b44b8941ef3dea3adb60
2022-09-14 13:58:12 +02:00
c3f55435da
add reading of slave currents and voltages
...
with fast polling
2022-09-14 10:59:55 +02:00
12cb0cdade
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-09-12 15:16:57 +02:00
7ed7dd7493
add combined mb11 / mb11 stick
2022-09-12 15:16:26 +02:00
031b30a4aa
heater slots H2 and H3 are exchanged!
2022-09-12 15:15:24 +02:00
3597adf869
fix code for current framwork version
...
- remove _iodev, use HasIo instead of HasIodev
- add earlyInit super call
2022-09-08 14:57:06 +02:00
8bfe969a95
HasIO: attached io must not be mandatory
...
as an uri might be given instead.
2022-09-08 14:55:36 +02:00
5a78a5b258
fix wrong name (uniax.cfg)
...
Change-Id: I7b132aa9474edd93321c74fa9262917d0766879f
2022-09-08 09:26:01 +02:00
298f94e4d5
update code (remove underscore from attached modules)
...
Change-Id: I10bd6bec8f5e9459219f3186fd696e053a264604
2022-09-08 09:22:32 +02:00
0fec736886
update code in several drivers
...
- remove poll arguments
- change from HasIodev to HasIO
Change-Id: I2668f1068c17a50d9aff43b1bb3e4fb03c8d840e
2022-09-08 09:13:03 +02:00
38b3a192ab
fix move_limit in cfg
...
Change-Id: Iea99a39155e6172bcc265c350431a438d20f2fc3
2022-09-08 08:31:38 +02:00
4959619d56
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-09-08 08:27:43 +02:00
6caf4fc993
uniax stick
2022-09-08 08:27:17 +02:00
95eb4e969a
change safe current to 0.3, set offset to 15
2022-09-07 13:14:51 +02:00
ada4c43ebf
change max force to 190 N
2022-09-07 13:14:51 +02:00
9a40d27354
fix bug in ls340res
...
return value must be converted to float
2022-09-07 13:14:51 +02:00
6929422b94
fox update of param2path dict
...
Change-Id: Ie8de3d7f549ba29954058f3d516d1c3965932aa0
2022-08-24 17:02:21 +02:00
2cd66c2e08
sea: allow multiple parameters being updated with one hdb path
2022-08-24 16:57:27 +02:00
268ebbe00e
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-08-23 17:21:21 +02:00
ea960f2250
fix ln2fill enum
2022-08-23 17:21:01 +02:00
9673f7b242
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-08-22 15:56:48 +02:00
292d028fe6
add ill5 p sample stick
2022-08-22 15:55:58 +02:00
aa0c0421c3
add Be-Filter addon for boa
2022-08-19 12:43:36 +02:00
db43a77614
remove some log.debug statements
...
in order to sync with frappy@mlz
Change-Id: Iab89cb313fb6969c91663b8ebc56bdcb96ed2dd1
2022-08-16 17:17:54 +02:00
21bcc7ce98
an enum with value 0 should be interpreted as False
...
for example: bool(Enum(off=0, on=1)('off')) is False
Change-Id: Ieb200b4ecf0eed50b657ecc00f73a69810ad828f
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28586
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 >
2022-08-16 17:16:02 +02:00
7b9c099321
default unit to UTF8
...
Change-Id: Ic958346beb1a3b164c8d7b2826d59cf7e3991e15
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28946
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2022-08-16 17:14:50 +02:00
33a7c56fa2
allow to convert numpy arrays to ArrayOf
...
accept all sequences instead of just tuple / list
+ change Module.announceUpdate to convert value before
comparing with previous one (comparing will not work with numpy arrays)
Change-Id: I5eceef4297607107e2dde688af2833d3651a8775
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28525
Tested-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-08-16 17:14:38 +02:00
ab2fe6200a
reintroduced individual init of generalConfig.defaults
...
revert basically the former change
"init generalConfig.defaults only in secop-server"
The problem of import order when setting generalConfig.defaults
has to be solved by not overriding already existing keys when
setting the default.
Change-Id: I82121e346607dd74146279c4241e13ab63c14096
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28011
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 >
2022-08-16 17:11:56 +02:00
d5d04dc82f
add simple interactive python client
...
- SECoP modules are accessible as objects in the main python module
- parameters are accessed as attributes of these objects
- __repr__ is used for listing all parameters
- __call__ is used for 'change target and wait until no more busy'
typically used from a python interpreter or in a jupyter notebook
Change-Id: Idb55684eeff6d1262e5d1517a3ff934f1c1bf208
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28980
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-08-16 17:08:18 +02:00
f23e42de1f
fix bugs with persistent_limit parameter
...
take into account that reading the switch heater might be delayed
2022-08-16 16:54:30 +02:00
2f6954c4f3
magfield: add persistent_limit parameter
...
- use update_switch_heater instead of write_switch_heater
for detecting switch time
- switch_time split into switch_on_time/switch_off_time
Change-Id: Id90a8b2c2520e24f3ee4a34aee25d41210e5d6d4
2022-08-16 10:05:01 +02:00
b81fc7b122
remove tm from ill5.cfg
...
only one SeaDrivable per sea drivable allowed!
2022-08-15 16:22:02 +02:00
704bba292a
add mb11 stick
2022-08-12 15:13:07 +02:00
f1e642b1b0
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-08-12 15:12:23 +02:00
8e3cdc80e4
improvements in magfiels/ips_mercury
...
- read voltage
- fix a bug with ._init name conflict
2022-08-12 15:10:23 +02:00
3496e391f6
check for last_target in conditions for redo
2022-08-02 11:19:30 +02:00
bb40a0820c
use flag instead tolerance for redo check
...
when target is changed, a flag is set, and
this is used to jump back in the sequence to the right step
for redoing
2022-07-29 15:12:44 +02:00
8f739b11dc
ILL1 .cfg created and ILL1stick
2022-07-06 16:14:16 +02:00
7ef386424c
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-07-06 11:24:56 +02:00
53b3dd2fad
fix stick motor port number on ma02-ts
2022-07-06 11:24:27 +02:00
6554e5de47
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-07-05 11:02:15 +02:00
60ec1edb32
fix He-fill enum
2022-07-05 11:00:35 +02:00
131082313d
added stick-motor addon
2022-07-05 10:57:43 +02:00
f12b0b3da0
add ill5 gas pressure stick
...
not yet tested
2022-07-04 14:23:51 +02:00
5ecd9557a3
add lev to ill5 cfg
2022-07-04 14:23:08 +02:00
3769ddca75
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-06-29 11:51:01 +02:00
a4dec7b832
fix ill5 cfg
2022-06-29 11:49:51 +02:00
390af7eff7
improve general config
...
for easier configuration of multiple servers on the same machine,
FRAPPY_* env. variables are overriding the values from the
general config file
Change-Id: Ifb00dae482dd366bd4b7951c76164af91cad9fc2
2022-06-29 11:42:33 +02:00
f495313018
dil2/3/4: added more temperatures, added dil3
2022-06-28 08:22:13 +02:00
18ded2159c
changed mf from Readable to Drivable
2022-06-28 08:09:00 +02:00
760fc9eb40
added jtccr sea cfg
2022-06-27 11:06:45 +02:00
5d348eb7b1
fix ma6 stick motor port
2022-06-27 11:06:00 +02:00
86767e2fa1
add still and sorb heaters to dil5
2022-06-21 15:32:15 +02:00
8a995aafed
fix issue with non matching persistent field
2022-06-21 15:31:44 +02:00
7379ea91e5
fix issue sending numbers in exp. format
...
numbers must be fixed point, with maximum 8 digits
2022-06-21 15:30:20 +02:00
cf42119f85
fix handling of persistent_field parameter
...
'persistent_field' parameter should be updated as long as the
switch is turning off
Change-Id: I76b592077ceb0a2a20beb8e6390487c620764650
2022-06-17 08:24:38 +02:00
80d9a790ec
fixed proper parameter inheritance
2022-06-15 16:02:38 +02:00
5951312d40
fixes to make pylint happy
...
Change-Id: I95baf4e585603a640d4ec71076a4d509082775ed
2022-06-14 15:24:42 +02:00
778ac17172
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-06-14 15:08:35 +02:00
dfbc1c757a
fixes in mercury an triton
...
- Valve is now a drivable, as it will check success, and retry,
which might take around 1 second
+ some more
2022-06-14 15:07:17 +02:00
54b58f2188
step_size instead of speed_factor
...
no longer need to pre configure a speed_factor,
the proper units of speed and accel are taken from
the hardware
2022-06-14 15:03:53 +02:00
f855b9db40
fixes in convergence and statemachine
...
- set spent_inside to 0 on set_target
- additional debug log messages in statemachine
2022-06-14 14:07:24 +02:00
6fd365197a
sea driver: no events for unexported params
...
Change-Id: Ia4b5f5f742d0240010218ee24dc147bb535c7c64
2022-06-13 14:09:13 +02:00
8b2abf7044
fix iodev to io in ill4stick.cfg
2022-06-10 14:31:44 +02:00
182a8c7e49
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-06-10 13:22:04 +02:00
6da1a89459
add dil4/variox, fix ma10 in cfg
2022-06-10 13:21:20 +02:00
f1d5e82bb4
remove unneccessary fiels in cfg/sea
2022-06-10 13:20:12 +02:00
e6fdd79df4
start SEA server if not running
...
before connecting to SEA
Change-Id: I75c02f25e023e0e1769810a180430efd48b9c550
2022-06-08 16:28:39 +02:00
a35231f5bd
fixes in mb11/dil5
...
- no need fro second slot in TemperatureLoop, PressureLoop
- only ValvePos needs two slots
- added testwise heater to mix chamber
Change-Id: Iac4592d037a5e6a4f586041762992d75cc77e3de
2022-06-07 14:26:30 +02:00
9c7b6aeb94
various fixes on mb11/dil5
2022-06-07 11:45:25 +02:00
68e2e06905
fixes in convergence, mercury, phytron, triton
2022-06-01 09:21:47 +02:00
3563a0db16
fix ill4
2022-05-31 16:44:53 +02:00
4cb0031302
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-05-30 12:10:51 +02:00
4bfb76ca82
IPS mercury
...
+ mb11, dil5, dil2, variox configs
2022-05-30 12:09:57 +02:00
3e6f1bebf7
added features
2022-05-30 12:07:33 +02:00
efca358c72
add adq_mr and iqplot
2022-05-23 15:30:23 -04:00
319f3b4649
upgrade upltrasound to newer version of frappy
2022-05-23 15:25:41 -04:00
7fc030191d
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-05-19 18:10:14 +02:00
3959da6847
stick rotatation is either om or stickrot
2022-05-19 18:10:02 +02:00
39171fe06e
add limits to phytron
...
Change-Id: I431374efab7a858db6a652f78533b13b12ba6d57
2022-05-19 18:05:52 +02:00
0972e8c7e8
add sign to phytron motor
...
+ fixes in ma10 config
2022-05-19 17:58:54 +02:00
7b9d2d1701
allow quiet SEA requests
...
SECoP read -> SEA hval should be quiet on the log file
Change-Id: Ie020b02ef62e5792ca60e08fe72b420a6377efee
2022-05-16 17:04:47 +02:00
f276b973f5
add variox
2022-05-16 15:28:30 +02:00
8739ef04d7
add ori3
2022-05-12 16:39:28 +02:00
aea73d976c
add ori6
2022-05-12 16:23:58 +02:00
4c98a4c706
add sticks and cfg
...
ma02, ma10, ma11, mbe
2022-05-12 16:16:26 +02:00
62146aa477
add heliox stick
2022-05-05 10:31:50 +02:00
2bdfcf10a3
fix triton
...
tested at warm kelvinox triton system
Change-Id: I1c8064c78846db5b077363be3a8ecff5e2766ddb
2022-05-03 16:49:27 +02:00
f9db90d89b
update secop_psi/sea.py
...
fixes after serveral changes in frappy
2022-04-29 16:30:19 +02:00
1ded96abba
fix keithley 2601b after tests
...
- add missing super call in initModule
- change mode before writing levels
- fix MEASURE_DCVOLTS instead of MEASURE_VOLTS
Change-Id: Id93187e082db9868f443d4ef8cbdc85acd11be2b
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28256
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 >
2022-04-29 14:03:04 +02:00
cb170bd73b
allow a configfile path as single argument to secop-server
...
when a full path is given as single argument to secop-server,
the server name has to be sanitized
Change-Id: I1d11f076157548e90877f380f0cab3a6a3f96784
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28232
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-04-29 14:03:04 +02:00
a379805e43
add 'ts' to the ppms simulation
...
+ convert from CRLF to LF
Change-Id: I46fab0c970ccc5e7e704a5dc0ab2cfd51213cd31
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28233
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2022-04-29 14:03:04 +02:00
9ff8c3ba54
add ma10, add stick motors
2022-04-29 11:08:04 +02:00
1d7351ba4f
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-04-29 08:47:39 +02:00
3ac8876b37
cti5, cti7, ma10
...
+ fix .gitignore
2022-04-29 08:47:11 +02:00
9fa5aba052
add dom motor to MA7
...
Change-Id: I32b9ec469e030da90519b0a9e3d38b881e94d59f
2022-04-28 17:21:46 +02:00
bc13a912b4
change descr of ccr3 (ZEBRA)
2022-04-28 16:32:38 +02:00
33ba9ca946
add ccr3
...
+ add missing ma6.config.json
2022-04-28 16:31:20 +02:00
7d43f1cd58
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-04-28 13:43:46 +02:00
21a3865c5d
general ini files for main, stick and addons
2022-04-28 13:43:09 +02:00
f1a639bc3c
add secop_psi/triton.py
...
triton dil support
Change-Id: Ifbb0d382adec29b031a1e99c68515f7bb23ead45
2022-04-28 12:56:42 +02:00
98cdbafa7a
fix mercury
...
secop_psi/mercury.py was not merged properly
Change-Id: I638fac70b278aa1ffb1378ad0f97b375a7e40869
2022-04-26 08:51:58 +02:00
6752997048
replace 'iodev' by 'io' in cfg files
2022-04-22 16:45:12 +02:00
026ab3f4b2
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
2022-04-22 16:36:03 +02:00
20ad159722
support for OI mercury series
...
- temperature (incl. heater)
- pressure (incl. control via valve motor)
- LHe and LN2 levels
not yet included: magnet power supply
Change-Id: Id4ee8f9b7ebfa6284e519ba485217f9a19d70d59
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28028
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-04-22 16:35:24 +02:00
7316632fa6
improve poller error handling
...
- repeated errors on poller are only once logged (per poll
function / read_* method)
- during exception handling, silent=True on a SECoP error indicates
that the error is already logged
+ fix the name of HardwareError
+ add test for consistency of SECoPErrors
+ catch socket.timeout in AsynTcp
Change-Id: I9df6c775cc19553b22a4d6e39591092adf7ff9a1
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28139
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 >
2022-04-22 16:35:24 +02:00
2159753398
avoid deadlock in proxy
...
in secop.proxy the callers modules method announceUpdate is
called from an other thread while the accessLock is locked,
creating a deadlock. solve this by creating an other lock
'updateLock' for the update.
+ add status parameter even to non-Readable proxy modules,
in order to indicate a failed connection
+ fix an error in secop_psi/softcal.py
Change-Id: Iae7c6d5a74001150a47aa9dc99209c15d972cd5e
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28130
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 >
2022-04-22 16:35:24 +02:00
8cb3ba7dfc
fix error in secop.logging
...
Implement LogfileHandler.getChild. This is needed to inherit
the configured level from the parent handler.
+ remove redundant assignmet of logfile_handler.max_days
Change-Id: I7277c28221bbb6108d75f2437634e9db9bf6761e
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28140
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 >
2022-04-22 16:35:24 +02:00
b1a24b253a
improved trinamic driver
...
- safe_current: current limit for unlimited move
- move_limit: max. angle to move with high current > safe_current
- direct axis parameter access is not exported by default
- support for home switch
- allow use without encoder
- automatic reset for motors in a configuration, where the motor
current is deliberatly low for a limited torque
- improved error message on driving failures
Change-Id: I25f8516905a2c4c3cda09d091d5a43004ec6dc6f
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28029
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 >
2022-04-22 16:35:24 +02:00
5a553dbdeb
motor valve using trinamic motor
...
This valve needs 8 turns to open. As the encoder forgets
the number if turns on power cycle, a home switch is
mounte, which engages during the last turn when closing.
The final close position is determined by closing the valve
with a defined motor current/torque.
+ fix an issue in StateMachine.start: the first cycle
must be called after the new state is assigned
Change-Id: I34cd05d10d97b043f9e3126310943b74ee727382
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28030
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 >
2022-04-22 16:35:24 +02:00
e9f687e6dd
update phytron driver
...
+ fixes in secop_psi/sea.py (iodev)
2022-04-22 16:25:14 +02:00
1ac2f8557c
fixes in sch5
2022-04-20 15:53:15 +02:00
774f33122a
fixes in secop_psi/sea.py
...
is_running parameter
2022-04-20 15:52:43 +02:00
1da7657483
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2022-04-20 14:52:17 +02:00
ac3bf5b122
add cryosim and magsim cfg
...
Change-Id: I5ad510c2119ec08cbef234b6565dda69aa370436
2022-04-13 10:46:57 +02:00
f6f2dd189b
use a common poller thread for modules sharing io
...
When several poller threads are using the same io, the resposivity
of client requests is reduced, as every thread first finishes
its pending communication requests, before it is the turn of the
request thread. This is solved by using one common poller thread
for all modules sharing the same communicator.
+ fix an issue with overriding a property with a parameter, as
this is the case for pollperiod (cfg was applied to property
instead of overriding parameter)
+ separate setFastPoll arguments into flag and fast interval
+ fix missing announceUpdate call when read function fails
+ fix mechanism for triggering polls after an io connection
reconnected again.
Change-Id: I1115a61fae3de80d18416e61f40b52a0eebb637c
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28021
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-04-08 15:36:23 +02:00
d5924567da
fix statemachine
...
- fix: calling state.start(<new state>) on restart must ensure
that the function <new state> is called before state.start()
returns.
- modify slighly behaviour of cleanup function
Change-Id: I483a3aefa6af4712b3cf13f62c86d4c06edd1d8d
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28020
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 >
2022-04-08 15:36:23 +02:00
9152ea1d26
reintroduced individual init of generalConfig.defaults
...
revert basically the former change
"init generalConfig.defaults only in secop-server"
The problem of import order when setting generalConfig.defaults
has to be solved by not overriding already existing keys when
setting the default.
Change-Id: I82121e346607dd74146279c4241e13ab63c14096
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28011
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 >
2022-04-08 15:36:23 +02:00
a124adab97
avoid race conditions in read_*/write_* methods
...
using one RLock per Module
+ init generalConfig for all tests
Change-Id: I88db6cacdb4aaac2ecd56644ccd6a3e5fd2d1cf2
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28005
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-04-08 15:36:23 +02:00
2e21bcdd0a
HasConvergence mixin
...
the HasConvergence mixin runs a state machine to determine
when the value has reached target from parameters 'tolerance',
'settling_time' or detects convergence failure depending on
the parameter 'timeout'.
Change-Id: Iccc3d43bcf5ab54ae02ce3a81423c2decc1b392d
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27967
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2022-04-08 15:36:23 +02:00
526a182ed7
init generalConfig.defaults only in secop-server
...
generalConfig.defaults must not be set on import, as this
depends on import order
Change-Id: I00395b40b4281ddc044c196713f6512068011380
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27985
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 >
2022-04-08 15:36:23 +02:00
b1ddc01fbb
merge until "support write_ method on readonly param and more"
...
from gerrit
Change-Id: I8d2ad2a381d3a37947d8afc5e17be0428d94df36
2022-03-21 14:00:12 +01:00
7c9296fe2e
even more merges from gerrit
...
Change-Id: I4cfddc8fd4157ceae353789f2f60d834ec05974e
2022-03-08 10:54:04 +01:00
34b93adef0
more merges from gerrit
...
Change-Id: I13441cd8889dd39f74a2dd1a85e75a1b76bb93c8
2022-03-08 10:52:14 +01:00
10018b8cad
some more merges from gerrit
...
- removed files
- modified drivers
- fixed READE.md
Change-Id: I47ae486df4dde3d60cc5e0e328194718dd396d87
2022-03-08 08:54:47 +01:00
57e0a2cc72
add statemachine
...
Change-Id: Icd35d284329a854a9757cb1963a70662b15fb6bb
2022-03-08 08:37:26 +01:00
a2bfe878b6
add handlers
...
Change-Id: Ia0604ea9e4fd7a226cf6eccb326df003f88cc4b0
2022-03-08 08:36:40 +01:00
9320541754
result from merge with gerrit
...
drivers in secop_psi
Change-Id: I7fd8312b11f365b423e66b2417b9e54ec6558a11
2022-03-08 08:35:41 +01:00
bd246c5ca7
result from merge with gerrit
...
secop subdir only
Change-Id: I65ab7049719b374ae3ec0259483e7e7d16aafcd1
2022-03-07 17:49:08 +01:00
dee3514065
Makefile: fix docker image
...
Change-Id: I90a3fe36abbea0501c7e7e27fa33e90bfd4f116d
2022-03-07 11:21:28 +01:00
93c8866f37
fixed README.md
...
Change-Id: I24445416d1195aed50a153f6462b2a168e1be1c4
2022-02-02 11:40:30 +01:00
acb3bdad6a
varios fixes at psi repo, as of 2022-02-01
...
Change-Id: I8cdc849126d52ef0f2f27a0faf661830aac6f874
2022-02-02 09:57:30 +01:00
5e3fb10884
trinamic (psi repo!) as of 2022-02-01
...
Change-Id: I87b94ff0fa7a56abc6eae65fa76539a0c6a8f396
2022-02-02 09:56:44 +01:00
3b25251e10
ppms fixes (psi repo!) as of 2022-02-01
...
Change-Id: I96c81a0772baf5e6038d27d3a40e1163c4669289
2022-02-02 09:56:08 +01:00
903e17a6e5
mercury, as of 2022-02-01
...
Change-Id: Ifdbb2afc827b894874edaec50e82b645023beda9
2022-02-02 09:55:43 +01:00
9109170752
logging as of 2022-02-01
...
Change-Id: I63c681bea9553cd822b214075b163ca6c42fe0cc
2022-02-02 09:54:54 +01:00
05d0cfb193
history, as of 2022-02-01
...
Change-Id: I725a57546df8f7c9e5ffe04eb98872f2a609efe4
2022-02-02 09:52:01 +01:00
8253fe471b
check for missing supercalls to module init methods
...
Change-Id: I8b7fe5cdd2883fd45532a3e8ac2d7b32945b36a3
2021-12-21 09:46:50 +01:00
245f4f48bf
all members optional be default in struct
...
this apllies only to the argument in frappy - in the case
of all members optional, they are put into the description,
not honouring issue 69
Change-Id: I8e9e4d9ef6bd5b9bb2748f3c6116b7094cd9e927
2021-12-21 09:21:00 +01:00
c523e8f84e
[WIP] work on history writer
...
Change-Id: If8c42091c734fb8c7b386c06429f1b21a7e169ec
2021-12-03 16:50:34 +01:00
6e73420d0f
add doc strings to commands missing them
...
Change-Id: Ib0320cc4653ff695a7ee2bad3486eeec5309d3b1
2021-12-03 16:49:48 +01:00
483d4c9d6f
add doc string to Persistent.factory_reset
...
this is mandatory for a Command !
2021-12-03 16:26:07 +01:00
77acda840a
fix tests from mlz repo
...
- fix omit_unchanged
- names too short
+ other pylint complains
Change-Id: I3c277b461fad1a5fdf8e76ff1cc42b8742d1de16
Change-Id: I58fb64f91bcc2efef20df68f5c63a64315413286
2021-11-12 17:16:59 +01:00
1eecc93f71
fix feature for removing commands
...
from a bug introduced in the 'fix parameter inheritance' change
Change-Id: I757c354130077d8838aac864b21b4f81caa9bccf
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27096
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-11-12 17:09:29 +01:00
1d9e07edb4
add more tests and fixes for command inheritance
...
- fix CommandType.__repr__
- secop/modules.py: command properties are allowed to be configured:
- section 2: remove comment and rename
- section 3: all accessible properties should be checked
- command description should be inherited also when taken from docstring
- move test for command inheritance to test_modules.py
- added tests to check for valid properties of commands
Change-Id: I5fd04e03be1faec5e54fed9735620bc5dc0f89c0
2021-11-12 17:07:11 +01:00
9058ef054b
various small changes
...
- set default target unit to '$'
- shorten too verbose error message on client
- add shutdown method to server and dispatcher
Change-Id: Ib3a8b26bc31e988e45a3ff2efd734168d723d794
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27095
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-11-12 17:00:17 +01:00
a7b741eaa4
updates from mlz repo
...
- asynconn: raise * from *
- asynconn: correct handling for timeout in AsynSerial
- add new py35compat
- target unit $
Change-Id: I052185ad3ebb3e3d1e3374f7ece9c7df06223951
2021-11-10 14:37:57 +01:00
41ce909172
update to changes from mlz repo
...
- bug fixes in error.py
- add from * to raise statements
- fix py35 compatibility
- finalize omit_unchanged_within feature
- fix follwup bug (missing Param.override) in proxy.py
Change-Id: I621c01a0d5e1ec6696fb06f39666f3316fb53649
2021-11-10 13:44:14 +01:00
7690481938
secop_psi.softcal: default path for calib
...
Change-Id: I5ad2159587f13e1a0bcb75764397d4c784ed1c87
2021-11-08 14:24:09 +01:00
3d9e9c59d6
fixes in sea
...
- call explicitely __set_name__ on produced parameters
- as Parameters.override has changed, do not use it
2021-11-04 12:56:42 +01:00
7d2eacfe5c
fixes in sim_uniax
2021-11-04 13:01:40 +01:00
ccf38f87d9
remove do_now argument for next_action
2021-11-04 12:58:33 +01:00
b6cadf4a69
add ill4
...
+ fixes in focus-be-filter
2021-11-04 07:51:37 +01:00
1c1911f8a8
adapt uniax simulation to newest uniax version
...
Change-Id: Iad13306edf007ecfa4aebafdfb0bd38fa6be9c6a
2021-10-27 16:35:54 +02:00
99ebb9d110
closed loop force control
2021-10-27 16:36:44 +02:00
e47d07f706
fix set_zero
...
and cosmetic changes
2021-10-27 16:35:57 +02:00
5f034a40f8
new version using actions state machine
...
Change-Id: I3de3ee8077aa11b66a0b15232d8f9313c2ab0226
2021-10-08 13:26:23 +02:00
57082e276f
uniax, version 7.10.2021
...
- driving with a generator
- 3 phases
1) find active range (low current, far movement until force over hysteresis)
2) release force until well below target
3) adjusting using pid_p. (this is in fact an integral factor)
2021-10-08 08:53:22 +02:00
2c6b42f2aa
merged after getting from uniax
...
Change-Id: I1049ac1a22fd3013c360dba4eda9e53784ac36a5
2021-10-06 14:26:05 +02:00
762913012b
uniax.Uniax: fixed tolerance
...
Change-Id: I201c54715ef7f70a164f0f72116c5a8e737c128f
2021-10-06 14:19:20 +02:00
f491e53f8a
fix uniax cfg typo
2021-10-06 14:12:56 +02:00
92a812f92f
update uniax.cfg for current box
2021-10-06 14:11:40 +02:00
c0fbbdb419
remove whitespace
...
Change-Id: Ibe7acffe1dcdcd4932fa4275d14e8b9b87573537
2021-10-06 14:02:55 +02:00
29226a1062
uniax: added force control as seperate module
...
Change-Id: I8b14fc90f5885834e342f6bc5e5dd0ea711b27ea
2021-10-06 13:33:34 +02:00
70b9c88f82
revert signature of Accessibles.copy() method
...
no more kwds arguments, method 'merge' should be used
Change-Id: I7028d9df8b69c018dcdc0c55d3ae0f71e24ee15b
2021-10-06 13:31:21 +02:00
0d3df7be92
sameside approaching
...
Change-Id: I8b73d0ae0475bc727b49edd6f245c2204c51695b
2021-10-06 09:08:29 +02:00
5b7f4604ad
more precise wording, typos
...
Change-Id: I6ca052fa512b5864b1ce29a22808a432c6f527db
2021-10-06 09:07:55 +02:00
09056ea87e
set unit together with datatype
...
Change-Id: I412471880e71792160ee56a79375dc62dd4aaafc
2021-10-06 09:07:09 +02:00
21dfcbd290
allow interval in SimDrivable to be customized
...
Change-Id: Id59d263e5f54fda9388dcdaa34a3ce83b6d4a339
2021-10-06 08:46:04 +02:00
84e55d9c8d
move markdown from requirements.txt to requirements-dev.txt
...
Change-Id: I07d700c7ac30900e4166611d0b17f80dff8d6f83
2021-10-06 08:41:53 +02:00
cbb005d942
show traceback of first error instead of last one
...
Change-Id: Iee418dcfb1d81a16112eed57b03c86242c2128b4
2021-10-06 08:34:56 +02:00
929f55055e
fix property inheritance
...
Change-Id: If01b98fc38c730e73799b43c78838afee6cf6058
2021-10-06 08:33:52 +02:00
e38cd11bfe
fix parameter inheritance using MRO
...
+ no update on unhchanged values within 1 sec
Change-Id: I3e3d50bb5541e8d4da2badc3133d243dd0a3b892
2021-10-06 08:32:47 +02:00
544e42033d
fix merge errors
2021-09-21 16:58:29 +02:00
8bbf65f6e8
Merge branch 'uniax' into wip
...
Conflicts:
cfg/uniax.cfg
secop/core.py
secop_psi/trinamic.py
2021-09-21 16:52:15 +02:00
e98f81a7c9
reduce communication traffic
...
- expermental change: no updates of unchanged values within 1 sec
- reduce fast_pollfactor in trinamic
- improve stop behaviour of dpm.DPM
2021-09-21 16:40:54 +02:00
8f1375aa31
added/modified new drivers
...
mercury, phytron, cryotel
Change-Id: I2288dd39ec4eb3dd2a11ecd5acb4ca7fd704e017
2021-08-09 15:42:36 +02:00
584a293643
fix secop.io imports
...
Change-Id: I8abe4836312cdd2d17847ca0a117dceebaaac235
2021-07-27 09:19:28 +02:00
73e06c590b
add Phytron driver
...
+ updates of cfg files
Change-Id: Ief24ee681423e18cae0fca29fe41419018d394dd
2021-07-27 08:16:36 +02:00
4f6cb8755e
additional fixes in secop.io
...
Change-Id: Ifdda637183de2b878317c477215f5874d088a668
2021-07-27 08:14:01 +02:00
a037accbb8
backport fixes from MLZ repo
...
- unification of secop.stringio/bytesio to secop.io
- persistent parameters
Change-Id: I76307cccc5191ac8cbb5cfec6fb7450fcf6945f1
2021-07-27 08:11:51 +02:00
2ff3a17427
fix simulation
...
Change-Id: Iaa05d3a7a78b6000ab3c372074bf4053dd74aadb
2021-07-06 16:25:35 +02:00
495709b670
allow partial describe
...
in addition to the SECoP standard
Change-Id: If756e8d9d6a67d3194abc0fe2436cf7124713536
2021-07-06 16:24:44 +02:00
d9cc85c1df
fix issues raising pylint warnings
...
+ small bug fixes
Change-Id: Ib63bf13ad06446d3ec3b8cd0b16f9426cef9e3f4
2021-07-06 16:23:06 +02:00
b30bd308a9
fixes for uniax device
2021-06-11 16:45:45 +02:00
039ece9549
allow to remove accessibles
...
removing an inherited command or parameter can now be indicated
with an attribute set to None
Change-Id: I9645c58e2589c878b62dcebe7a80f479a2b65339
2021-06-08 16:17:23 +02:00
6c4bb78f97
minor fixes
...
Change-Id: I41aa50b1742fb0e24ff5a34d6d9ba98a6b4c4905
2021-06-08 15:32:12 +02:00
b226f2c7c0
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:32:12 +02:00
3687ed85e5
first tries with uniax stick
...
Change-Id: I70da38aff091f7fc64f409485db335cde07163c9
2021-06-08 15:32:12 +02:00
7ff88cf819
fix issues with sea is_running
2021-06-08 14:59:45 +02:00
25b8780b11
persistent module fixed
2021-06-08 14:59:20 +02:00
246ab99e12
experimental persistent mixin
...
- still contains changes in mouduls/params ...
2021-06-08 14:59:20 +02:00
229604439b
remove debug print statement
2021-06-08 14:59:20 +02:00
114af36ac6
first tries with uniax stick
2021-06-08 14:59:20 +02:00
ca6aebd290
added trinamic.cfg
2021-06-08 14:58:20 +02:00
49ad153605
trinamic driver and bytesio module
...
Change-Id: Id634e7514fecab6fd6bc3edf81e25ad41c2bb12f
2021-06-08 14:58:19 +02:00
c6157049d7
fix issue with a module based on a SEA subobject
...
Change-Id: I15102ef0e17cd4414e8699e2967292b3853d2ac0
2021-06-08 14:58:19 +02:00
3977fad3f3
correct to readonly=False for target parameter
2021-06-08 11:59:02 +02:00
eaac83e4d5
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
2021-06-08 11:07:31 +02:00
1619e042e9
added fftf furnace and smamor
2021-06-08 11:06:39 +02:00
8d6ba91a5e
changes defaults in ls370sim
...
Change-Id: I6388358c42a4b115fc5aec4df0d4588457140744
2021-06-04 12:26:58 +02:00
21c49df1a2
fixes on secop gui
...
- do not display a dialog when a command returns None
- apply fmtstr, if available
Change-Id: I74da3e86e4eae9000608581e0a0f6e8c72cef715
2021-06-04 12:26:34 +02:00
a771259ecf
more fixes to SeaWritable
...
+ fix mbe.cfg
2021-05-20 17:57:41 +02:00
c779d49548
fix: handle non Readable SeaModules correctly
2021-05-19 18:10:48 +02:00
5f65b6b4ce
handle non Readable SeaModules correctly
...
Change-Id: I5fa0a52926af3bb386c18de49fef9b1caba92e79
2021-05-19 17:54:36 +02:00
70c3f5f37f
created SeaConfigCreator
...
running frappy with 'seadesc' cfg does the same as previously
starting 'sea' cfg and performing seaconn:_describe automatically
create mbe.cfg
2021-05-19 17:41:18 +02:00
3e599a24d7
fixed sea.cfg to be general
2021-04-29 10:58:15 +02:00
e638661edc
if sea cfg not found, take from FRAPPY_SEA_DIR
2021-04-29 10:55:52 +02:00
772f45a241
add cfg/deleop directory
...
Change-Id: Ia9f15af8bb68a8306a9d966ef2b217d587f0ab28
2021-04-28 16:37:30 +02:00
e589ed1063
treat raised error message in modules.py correctly when arg is not a list
...
Change-Id: I4082a65849c71b3f212f2c8c345a6881f972d107
2021-04-28 12:01:34 +02:00
1a616ecab1
fixed doule entry tcoil1 in ma7.cfg
...
Change-Id: I547e7dcb6cca72004dd3ea8e56a0601e7bf8771a
2021-04-28 09:29:18 +02:00
61aeafdfb6
added cfg files for SINQ Frappy
...
Change-Id: Icb1ea5e2e1f9aedd77a6bac7ed6b14458aea4aa7
2021-04-27 17:54:20 +02:00
c89c982c42
improve comments (poller.py)
2021-04-27 17:15:28 +02:00
acbb17f367
updated README.md
...
the procedure may still need to be discussed
Change-Id: Iddf60ac93309ef2131d55f3858e11d6111a976b4
2021-04-27 17:00:06 +02:00
4bda112bb7
pollOneParam has no return value (avoid pylint complaint)
...
Change-Id: Iab75c970e106617ffd4e612d358da491312ca54b
2021-04-27 16:51:37 +02:00
8029443f1b
fix issue with a module based on a SEA subobject
...
Change-Id: I15102ef0e17cd4414e8699e2967292b3853d2ac0
2021-04-27 16:07:49 +02:00
57e9367e40
improve more errors during startup
...
errors from a module a combined with a header and intended
details
Change-Id: I4be7bc2f8455fb0e3c9346f3bb23ac88e7589604
2021-04-27 16:04:24 +02:00
de7a91d727
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 16:04:15 +02:00
078ac7c600
fix 'ts' value
2021-04-26 16:04:33 +02:00
8b2c5f6144
fix issues with sea is_running
2021-04-26 11:56:48 +02:00
99eb600d90
fix handling of unknown sea messages
2021-04-23 09:21:47 +02:00