8dc2677158
MA7 Stick heater loop fixed
2025-07-07 16:26:39 +02:00
cf151dd324
fs (and other furnaces): fixes on interlock
...
- try to make interlock right
- merge status where ever possbile
2025-07-07 16:05:27 +02:00
1e73440149
AnalogInput: write mode only when needed
...
- this does probably influence the input channel for some short time
+ issue a warning when read value is -1. this may indicate an error!
2025-07-07 16:03:45 +02:00
03dfb6aeb0
Merge branch 'wip' of https://gitea.psi.ch/linse/frappy into wip
2025-07-04 14:33:03 +02:00
73c620797c
frappy.ctrlby: improvements
...
Change-Id: I7ea2d0398fa3b32002dbaa066e3923fef72535fa
2025-07-02 15:41:41 +02:00
abf5f21e16
SEA ah2700.addon: fix name 'bufperiod'
2025-07-02 11:27:55 +02:00
c7496fa21f
SEA dil*.stick: add off=0 to the list of heater ranges
2025-07-02 11:27:25 +02:00
926dcd09e2
frappy_psi.sea: use secnode.name to determine the service
...
this fix is only needed in case uri is not given
2025-07-02 11:25:12 +02:00
83f40f0c33
fs: make 'sensor broken' message active
...
- for this use frappy_psi.PRtransmitter instead
of ionopimax.CurrentInput
- add disabled_checks parameter
2025-06-30 18:09:07 +02:00
57b245c5ac
fs: make 'sensor broken' message active
...
- for this use frappy_psi.PRtransmitter instead
of ionopimax.CurrentInput
- add disabled_checks parameter
2025-06-30 18:01:55 +02:00
a5a4212691
DIL5: changed interface on ITC and LS372
2025-06-27 16:10:33 +02:00
a3d0549199
fs: improve and fix implementation
...
+ introduce WrapControlledBy and fix HasControlledBy
this in a new module before mercury/triton have been fixed
2025-06-27 14:48:02 +02:00
8385461163
softcal: change name of param 'calib' to 'calcurve'
...
make it more consistent
Change-Id: I8d8f62190c07179de25c893bfcdf11300010cd78
2025-06-24 10:50:29 +02:00
1a70099974
sea: fix problem with LscDrivable.read_value
2025-06-17 10:23:43 +02:00
c2b97a8dac
SEA: change all sea min config to LscDrivable
...
Change-Id: If9828186377c78d8534d798cc59ce3a676f66222
2025-06-10 17:01:12 +02:00
27778e80f5
SEA: let tt.value be the sample temperature when dblctrl is on
...
for this tt has to be a frappy_psi.sea.LscDrivable
Change-Id: Ic452b39237d31a7765bc8b2f22a12c2f454fe7da
2025-06-10 16:50:49 +02:00
6c74c957a8
MB11: fix sample stick cfg
...
- remove mb11std
2025-06-10 12:31:35 +02:00
eecbe9ca6b
MA6: fix bad sea config
2025-06-06 12:17:05 +02:00
385480a8cc
SEA: again fixing paramFilter
2025-06-06 12:15:48 +02:00
c92cb22d97
dil5: updated cfg to match class
2025-06-05 17:49:02 +02:00
d85d80ba36
dil5: working alfa version
...
Change-Id: Ib6bf2234633cc760fc771a3f5c0beb4cb63a0f6d
2025-06-05 17:48:15 +02:00
2b7ee0a72c
addressed parameters
...
- generic method to access parameters with just an address
changed to avoid boilerplate code
- it would really be nice to include the generic methods
into Module
Change-Id: I898e5eeb282f03d3177a324fa88813976fb15f3c
2025-06-05 17:48:15 +02:00
97140aa3b4
SEA: do not override write_target method
...
else it will not wait for is_running
+ fix in playground
2025-06-05 11:52:50 +02:00
1ad699fb66
jtccr cfg: missing tolerance and settle (need '.' in rel_paths)
2025-06-05 11:52:50 +02:00
52f90fe5be
frappy_psi.manual_valves: make persistent and clean up
...
Change-Id: Ifbdc886f556064745a7aaffbfdc1bad2ad74632e
2025-06-05 10:22:36 +02:00
404b38d91a
frappy.params: fix typo
...
Change-Id: I724615de8d8d6b44bc5aceded85bf40d2a5e96f7
2025-06-05 10:22:07 +02:00
3203c6c9b3
[WIP] clean dil5 configuration
2025-06-05 10:20:54 +02:00
472ae3f04d
[WIP] dil5 improvements
...
Change-Id: I2b439bf5898601e10448511479bc67afa3edb4d3
2025-06-05 10:16:47 +02:00
04f7f6ece5
bin/frappy-cli: fix hosts variable
2025-06-05 10:16:42 +02:00
54c9fb9db9
SEA: again a fix - commits before damaged 'mf' of MA10
2025-06-03 11:43:43 +02:00
c0f6569f1b
frappy-cli: connect to servers on localhost by default
...
--scan option: specify where to scan if not on localhost
Change-Id: I51a694eb3cb045e7d18c19a332db8e6ba063009b
2025-06-02 15:24:04 +02:00
745e15c709
SEA: another fix: make sure the value parameter comes first
2025-06-02 11:01:12 +02:00
62adec4874
jtccr: the main subpath in sea is names 'main', not 'tt'
2025-06-02 09:17:48 +02:00
9131bdab51
SEA: fix lost parameter on top level
2025-06-02 09:01:13 +02:00
a0629db53d
SEA: fix missing parameters at top level
2025-05-30 10:45:56 +02:00
415acb42cf
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:54:27 +02:00
ee67a135e9
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:54:27 +02:00
ef826297fd
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:54:27 +02:00
50118e4ead
haake: fix haake2 and add pumprunning
2025-05-27 15:51:54 +02:00
f9880f1473
frappy-psi.logo: fix IO.communicate reply
2025-05-27 15:41:33 +02:00
0dd13d7ef9
dil5/logo: fix valve addresses
2025-05-23 14:54:54 +02:00
6aec38d03e
frappy_psi.logo: add comLog
...
+ fix bug in frappy_psi/dilution_statemachine.py
2025-05-23 10:31:51 +02:00
2238c20a37
DIL5: improve states in the state machine
2025-05-22 15:11:21 +02:00
018ed920b9
use longer, unique uris for USB serial connections
2025-05-22 15:10:38 +02:00
14f61b01db
frappy_psi.pfeiffer_new: calculate crc in PfeifferProtocol
2025-05-22 15:08:41 +02:00
6fed5a3651
increase omit_unchanged_within to 60 s
...
+ fix a bug reading this from general config file
2025-05-22 08:38:51 +02:00
f3c7cdc7c4
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:38:51 +02:00
4f3ebf0aaf
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-22 08:38:51 +02:00
85f14ace40
add units to jtccr
2025-05-22 08:38:51 +02:00
bc1ba4abb9
haake: make 2 versions depending on extra T sensor
2025-05-22 08:38:51 +02:00