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

192 Commits

Author SHA1 Message Date
Markus Zolliker
6343edc3cb 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-12 10:45:04 +02:00
Andrea Plank
f6a5ef8f4d Add DIL5 Statemachine and LOGO 2025-05-09 10:35:11 +02:00
Markus Zolliker
dad9536eb5 [WIP] fi furnace improvements 
- still under development

Change-Id: I5fc22f041fb136b549016f510f06ea703122bee5
 2025-05-08 08:29:45 +02:00
Markus Zolliker
52215f9ec1 dummy_cfg.py: add test case with big enum 
+ fix undefined value in frappy_psi.ls370res.Switcher

Change-Id: I59f2814b945533c487999f9af638e0fb2040e862
 2025-05-01 08:52:30 +02:00
Markus Zolliker
fb4755502b frappy_psi.parmod: extract a tuple element as own moudle 
Change-Id: I8d904ed21f8a5c16ae71daf30c9a1ea42876b451
 2025-04-24 10:48:35 +02:00
Markus Zolliker
3580cb9dc0 frappy_psi.ionopimax.AnalogInput: set value range on datainfo 
Change-Id: I1e3da956e829f69a0af416b7beadb81bd6bc0cb1
 2025-04-23 08:37:55 +02:00
Markus Zolliker
d681507f94 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-04-23 08:28:08 +02:00
Markus Zolliker
809eda314b ionopimax: bug fixes 2025-04-15 10:57:02 +02:00
Markus Zolliker
ca6fd1dd5e frappy_psi.ionopimax redesign 
Change-Id: I46b62522c24ad9f0352ba7a784d39ffd1cb79ef3
 2025-04-15 09:00:30 +02:00
Markus Zolliker
d0c063c60b [WIP] further fixes for linse-fi 2025-04-14 17:26:26 +02:00
Markus Zolliker
7254d7f95c [WIP] fixes for linse-fi 
Change-Id: Iac28e9654a764331cd903896879834cd6127a919
 2025-04-14 11:46:02 +02:00
Markus Zolliker
c368292873 fixes on picontrol and tdkpower 
Change-Id: Ia891e7df23d8408b857dac795ed0ad9973ccf993
 2025-04-08 17:15:17 +02:00
LIN SE rpi1
6a2aece383 fixes on small furnace 2025-04-08 17:12:44 +02:00
Markus Zolliker
42e40db14b WIP frappy_psi/tdkpower 
Change-Id: I80d1beb0fae2a1cdd2aa5fabc5d31c651c2cb3e7
 2025-04-08 08:32:26 +02:00
Markus Zolliker
343ce90321 peus-plot: optionally give x-range as 2nd argument 
Change-Id: I445ef00487fc34343f5a0333643f61753a1c4948
 2025-04-02 14:56:47 +02:00
Markus Zolliker
75783b211a ultrasound.ControlRoi: fix control mechanism 
Change-Id: I9d01de260d3bdc63eb1004ba4f714d38d1c0508c
 2025-04-02 14:56:47 +02:00
Markus Zolliker
a76425cb2e ultrasound.PE: fix control loop 
Change-Id: I2b2bdf4ad48887ae256a68119f53e6a38048ce1e
 2025-04-01 09:54:18 +02:00
Markus Zolliker
d231e9ce06 [WIP] ccracks / ccu4: split ccu() into nv(), he() and flow() 
Change-Id: I346330a5f350bf03eefe86c8e890b59afaaaa231
 2025-03-31 17:30:29 +02:00
Markus Zolliker
44750572d9 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2025-03-31 17:26:02 +02:00
Markus Zolliker
e0ef6047e2 ultrasound.PulseEcho: fix issue with roi intervals 
now it should be time +- 0.5 * size
 2025-03-31 17:25:53 +02:00
Markus Zolliker
3048b8cb7d frappy_psi.sensirion: fix a typo 
Change-Id: I259151b7a1b908c8289ecb88d2d3d4e6d9e45c12
 2025-03-28 16:30:10 +01:00
Markus Zolliker
0ef484e082 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-03-28 14:27:06 +01:00
Markus Zolliker
8560384529 ls370res: do not raise in read_rdgrng error when channel is disabled 
Change-Id: I565e5cd74cf7f12bfd5eea9e8867117154461017
 2025-03-28 14:27:06 +01:00
Ultrasound PC
d9f340dce6 ultrasound: change control roi0 to a Readable (2) 
+ remove cfg/PEUS.py
+ fix equipment_id of PEUS
+ add header to frappy_psi.iqplot
 2025-03-26 16:45:53 +01:00
Ultrasound PC
1325c8924d ultrasound: change control roi0 to a Readable 
+ remove cfg/PEUS.py
+ fix equipment_id of PEUS
 2025-03-26 16:37:15 +01:00
Ultrasound PC
f8e3bd9ad2 improve ultrasound plot clients 
- make plot window not to raise to the front on replot
- chmod +x
 2025-03-26 16:18:54 +01:00
