Commit Graph

1482 Commits

Author SHA1 Message Date
495ad01ff6 changes for leiden dil
- fixes on frappy_psiahcapbridge
- fixes on cfg files
- add cp1000 sea cfg files
2025-11-17 16:01:51 +01:00
e786c5ec77 frappy_psi.dilhtr: add Ctrlby wrapper
+ minor fix in tcs.py
2025-11-17 15:57:41 +01:00
a7b3f23bef frappy_psi.bridge: minor fixes
TODO: rename the file
2025-11-17 15:52:28 +01:00
151627b4f4 frappy.io: add readline method
For devices sending messages asynchronously, a simple
readline method is added. Waiting for characters is not
blocking writeline - only the actual reading is using
a lock.
This needs also some rework of frappy.lib.asynconn.
2025-11-17 15:48:45 +01:00
ee26c72ed4 add missing property check
check also values of properties with mandatory=False

Change-Id: I346691a7260a4d85b89c9620c097180da4e9d657
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37777
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2025-11-13 17:30:08 +01:00
9fe040e9d3 improve error handling during polls
improve the mechanism which avoids duplicated error messages
in the log file:

- extend to errors in doPoll
- trigger error messages every day, so that they appear in every
  logfile

+ add missing space in some error message

Change-Id: Icfaa06b43ee53f477483bab1f84def832fd0b977
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37432
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2025-11-13 17:29:58 +01:00
943995b1d7 improve error handling on startup
- configuration errors on startup are no longer collected in the
  'errors' attribute, but logged immediately and counted in a new
  'logError' method.
- generalConfig may be configured to raise the errors immediately
  instead
- Raise immediately on unhandled errors. Some of them were catched
  before which may lead to strange follow up errors.
- do not start poller thread, when the error count is non-zero
- as before, simple connection failures are not preventing startup,
  but now more severe errors (bad uri) will stop the server

Change-Id: I4f84ee8e86cf2925108c0fe92eaab796bb731091
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37776
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2025-11-13 17:29:41 +01:00
8291976c5d frappy.modulebase: remove unneeded while loop
Change-Id: I76cf2d5323187972a1c8849f6b8dc98f99f21f90
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37699
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>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2025-11-13 15:38:33 +01:00
Georg Brandl
2ec2954159 datatypes: make length checks more consistent
Change-Id: If5a5422675571506085c73ff2051ba06f4fb37b2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37844
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2025-11-13 15:35:39 +01:00
Georg Brandl
7769a5daa6 do not put entire blob value into error message, it might be megabytes
Change-Id: Ib94701022ea864b4d77d2ac632a8b6d74e8b2e16
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37842
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2025-11-13 15:30:35 +01:00
Georg Brandl
a31e5a5009 remove passive aggressiveness from error messages
Change-Id: I6a25703c65c11c1b57e2cad409b0da0bba724b5e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37841
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2025-11-13 15:30:17 +01:00
Georg Brandl
cf220382b9 datatypes: do not arbitrarily restrict maxlen of arrays/blobs to 2**16
Change-Id: Ic03ff05240c7caa22ae5adf555f871d09612eecd
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37837
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2025-11-13 15:30:17 +01:00
Georg Brandl
66f0e64b2e client: increase read buffer size
Receiving large replies with 8kb buffer size is painfully slow.

Change-Id: Ife4a439d01153c60e8fd96d2c7f2874918fb4012
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37838
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
2025-11-13 15:30:17 +01:00
6e10382d98 io: add reconnect command
sometimes reconnecting helps to heal a broken connection

Change-Id: I368ecb549ca346d7db3484f6a8be0a3a9a86aff1
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37433
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
2025-11-13 15:29:17 +01:00
Alexander Zaft
6600ec63fd module: apply datatype first
if the default value is given before the datatype, the module cannot be
created. Also fixes the remaining errors in issue 4913.

Fixes: 4913
Change-Id: I613576388bc3b9e7a5cdc7aa4d5ea73e549ae167
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37182
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>
2025-11-13 15:29:11 +01:00
Alexander Zaft
a62d85dc47 demo: add docstring to stop method of sampletemp
Change-Id: Ic575189eaf828d082a7ac382ad38141458c31522
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/37183
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2025-11-13 15:29:05 +01:00
ef9b257a54 add config file to test function evaluator 2025-11-12 17:25:17 +01:00
af28f33018 frappy_psi.softcal: add function evaluator 2025-11-12 17:24:47 +01:00
a8b8fa1cc4 frappy_demo.test: add simple writable 2025-11-12 17:23:59 +01:00
17511b8bf2 frappy/lib: add math parser to evaluate a string function 2025-11-12 17:22:38 +01:00
308283412e frappy_psi.nanov: minor fixes
Change-Id: I0c6f1f09358155f49d4dedfe0c254dbe6b514b36
2025-11-05 16:37:42 +01:00
ebfb8a005d simplify errors on startup
Change-Id: I2b12abf15487000992e019e12002303036766d52
2025-11-05 16:23:46 +01:00
03c2f6eb98 frappy_psi.nanov: 'initial' version
- nneds some minor rework
2025-11-05 16:20:03 +01:00
e68ee356df frappy_psi.tcs: minor fixes 2025-11-05 15:53:45 +01:00
21c20c966c frappy_psi: add hcp 2025-11-05 15:53:45 +01:00
l_samenv
183f6dcec2 frappy_psi.muwaba: add meaning and units to cfg 2025-11-04 14:18:47 +01:00
71629c1d3a improvements when testing leiden
- triple current source
- software loop
2025-10-30 13:45:29 +01:00
b45635e4f8 make controlled_by configuration work properly
- secnode.py: initialize all modules before creating description
- fixes in ctrlby.py
2025-10-30 13:43:20 +01:00
2a4a37ed2f fixes for sea versions of ah2550 and ah2700 2025-10-30 13:43:20 +01:00
03ae83dbbc frappy_psi.ah2700: fixes 2025-10-30 13:43:20 +01:00
Alexander Zaft
07377c8bf5 core: Add Acquisition Interface
+ Adds first implementation for the Acquisition interface, split into
  Controller and Channel Modules
