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
cf50a372b3
varioxb: uncomment motor setup with triple quote
2025-05-22 08:38:51 +02:00
67ea5340ee
ori4: revert removing '.' from rel_path
...
not sure if this is correct
2025-05-22 08:38:51 +02:00
7d6ac4d742
dil2/3/4: make He3 pump visible
2025-05-22 08:38:51 +02:00
a76e529a82
frappy_psi.phytron: improve clear_errors message
2025-05-22 08:38:51 +02:00
7dfe2925aa
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
a6c86a5fe7
[WIP] further work on CCU4
...
Change-Id: Icdd6e253f276a5ade44fb4103306160fc348556b
2025-05-16 16:20:59 +02:00
d3280474c3
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-16 15:43:00 +02:00
7cf32c4e7c
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-16 15:43:00 +02:00
Jenkins system
48b79af96a
[deb] Release v0.20.5
2025-05-16 15:43:00 +02:00
b1c920819e
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-12 10:48:14 +02:00
8f2973c39d
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-12 10:46:39 +02:00
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
bd00758460
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-12 10:44:47 +02:00