Markus Zolliker
6f547f0781 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-03-26 15:31:46 +01:00
l_samenv
322cd39e0a 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-03-26 10:51:16 +01:00
l_samenv
41b51b35fd further work on needle valve, pump and lakeshore 2025-03-19 16:38:21 +01:00
Markus Zolliker
5d175b89ca frappy_psi.ultrasound: add input_delay and other improvments 
Change-Id: I6cb5690d82d96d6775fcb649fc633c4039932463
 2025-03-19 15:29:17 +01:00
Markus Zolliker
f8c52af3ac frappy_psi.ultrasound: after rework (still wip) 
Change-Id: I200cbeca2dd0f030a01a78ba4d38c342c3c8c8e3
 2025-03-17 09:37:13 +01:00
l_samenv
7e2ccd214e frappy_psi.drums: changes after test 
when trying with Marcel, we needed these fixes
 2025-03-14 09:05:09 +01:00
l_samenv
8c2588a5ed merged changes for lakeshore and ccu4 2025-03-07 07:37:11 +01:00
Markus Zolliker
2e99e45aea WIP new version of ultrasound 
Change-Id: Iadb83396a64e277f6f0a37f7a96d92105648c4fe
 2025-01-28 09:40:36 +01:00
Markus Zolliker
a25a368491 take over changes from ultrasound PC 
Change-Id: I1eae717a5963e618d87ddf52db991d428a046d24
 2025-01-09 11:23:12 +01:00
Markus Zolliker
4397d8db1a WIP: old oxford devices (ILM, IPS, IGH...) 
Change-Id: I4ca0dc6149d257818d300db4d886a1e33e8210be
 2025-01-09 10:09:33 +01:00
Markus Zolliker
e60ac5e655 move start_ramp_to_target to SimpleMagfiield 
Change-Id: Iab3fe8738c560bf5ac2f11a4a34428a8ffd6a7c2
 2024-12-20 15:49:33 +01:00
Markus Zolliker
0b5b40cfba frappy_psi.ccu4: some smaller updates 
Change-Id: I128ac57aad951fd8ad3bdf663c69c85644063645
 2024-12-18 15:40:05 +01:00
Markus Zolliker
1ae19d03b3 frappy_psi.sea: fix case when bool is implemented as text 
introduce SeaBool for this

Change-Id: I9c6b6ee7d33f11b173d612efc044fce8a563f626
 2024-12-10 16:29:07 +01:00
Markus Zolliker
6cbb3a094b frappy_psi.pulse: fix fatal errors 
even when a module is work in progress, it should not raise
an error on import

Change-Id: I2f91301ba2b0c574ea344c36a74da0f893aa326d
 2024-12-06 11:58:45 +01:00
Markus Zolliker
654a472a7e frappy_psi.sea: more improvements 
- add sea_path property
- add LscDrivable (config of these modules is easier to understand)

Change-Id: I616dc94de6e784f6d8cfcf080d9a8408cbf73d93
 2024-12-03 15:12:02 +01:00
l_samenv
ddc72d0ea7 sea: fix parameter name mapping 
- rel_path = ['tm', '.', 'set'] should mean:

'tm': tm parameters first, with /<obj?/tm as main value
'.': then all parameters directly at top level, except 'set'
'set': all parameters  below 'set'
driving happens at object level

- better name mangling (the 1st appearance of the same shortname
  is kept short)
 2024-11-28 18:06:14 +01:00
Markus Zolliker
49bf0d21a9 frappy_psi.bkpower: improve doc 
Change-Id: I0736d1d8a40b0140bfdbf5aca189b8ddc5b22973
 2024-11-26 13:39:34 +01:00
Markus Zolliker
142add9109 add sim-server again based on socketserver 
- fix ls370test config file
+ fix issues with frappy_psi.ls370res
+ add frappy_psi.ls370sim

Change-Id: Ie61e3ea01c4b9c7c1286426504e50acf9413a8ba
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34957
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-11-19 14:03:28 +01:00
Jens Krüger
5deaf4cfd9 PSI: Fix import error on ThermoFisher module 
Change-Id: I691d8f5057fdb19ba14c109399417a7ee9962637
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34954
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-11-15 10:39:47 +01:00
dmc
edf5a5568b frappy_psi.sea: fix buf, revert change of updateEvent to udpateItem 
this is not possible in ProxyClient
 2024-10-24 13:29:26 +02:00
sans
4892c2fd8f frappy_psi/parmod: fix Driv 
registering updates should be done in initModules
 2024-10-22 09:28:39 +02:00
Markus Zolliker
73a54dfc44 frappy_psi.sea: avoid error on import 
the previous code raised an error when generalConfig.init() was
not called before importing. defer evaluation of seaconfdir to
the time it is used

+ use updateItem instead of updateEvent to avoid pylint complaint

Change-Id: I0da0891a8d4091102d2a149705f5546e2f6fd187
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34813
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>
 2024-10-17 08:07:11 +02:00
Alexander Zaft
f36af47b98 psi: change open calls in sea 
Change-Id: I4fe235027df4ea935d84e29895eb280f620afbdf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34665
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-10-17 08:07:11 +02:00
Alexander Zaft
13db0d6bc6 generalConfig, config: use pathlib 
- switch to pathlib
- represent multiple confdirs as list of Paths internally, not string
  with pathsep

Change-Id: I1418e561641e27cd904af0762be056cd66ee1919
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34464
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>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-10-17 08:07:11 +02:00