linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,380 Commits 18 Branches 1 Tag
d73b8bc7745425ecca50e77659a566b79ca12d7c
Commit Graph

1380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Zolliker
d73b8bc774 frappy_psi.sea: bugfix: revert change of updateEvent to udpateItem 
revert some of change 34813
SeaClient is based on ProxyClient, not SecopClient
-> updateItem is not defined there

Change-Id: Ib3049038481917ec7a11b9fb2d285cedff5febbb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34873
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-05-27 15:56:51 +02:00
Markus Zolliker
ceb6e487a8 frappy_psi.sea: bugfix: revert change of updateEvent to udpateItem 
revert some of change 34813
SeaClient is based on ProxyClient, not SecopClient
-> updateItem is not defined there

Change-Id: Ib3049038481917ec7a11b9fb2d285cedff5febbb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34873
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-05-27 15:56:51 +02:00
Markus Zolliker
eb08e31b62 frappy.client.SecopClient: fix setParameterFromString 
add missing datatype.export_value

Change-Id: I824d922fdda1ab548e4625982e1485ec4b758cb9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36172
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>
 2025-05-27 15:56:51 +02:00
Markus Zolliker
4b88ece3be frappy_psi.sea: bugfix: revert change of updateEvent to udpateItem 
revert some of change 34813
SeaClient is based on ProxyClient, not SecopClient
-> updateItem is not defined there

Change-Id: Ib3049038481917ec7a11b9fb2d285cedff5febbb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34873
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-05-27 15:56:51 +02:00
Markus Zolliker
c22e41c8e2 frappy_psi.sea: bugfix: revert change of updateEvent to udpateItem 
revert some of change 34813
SeaClient is based on ProxyClient, not SecopClient
-> updateItem is not defined there

Change-Id: Ib3049038481917ec7a11b9fb2d285cedff5febbb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34873
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-05-27 15:56:51 +02:00
Markus Zolliker
701d1f1735 frappy.client.SecopClient: fix setParameterFromString 
add missing datatype.export_value

Change-Id: I824d922fdda1ab548e4625982e1485ec4b758cb9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36172
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>
 2025-05-27 15:56:51 +02:00
Markus Zolliker
400b314fc7 frappy_psi.sea: bugfix: revert change of updateEvent to udpateItem 
revert some of change 34813
SeaClient is based on ProxyClient, not SecopClient
-> updateItem is not defined there

Change-Id: Ib3049038481917ec7a11b9fb2d285cedff5febbb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34873
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-05-27 15:56:51 +02:00
Markus Zolliker
ce3b3ddfd6 frappy-psi.logo: fix IO.communicate reply 2025-05-27 15:51:17 +02:00
Markus Zolliker
3045a11ff9 dil5/logo: fix valve addresses 2025-05-27 15:51:17 +02:00
Markus Zolliker
de773f084d frappy_psi.logo: add comLog 
+ fix bug in frappy_psi/dilution_statemachine.py
 2025-05-27 15:51:17 +02:00
Markus Zolliker
564bea63e4 DIL5: improve states in the state machine 2025-05-27 15:51:17 +02:00
Markus Zolliker
bd8a417112 use longer, unique uris for USB serial connections 2025-05-27 15:51:17 +02:00
Markus Zolliker
e6263cbcd0 frappy_psi.pfeiffer_new: calculate crc in PfeifferProtocol 2025-05-27 15:51:17 +02:00
sans
7c06bbeec2 haake: fix haake2 and add pumprunning 2025-05-27 14:48:16 +02:00
Markus Zolliker
d6947711c6 increase omit_unchanged_within to 60 s 
+ fix a bug reading this from general config file
 2025-05-22 08:35:59 +02:00
Markus Zolliker
0938049e89 [WIP] further work on CCU4 
Change-Id: Icdd6e253f276a5ade44fb4103306160fc348556b
 2025-05-22 08:35:59 +02:00
Markus Zolliker
0053b7847c frappy.client.interactive: no pathlib needed here 
allow the argument of the run function to be a simple string

