linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
952 Commits 18 Branches 1 Tag
6ac3938b78bc630744f7721597485156736da70c
Commit Graph

952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Zolliker
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
Markus Zolliker
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
l_samenv
6c5dddc449 ma7: sea confg: make ta/tb visible 2023-07-10 10:55:43 +02:00
focus
78fa49ef74 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-07-07 15:46:05 +02:00
Markus Zolliker
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
Markus Zolliker
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
zebra
f80c793cd9 consmetic changes to ma6_sample_heat_cfg.py 2023-07-06 14:49:06 +02:00
zebra
519e9e2ed7 MA6: set om.encoder_mode to 'NO' 2023-07-06 14:48:09 +02:00
sans
14036160f7 add special configurations m6/ma7 sampleheat 2023-07-06 13:06:06 +02:00
sans
131dc60807 MA7/MA11: make ts drivable 2023-07-06 13:04:36 +02:00
sans
49722a858f update haake + eurotherm cfg 2023-07-06 13:04:11 +02:00
sans
c61b674382 disable encoder for MA11 stick rotation 2023-07-06 12:57:07 +02:00
focus
091543be56 add FW (old power rack, via SEA) 2023-07-06 12:53:19 +02:00
Markus Zolliker
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
Markus Zolliker
975593dd6b update to gerrit version 
Change-Id: Ifdaa28dd961a529cd9197c4c3639744f108b0a6a
 2023-07-05 17:33:05 +02:00
Alexander Zaft
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
Markus Zolliker
28b19dbf57 frappy_psi.thermofisher: add version through gerrit 
Change-Id: I4b89d6ec803ad64c41720bc62493d2e4027df50e
 2023-07-05 17:14:07 +02:00
Markus Zolliker
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
Markus Zolliker
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
Alexander Zaft
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
Markus Zolliker
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
eiger
19f965bced Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-07-03 17:51:43 +02:00
eiger
3e4ea2515e add ma15 cfg 2023-07-03 17:51:28 +02:00
camea
714c820115 fixes in ori3 and dil5 config 2023-07-03 17:49:06 +02:00
Markus Zolliker
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
l_samenv
d7a1604bd5 frappy_psi.sea: auto connect 
on both .ssynio and /syncio try to reconnect after failure
 2023-06-26 14:45:53 +02:00
Markus Zolliker
b92095974b camea filter addon 
Change-Id: I1d80aa3bfc4e441ad8a69930b81d6cc25cee9511
 2023-06-20 11:05:15 +02:00
Alexander Zaft
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
Alexander Zaft
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
Markus Zolliker
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
Markus Zolliker
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
Markus Zolliker
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
Markus Zolliker
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
Markus Zolliker
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
Markus Zolliker
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
Alexander Zaft
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
Alexander Zaft
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
Markus Zolliker
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
Markus Zolliker
f354b19cf0 frappy_psi.sea: fix extra_module_set 
Change-Id: If5669fdd60c8505a47414f17cfcd8534cdc2abee
 2023-06-06 16:50:48 +02:00
Markus Zolliker
f304ac019e fix cfg files (extra_modules/single_module) 
Change-Id: I1821e1e0dc960d48a3e343c53195808798b7f969
 2023-06-06 16:49:54 +02:00
zebra
9a9a22588f Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-06-06 16:46:31 +02:00
zebra
3e26dd49d0 jtccr: fix cfg for extra_modules / single_module 2023-06-06 16:45:31 +02:00
Markus Zolliker
5a456a82b0 fix enum when SEA type is text 
Change-Id: I873045a2dac8771b844431ccda70ce1b8ff1aee5
 2023-06-05 13:56:00 +02:00
Markus Zolliker
f6868da3b9 fix systemd bug 
Change-Id: I8a3f1eddba9525589757d4612a5060267ea0c5db
 2023-06-05 13:56:00 +02:00
zebra
ee31f8fb45 fix merge_status in HasConvergence 2023-06-05 13:03:38 +02:00
zebra
a6a3f80e30 remove sign=-1 from cfg files 2023-06-05 13:02:40 +02:00
Markus Zolliker
ad36ab1067 frappy_psi.thermofisher improvements 
- merge Loop with Sensor
- make convergence work

Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
 2023-06-05 09:50:35 +02:00
Markus Zolliker
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
Markus Zolliker
c04337c3a4 frappy.client: missing exception method in dummy logger 
Change-Id: Ie3a574c3060f2ac6833ff44e8074a19db6ea2f0b
 2023-06-05 09:45:04 +02:00
Markus Zolliker
57d5298c92 remove secop-server.spec 
Change-Id: I8097a2918bc4e786bd270aeb436efebe9a3bd88f
 2023-05-31 14:32:04 +02:00