linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,360 Commits 20 Branches 1 Tag
7faf328141fbd31058fd9657bc34bd1c429ffe32
Commit Graph

1360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
l_samenv
55d399241c cfg/ls370test update 2025-05-22 08:35:59 +02:00
Markus Zolliker
aea56bb16a improve error messages on module creation 
- add name when target and value datatype are incompatible
- check that module class inherits from Module

Change-Id: I4edbdff1c250b64b74b1adf7287f9659dff69b26
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35931
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
3b8f3586cf fix overriding Parameter with value 
a property declared in a base class may be overriden
with a parameter in a subclass. this is already allowed.
if then, in the subsubclass it is overridden by a bare value,
it fails.

Patchset 1: add a test for this
Patchset 4: add the fix

Change-Id: Ia5a26076a9ee98439932643a03878342d56f8396
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35932
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
56bee015b3 ultrasound.PE: fix control loop 
Change-Id: I2b2bdf4ad48887ae256a68119f53e6a38048ce1e
 2025-05-22 08:35:59 +02:00
Markus Zolliker
1febb7bacf [WIP] ccracks / ccu4: split ccu() into nv(), he() and flow() 
Change-Id: I346330a5f350bf03eefe86c8e890b59afaaaa231
 2025-05-22 08:35:59 +02:00
Markus Zolliker
df4dec6db5 frappy_psi.sensirion: fix a typo 
Change-Id: I259151b7a1b908c8289ecb88d2d3d4e6d9e45c12
 2025-05-22 08:35:59 +02:00
Markus Zolliker
7feee607e0 ultrasound.PulseEcho: fix issue with roi intervals 
now it should be time +- 0.5 * size
 2025-05-22 08:35:59 +02:00
Markus Zolliker
7c938a3bb1 frappy_psi/adq_mr (ultrasound): exit on reboot error message 
otherwise the error message is confusing
+ remove CR from line endings in adq_mr.py

Change-Id: Ia465a26803a92677383969ff620ef35e58f1a5ec
 2025-05-22 08:35:59 +02:00
Markus Zolliker
904dd96f95 ls370res: do not raise in read_rdgrng error when channel is disabled 
Change-Id: I565e5cd74cf7f12bfd5eea9e8867117154461017
 2025-05-22 08:35:59 +02:00
l_samenv
04fd8743a2 ah2700: make loss its own module 2025-05-22 08:35:59 +02:00
Ultrasound PC
b59a98e4dc bin/us-plot: fix usage message 2025-05-22 08:35:59 +02:00
Ultrasound PC
285c5c330f ultrasound: change control roi0 to a Readable (2) 
+ remove cfg/PEUS.py
+ fix equipment_id of PEUS
+ add header to frappy_psi.iqplot
 2025-05-22 08:35:59 +02:00
Ultrasound PC
e3e27881d3 ultrasound: change control roi0 to a Readable 
+ remove cfg/PEUS.py
+ fix equipment_id of PEUS
 2025-05-22 08:35:59 +02:00
Ultrasound PC
d26434f797 improve ultrasound plot clients 
- make plot window not to raise to the front on replot
- chmod +x
 2025-05-22 08:35:59 +02:00
Markus Zolliker
c3b6aca7bc ultrasound: reworked after tests 
- new classes in frappy_psi/ultrasound.py and frappy_psi/adq.mr.py
- add signal plottter
- move clients to bin/ directory

Change-Id: I8db8e5ebc082c346278f09e0e54504e070655f14
 2025-05-22 08:35:59 +02:00
l_samenv
71372a450b gas10k / mercury.HeaterUpdate: switch off loop on startup 
the class frappy_psi.mercury.HeaterUpdate is used for the output
of a soft pid loop. set target to 0 to switch off the loop
on startup.
 2025-05-22 08:35:59 +02:00
l_samenv
79dbfdfad0 further work on needle valve, pump and lakeshore 2025-05-22 08:35:59 +02:00
Markus Zolliker
5c7fe37807 change again how to exit logdif.py 
Change-Id: I442ca8c2ee7ca25ff98a0e84df2688a55a0dcec9
 2025-05-22 08:35:59 +02:00
Markus Zolliker
e75b8b0b10 stop poller threads on shutdown: cosmetics 
cosmetics after gerrit

Change-Id: I4d982f83e3fe5a8c8c821ac718e51b9a58de2a62
 2025-05-22 08:35:59 +02:00
Markus Zolliker
8d62375483 frappy_psi.ultrasound: add input_delay and other improvments 
Change-Id: I6cb5690d82d96d6775fcb649fc633c4039932463
 2025-05-22 08:35:59 +02:00