Change-Id: I1d5de3802b6adc22a01a262d4cb017bf7dd084c5
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36343
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-05-22 08:35:59 +02:00
Markus Zolliker
5c93953183 config: add 'include' and 'override' 
including a config file and overriding some properties is
helpful when we do not want to modify the original config
but run it with sligthly different properties.

this involves some redesign a.o.:
- modules are collected in a dict instead of a list in
  order for 'override' to find the related module
- checking for duplicates happens in the Collector

Do not warn when included file does not end with '_cfg.py',
as this may be intentional, in case a file is only used
via 'include' and not as cfg file alone.

+ remove unused method Collector.append
+ complain with specific error message when Node is not given

Change-Id: Id568f04d6d84622ef2547412eb6f288fcebf986f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36357
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2025-05-22 08:35:59 +02:00
Jenkins system
b60ad38fd0 [deb] Release v0.20.5 2025-05-22 08:35:59 +02:00
Markus Zolliker
7b0356b4ee frappy.client.interactive: improve updates while driving 
- instead to show first current 'value' and 'status', and then
  the changes, show changes only - this way updates appear
  in the expected order
- for this SecopClient.register_callback needs a 'callimmediately'
  argument

Change-Id: I3e91c2c15bca7fee2eba3b1bf1dd27313da3ae29
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36291
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-05-22 08:35:59 +02:00
Markus Zolliker
7faf328141 client: add SecopClient.execCommandFromString 
analogous to setParameterFromString
to be used in simple clients where values of structured datatypes
are just python literals

Change-Id: I4936a3c5c0cac45bd7e875c938ce2700b4f4a979
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36262
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-05-22 08:35:59 +02:00
Markus Zolliker
d07406c2fd frappy_psi/ls370res: various bug fixes 
- avoid some error messages on disabled channels
- update value of channel switcher properly
- fix bug in set_param method

Change-Id: I16f5cf2d7abce0c0fae17266f0c8e949e8416b7a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36263
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-05-22 08:35:59 +02:00
Markus Zolliker
dbd4667c87 frappy.client.SecopClient: fix setParameterFromString 
add missing datatype.export_value

Change-Id: I824d922fdda1ab548e4625982e1485ec4b758cb9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36172
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>
 2025-05-22 08:35:59 +02:00
Konstantin Kholostov
6e7514b718 installer: add recipe to build macOS app bundle 
Change-Id: Ief4401626db293fecc37f1d1ec72cf295b55fccf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36060
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2025-05-22 08:35:59 +02:00
Andrea Plank
c49f15ce64 Add DIL5 Statemachine and LOGO 2025-05-22 08:35:59 +02:00
Markus Zolliker
3bae6f8d7f [WIP] fi furnace improvements 
- still under development

Change-Id: I5fc22f041fb136b549016f510f06ea703122bee5
 2025-05-22 08:35:59 +02:00
Markus Zolliker
e46291eef6 change prot for dummy to 5000 
Change-Id: If35bbe6783fe133c0c6c87f402ba70aec00fa964
 2025-05-22 08:35:59 +02:00
Markus Zolliker
af746f59bb dummy_cfg.py: add test case with big enum 
+ fix undefined value in frappy_psi.ls370res.Switcher

Change-Id: I59f2814b945533c487999f9af638e0fb2040e862
 2025-05-22 08:35:59 +02:00
Markus Zolliker
a2a4d4332a more demo test cases 
- added them to cfg/dummy_cfg.py
+ treat enum correctly in SecopClient.setParameterFromString

Change-Id: Ia5b2d8d3a21c3215cb93d90975086eb9995b1543
 2025-05-22 08:35:59 +02:00
Markus Zolliker
aff6a2381a logdif.py: use single key to stop or continue 
Change-Id: I53b3254074eda7491dd16bbc39168960b0980e39
 2025-05-22 08:35:59 +02:00
Markus Zolliker
eb8eee02d1 follow-up change to 35931: make Proxy a Module 
Proxy must be a class, because of the new check for configured
'cls' inheriting from Module. Use Proxy.__new__ to implement
this.

Change-Id: I4bb036afc2ce92187a9049dff0a6f22b20c3a260
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36104
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2025-05-22 08:35:59 +02:00
Markus Zolliker
9a818ab40b revert 'change to new visibility spec' 
nicos is not yet ready for this

