3843302034
jtccr: the main subpath in sea is names 'main', not 'tt'
2025-05-30 10:55:59 +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
Konstantin Kholostov
d2cce8f21c
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-12 10:41:59 +02:00
f6a5ef8f4d
Add DIL5 Statemachine and LOGO
2025-05-09 10:35:11 +02:00
dad9536eb5
[WIP] fi furnace improvements
...
- still under development
Change-Id: I5fc22f041fb136b549016f510f06ea703122bee5
2025-05-08 08:29:45 +02:00
ccc66468d4
change prot for dummy to 5000
...
Change-Id: If35bbe6783fe133c0c6c87f402ba70aec00fa964
2025-05-01 11:43:49 +02:00
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
58549065fb
more demo test cases
...
- added them to cfg/dummy_cfg.py
+ treat enum correctly in SecopClient.setParameterFromString
Change-Id: Ia5b2d8d3a21c3215cb93d90975086eb9995b1543
2025-04-25 15:38:16 +02:00
0230641b1d
logdif.py: use single key to stop or continue
...
Change-Id: I53b3254074eda7491dd16bbc39168960b0980e39
2025-04-24 11:24:46 +02:00
b264455ad3
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-04-24 11:14:35 +02:00
07c5b32c5f
revert 'change to new visibility spec'
...
nicos is not yet ready for this
Change-Id: Ibfbb7e32e06a6e0616ded8342bc5844fd531944f
2025-04-24 11:09:26 +02:00
PREVENT_DEFAULT
80cb3f08d7
add sr830 addons cfg
2025-04-24 10:50:09 +02:00
fb4755502b
frappy_psi.parmod: extract a tuple element as own moudle
...
Change-Id: I8d904ed21f8a5c16ae71daf30c9a1ea42876b451
2025-04-24 10:48:35 +02:00
3580cb9dc0
frappy_psi.ionopimax.AnalogInput: set value range on datainfo
...
Change-Id: I1e3da956e829f69a0af416b7beadb81bd6bc0cb1
2025-04-23 08:37:55 +02:00
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
e0bd84cc3b
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-04-23 08:20:54 +02:00
9545cb4188
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-04-23 08:20:54 +02:00
1fead8b2c6
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-04-22 18:06:23 +02:00
809eda314b
ionopimax: bug fixes
2025-04-15 10:57:02 +02:00
ca6fd1dd5e
frappy_psi.ionopimax redesign
...
Change-Id: I46b62522c24ad9f0352ba7a784d39ffd1cb79ef3
2025-04-15 09:00:30 +02:00
d0c063c60b
[WIP] further fixes for linse-fi
2025-04-14 17:26:26 +02:00
7a59cf4956
frappy-play: fix import order
2025-04-14 17:20:12 +02:00