+ frappy_demo: adds an example simulation
+ new property AttachedDict for a collection of attached modules
+ move Attach and AttachDict to a new file frappy/attached.py
+ interface_classes creation changed. includes now also Acquisition

Change-Id: I198a96065a65bb28f73e468ce0465fca2d8734d7
2025-10-30 10:21:19 +01:00
84ee2dd508 specify interface_classes property explicitly on SECoP base classes
The mechanism to calculate the interface_classes automatically
gets more complicated whith the introduction if acquisition
classes. Instead of making the mechanism more complex its simpler
to give them explictly on the classes which correspond to the
predefined SECoP interface classes.

Change-Id: I9be7d9e54e3603b979ca2a823ec47b2075937ece
2025-10-30 10:21:05 +01:00
174da915d2 allow to remove a property defined in a base class
the same mechanism works already for parameters

Change-Id: I19da668ded9697b0f51069af9ddd752091abd0fc
2025-10-30 10:20:21 +01:00
24153d2584 datatypes: split base classes for internal and SECoP datatypes
Simple datatypes used only in properties like ValueType of NoneOr
do not need a couple of methods. Splitting the base class avoids
warnings about unimlemented abstract methods.

Change-Id: Ie7d5754c44a5fb5c3ed8569df544495450347082
2025-10-30 10:19:49 +01:00
8575a2f785 improve error messages when attached modules fail on startup
fix to align local frappy branch wip with gerrit repo

Change-Id: Iafbd8c5e4b67209046c252f2cafa69dcb6e2bbcb
2025-10-30 08:01:26 +01:00
51725d6d0d fix bug introduced in commit 7adb4d6f
Change-Id: I00f0101a437ec070a8a3f07b3c0766acde23cad4
2025-10-29 16:58:58 +01:00
08f9416de5 add dilhtr 2025-10-29 16:44:46 +01:00
7adb4d6f04 improve error messages when attached modules fail on startup
Change-Id: Ic1d2d77de2574043749ddbc00def48a6fe77b2bd
2025-10-27 13:14:26 +01:00
ea5fc16a51 frappy_psi.ls370res: add TemperatureChannel
Change-Id: I5a0fd6a1352f08583393862718f59ee5fb6eee32
2025-10-27 13:10:31 +01:00
542079c876 fs: fix renamed relais - must be relay
Change-Id: I13140ea094f58335cb34f4431810ae642b74e87a
2025-10-27 13:09:39 +01:00
160c3bfaf9 frappy_psi.furnace: small improvments
- got not ail when _interlock is None

Change-Id: Ic56bf7b7beeabc39bb8ced3388c7d0f14845463a
2025-10-27 11:59:42 +01:00
576723c650 frappy_psi.picontrol: add PIctrl
Change-Id: If212712b691ecabec1ff70d7040eb4e23924c01e
2025-10-27 11:59:00 +01:00
65e27e0913 add muwaba multiple water bath 2025-10-23 10:49:26 +02:00
82663a142e frapp_psi.iomopinmax: digital output and SimpleVoltageInput
- read back value in DigitalOutput.write_target
- correct scale factor in SimpleVoltageInput
2025-10-23 10:49:26 +02:00
Anik Stark
cda6e08d6c frappy_psi: added channels 2025-10-21 16:27:55 +02:00
Anik Stark
fed7ce2197 frappy_psi: fix write_on in tcs 2025-10-21 16:24:16 +02:00
Anik Stark
cb142c580d frappy_psi: add triple current source (leiden) 2025-10-21 15:41:40 +02:00
53497df207 ma11: fix bug in cfg/sea/ma11.config.json 2025-09-24 10:22:25 +02:00
866cb7569c add mspare stick 2025-08-29 11:26:39 +02:00
e327bb0974 frappy_psi.thermofisher: fix bug reading limits
+ add proper description into cfg file
2025-08-26 11:16:34 +02:00