Change-Id: Ibfbb7e32e06a6e0616ded8342bc5844fd531944f
 2025-05-22 08:35:59 +02:00
PREVENT_DEFAULT
dc87a50c76 add sr830 addons cfg 2025-05-22 08:35:59 +02:00
Markus Zolliker
5974d759b0 frappy_psi.parmod: extract a tuple element as own moudle 
Change-Id: I8d904ed21f8a5c16ae71daf30c9a1ea42876b451
 2025-05-22 08:35:59 +02:00
Markus Zolliker
396bbe9982 frappy_psi.ionopimax.AnalogInput: set value range on datainfo 
Change-Id: I1e3da956e829f69a0af416b7beadb81bd6bc0cb1
 2025-05-22 08:35:59 +02:00
Markus Zolliker
ae98fa174c frappy_psi.furnace: special classes PTXgauge and PRtransmitter 
move some initialization from cfg file to source code
+ make 'out of calibrated range' and 'sensor break' more generic

Change-Id: I3e92100fdb9c983f82665de9d8e063609cd7af5a
 2025-05-22 08:35:59 +02:00
Markus Zolliker
83ad7b1638 change to new visibility spec 
+ visibiliy is no longer an EnumType, as this would break
  the specs

Change-Id: I1197c82f31c33c210fdcda0b49a0c38027880d77
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36088
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-05-22 08:35:59 +02:00
Markus Zolliker
257b24a480 make sure unexported modules are initialized 
take the opportunity for a small redesign:

- create a new method build_descriptive_data which
  calls secnode.get_modules also on unexported modules.

+ cache descriptive data

Change-Id: I4a0b8ac96108463dc0c800bb11a404206c26b092
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/36089
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>
 2025-05-22 08:35:59 +02:00
Markus Zolliker
29f0e18c1e better dummy server for seaweb tests 
- new config file dummy
- frappy_demo.test.Temp now creates WARN and ERROR status
  and may be disabled

Change-Id: Ibc7bb565f18c2c12cdc2a77bea1ee1bf1cc8bd41
 2025-05-22 08:35:59 +02:00
Markus Zolliker
144083a54a ionopimax: bug fixes 2025-05-22 08:35:59 +02:00
Markus Zolliker
748a39f932 frappy_psi.ionopimax redesign 
Change-Id: I46b62522c24ad9f0352ba7a784d39ffd1cb79ef3
 2025-05-22 08:35:59 +02:00
Markus Zolliker
8cea974f49 [WIP] further fixes for linse-fi 2025-05-22 08:35:59 +02:00
Markus Zolliker
5768f096a5 frappy-play: fix import order 2025-05-22 08:35:59 +02:00
Markus Zolliker
94859fe2ef [WIP] fixes for linse-fi 
Change-Id: Iac28e9654a764331cd903896879834cd6127a919
 2025-05-22 08:35:59 +02:00
Markus Zolliker
fcf867675e fixes on picontrol and tdkpower 
Change-Id: Ia891e7df23d8408b857dac795ed0ad9973ccf993
 2025-05-22 08:35:59 +02:00
LIN SE rpi1
09dce1aabd fixes on small furnace 2025-05-22 08:35:59 +02:00
Markus Zolliker
eefe271cba add fi_cfg.py (ILL furnace) 
Change-Id: I8720dbeb3f29b07eaeae59558c58b2fa87096dc9
 2025-05-22 08:35:59 +02:00
Markus Zolliker
c42dd41dec WIP frappy_psi/tdkpower 
Change-Id: I80d1beb0fae2a1cdd2aa5fabc5d31c651c2cb3e7
 2025-05-22 08:35:59 +02:00
Markus Zolliker
c545e36633 peus-plot: optionally give x-range as 2nd argument 
Change-Id: I445ef00487fc34343f5a0333643f61753a1c4948
 2025-05-22 08:35:59 +02:00
Markus Zolliker
ef985f094c ultrasound.ControlRoi: fix control mechanism 
Change-Id: I9d01de260d3bdc63eb1004ba4f714d38d1c0508c
 2025-05-22 08:35:59 +02:00