297 Commits

Author SHA1 Message Date
ce3b3ddfd6 frappy-psi.logo: fix IO.communicate reply 2025-05-27 15:51:17 +02:00
3045a11ff9 dil5/logo: fix valve addresses 2025-05-27 15:51:17 +02:00
bd8a417112 use longer, unique uris for USB serial connections 2025-05-27 15:51:17 +02:00
7c06bbeec2 haake: fix haake2 and add pumprunning 2025-05-27 14:48:16 +02:00
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
0938049e89 [WIP] further work on CCU4
Change-Id: Icdd6e253f276a5ade44fb4103306160fc348556b
2025-05-22 08:35:59 +02:00
c49f15ce64 Add DIL5 Statemachine and LOGO 2025-05-22 08:35:59 +02:00
3bae6f8d7f [WIP] fi furnace improvements
- still under development

Change-Id: I5fc22f041fb136b549016f510f06ea703122bee5
2025-05-22 08:35:59 +02:00
e46291eef6 change prot for dummy to 5000
Change-Id: If35bbe6783fe133c0c6c87f402ba70aec00fa964
2025-05-22 08:35:59 +02:00
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
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
PREVENT_DEFAULT
dc87a50c76 add sr830 addons cfg 2025-05-22 08:35:59 +02:00
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
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
8cea974f49 [WIP] further fixes for linse-fi 2025-05-22 08:35:59 +02:00
94859fe2ef [WIP] fixes for linse-fi
Change-Id: Iac28e9654a764331cd903896879834cd6127a919
2025-05-22 08:35:59 +02:00
fcf867675e fixes on picontrol and tdkpower
Change-Id: Ia891e7df23d8408b857dac795ed0ad9973ccf993
2025-05-22 08:35:59 +02:00
09dce1aabd fixes on small furnace 2025-05-22 08:35:59 +02:00
eefe271cba add fi_cfg.py (ILL furnace)
Change-Id: I8720dbeb3f29b07eaeae59558c58b2fa87096dc9
2025-05-22 08:35:59 +02:00
l_samenv
55d399241c cfg/ls370test update 2025-05-22 08:35:59 +02:00
1febb7bacf [WIP] ccracks / ccu4: split ccu() into nv(), he() and flow()
Change-Id: I346330a5f350bf03eefe86c8e890b59afaaaa231
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
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
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
79dbfdfad0 further work on needle valve, pump and lakeshore 2025-05-22 08:35:59 +02:00
8d62375483 frappy_psi.ultrasound: add input_delay and other improvments
Change-Id: I6cb5690d82d96d6775fcb649fc633c4039932463
2025-05-22 08:35:59 +02:00
l_samenv
76e46f7c84 merged changes for lakeshore and ccu4 2025-05-22 08:35:59 +02:00
ee29bea821 add units to jtccr 2025-05-21 11:57:18 +02:00
4fc4cd3687 haake: make 2 versions depending on extra T sensor 2025-05-19 11:34:12 +02:00
1145493e81 varioxb: uncomment motor setup with triple quote 2025-05-08 09:07:31 +02:00
3f7ef438e3 ori4: revert removing '.' from rel_path
not sure if this is correct
2025-05-08 09:03:45 +02:00
90dc5359b9 dil2/3/4: make He3 pump visible 2025-05-08 08:59:46 +02:00
b1de9218bd take over changes from ultrasound PC
Change-Id: I1eae717a5963e618d87ddf52db991d428a046d24
2025-02-13 09:39:49 +01:00
l_samenv
5636a76152 adapt temperature and temperature_regulation importance
- temperature_regulation on VTI should have higher importance (27)
  than temperature on sample stick, when Drivable (25)
2025-02-13 09:39:11 +01:00
l_samenv
745cc69e9e sea cfg: set visibility of calibration points to expert 2025-02-13 09:39:11 +01:00
l_samenv
b4c0a827f0 ma7: use new config type with sea_path and frappy.sea.LscDrivable 2025-02-13 09:39:11 +01:00
l_samenv
8dcf6ca658 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)
2025-02-13 09:39:11 +01:00
0b06acf304 add ori2 2024-11-26 15:16:53 +01:00
dmc
cc90291358 varioxb: fix config, om not yet available 2024-11-26 13:59:05 +01:00
03b4604643 fix description of ts in ma11stick 2024-11-15 09:14:54 +01:00
l_samenv
ada696e72b add peltier cfg 2024-11-14 16:09:31 +01:00
l_samenv
1d70a90270 add addon ah2500sea 2024-11-14 16:04:55 +01:00
l_samenv
20da7592da add PE stick
example of how to do a software calibration on a mercury channel
with hardcoded wrong calib curve
2024-11-14 15:40:46 +01:00
l_samenv
e750e69045 ma11stick/ovenstick: fix double meaning entry 2024-11-14 15:39:43 +01:00
l_samenv
11a65b485b fix ah2700 / ah2550 settings 2024-11-14 15:39:43 +01:00
Alexander Zaft
c2a3821000 sim: make amagnet sim cfg startable again
Change-Id: I1e7b7dd6e4069c616f49edbe4e223f501a000398
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34844
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>
2024-10-23 09:27:35 +02:00
Alexander Zaft
1cebf3998f simulation: fix extra_params default, ccidu1 cfg
Change-Id: I80672f1c070054871708961bc6641457f8e409ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34843
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2024-10-23 09:26:48 +02:00
dmc
03867c1f43 ma6stick: fix for ts (heater not working?) 2024-10-22 10:58:02 +02:00
16abfdc65e fix ma7_samplehead_cfg and thermalcond_cfg 2024-10-22 10:52:23 +02:00
601ad9d301 eurotherm_cfg: fix meaning 2024-10-22 09:28:39 +02:00