linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,343 Commits 21 Branches 1 Tag
80cb3f08d7bb3101d2ee5fbf793ffcd6c20c056b
Commit Graph

1343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PREVENT_DEFAULT 80cb3f08d7 add sr830 addons cfg 2025-04-24 10:50:09 +02:00
zolliker fb4755502b frappy_psi.parmod: extract a tuple element as own moudle 
Change-Id: I8d904ed21f8a5c16ae71daf30c9a1ea42876b451
 2025-04-24 10:48:35 +02:00
zolliker 3580cb9dc0 frappy_psi.ionopimax.AnalogInput: set value range on datainfo 
Change-Id: I1e3da956e829f69a0af416b7beadb81bd6bc0cb1
 2025-04-23 08:37:55 +02:00
zolliker 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
zolliker 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
zolliker 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
zolliker 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
zolliker 809eda314b ionopimax: bug fixes 2025-04-15 10:57:02 +02:00
zolliker ca6fd1dd5e frappy_psi.ionopimax redesign 
Change-Id: I46b62522c24ad9f0352ba7a784d39ffd1cb79ef3
 2025-04-15 09:00:30 +02:00
zolliker d0c063c60b [WIP] further fixes for linse-fi 2025-04-14 17:26:26 +02:00
zolliker 7a59cf4956 frappy-play: fix import order 2025-04-14 17:20:12 +02:00
zolliker 7254d7f95c [WIP] fixes for linse-fi 
Change-Id: Iac28e9654a764331cd903896879834cd6127a919
 2025-04-14 11:46:02 +02:00
zolliker c368292873 fixes on picontrol and tdkpower 
Change-Id: Ia891e7df23d8408b857dac795ed0ad9973ccf993
 2025-04-08 17:15:17 +02:00
zolliker 6a2aece383 fixes on small furnace 2025-04-08 17:12:44 +02:00
zolliker ad76a5d752 add fi_cfg.py (ILL furnace) 
Change-Id: I8720dbeb3f29b07eaeae59558c58b2fa87096dc9
 2025-04-08 15:22:35 +02:00
zolliker 42e40db14b WIP frappy_psi/tdkpower 
Change-Id: I80d1beb0fae2a1cdd2aa5fabc5d31c651c2cb3e7
 2025-04-08 08:32:26 +02:00
zolliker 343ce90321 peus-plot: optionally give x-range as 2nd argument 
Change-Id: I445ef00487fc34343f5a0333643f61753a1c4948
 2025-04-02 14:56:47 +02:00
zolliker 75783b211a ultrasound.ControlRoi: fix control mechanism 
Change-Id: I9d01de260d3bdc63eb1004ba4f714d38d1c0508c
 2025-04-02 14:56:47 +02:00
l_samenv 36f2919ec2 cfg/ls370test update 2025-04-01 09:56:39 +02:00
zolliker 7cca3192df improve error messages on module creation 
- add name when target and value datatype are incompatible
- check that module class inherits from Module

Change-Id: I4edbdff1c250b64b74b1adf7287f9659dff69b26
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35931
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-04-01 09:55:44 +02:00
zolliker a632c53405 fix overriding Parameter with value 
a property declared in a base class may be overriden
with a parameter in a subclass. this is already allowed.
if then, in the subsubclass it is overridden by a bare value,
it fails.

Patchset 1: add a test for this
Patchset 4: add the fix

Change-Id: Ia5a26076a9ee98439932643a03878342d56f8396
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35932
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2025-04-01 09:55:44 +02:00
zolliker a76425cb2e ultrasound.PE: fix control loop 
Change-Id: I2b2bdf4ad48887ae256a68119f53e6a38048ce1e
 2025-04-01 09:54:18 +02:00
zolliker d231e9ce06 [WIP] ccracks / ccu4: split ccu() into nv(), he() and flow() 
Change-Id: I346330a5f350bf03eefe86c8e890b59afaaaa231
 2025-03-31 17:30:29 +02:00
zolliker 44750572d9 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2025-03-31 17:26:02 +02:00
zolliker e0ef6047e2 ultrasound.PulseEcho: fix issue with roi intervals 
now it should be time +- 0.5 * size
 2025-03-31 17:25:53 +02:00
zolliker 421eb67b93 Merge branch 'glab_merge_request' into 'wip' 
frappy_psi.sensirion: fix a typo

See merge request samenv/frappy!1
 2025-03-28 16:47:39 +01:00
zolliker 3048b8cb7d frappy_psi.sensirion: fix a typo 
Change-Id: I259151b7a1b908c8289ecb88d2d3d4e6d9e45c12
 2025-03-28 16:30:10 +01:00
zolliker 0ef484e082 frappy_psi/adq_mr (ultrasound): exit on reboot error message 
otherwise the error message is confusing
+ remove CR from line endings in adq_mr.py

Change-Id: Ia465a26803a92677383969ff620ef35e58f1a5ec
 2025-03-28 14:27:06 +01:00
zolliker 8560384529 ls370res: do not raise in read_rdgrng error when channel is disabled 
Change-Id: I565e5cd74cf7f12bfd5eea9e8867117154461017
 2025-03-28 14:27:06 +01:00
l_samenv 16d419c0f3 ah2700: make loss its own module 2025-03-28 13:15:24 +01:00
Ultrasound PC 8c548da2e0 bin/us-plot: fix usage message 2025-03-26 17:02:35 +01:00
Ultrasound PC d9f340dce6 ultrasound: change control roi0 to a Readable (2) 
+ remove cfg/PEUS.py
+ fix equipment_id of PEUS
+ add header to frappy_psi.iqplot
 2025-03-26 16:45:53 +01:00
Ultrasound PC 1325c8924d ultrasound: change control roi0 to a Readable 
+ remove cfg/PEUS.py
+ fix equipment_id of PEUS
 2025-03-26 16:37:15 +01:00
Ultrasound PC f8e3bd9ad2 improve ultrasound plot clients 
- make plot window not to raise to the front on replot
- chmod +x
 2025-03-26 16:18:54 +01:00
zolliker 6f547f0781 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-03-26 15:31:46 +01:00
l_samenv 322cd39e0a gas10k / mercury.HeaterUpdate: switch off loop on startup 
the class frappy_psi.mercury.HeaterUpdate is used for the output
of a soft pid loop. set target to 0 to switch off the loop
on startup.
 2025-03-26 10:51:16 +01:00
l_samenv 41b51b35fd further work on needle valve, pump and lakeshore 2025-03-19 16:38:21 +01:00
zolliker 19571ab83d change again how to exit logdif.py 
Change-Id: I442ca8c2ee7ca25ff98a0e84df2688a55a0dcec9
 2025-03-19 16:34:59 +01:00
zolliker b35c97f311 stop poller threads on shutdown: cosmetics 
cosmetics after gerrit

Change-Id: I4d982f83e3fe5a8c8c821ac718e51b9a58de2a62
 2025-03-19 15:33:25 +01:00
zolliker 5d175b89ca frappy_psi.ultrasound: add input_delay and other improvments 
Change-Id: I6cb5690d82d96d6775fcb649fc633c4039932463
 2025-03-19 15:29:17 +01:00
zolliker f8c52af3ac frappy_psi.ultrasound: after rework (still wip) 
Change-Id: I200cbeca2dd0f030a01a78ba4d38c342c3c8c8e3
 2025-03-17 09:37:13 +01:00
zolliker bf9c946b1d frappy-scan: resolve ip numbers to names 
Change-Id: I07bf7c274aeb52f2aaa58e8aa2f3bcb2788556ee
 2025-03-17 09:36:50 +01:00
zolliker 09e596f847 stop poller threads on shutdown 
make sure module methods are not called after shutdownModule

+ fix: when mod.enablePoll is False, pollInfo is None
  therefore we have to check before access

Change-Id: I83b28607b25996376939175be8abf0c5b27bcac1
 2025-03-17 09:35:57 +01:00
l_samenv 7e2ccd214e frappy_psi.drums: changes after test 
when trying with Marcel, we needed these fixes
 2025-03-14 09:05:09 +01:00
zolliker 907a52ccdb config: Mod() should return config dict 
this helps for coded configuration

Change-Id: I07bdf72f77082f31ee86192faec63df706dcbf56
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35803
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-03-07 10:19:46 +01:00
zolliker 51dba895a5 config: validate value and default of parameters 
The Parameter Properties 'value', 'default' and 'constant'
have ValueType, so they are not checked in the setProperty call.
We have to do this explicitly in Module._add_accessible.

Change-Id: I1e35adf2fe539411b4aebacd813adb07497de95b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35797
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-03-07 10:19:01 +01:00
Georg Brandl d86718b81e remove wrong <weight> from fonts on Qt6 
Change-Id: Ib94b2ed74598b9f54c2361e61bfa940e60bd7c62
 2025-03-07 10:18:51 +01:00
Georg Brandl 42a6bfb5d2 debian: update compat 
Change-Id: I172dff4e0239ce90fe7b1c19fc800ba98f116270
 2025-03-07 10:18:42 +01:00
zolliker 895f66f713 core: simplify test for methods names 
The test for method names 'read_<param>' and 'write_<param>'
without a defined parameter is simplified. We do not check
anymore method names from base classes. Base classes
inheriting from HasAccessible are checked anyway at the
place they are defined.

+ add a test for it
+ move some tests to a new file test_all_modules.py, as
  test_modules.py is getting too long
+ fix missing doc string (frappy.simulation.SimDrivable.stop)

Change-Id: Id8a9afe5c977ae3b1371bd40c6da52be2fc79eb9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35503
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2025-03-07 10:18:35 +01:00
zolliker 3663c62b46 core: alternative approach for optional accessibles 
This is meant to replace change 33375.
Optional commands and parameters may be declared with the argument
optional=True. In principle, optional commands are not really needed
to be declared, but doing so is nice for documentation reasons
and for inherited accessible properties.

Optional parameters and commands can not be used and are not
exported als long as they are not overridden in subclasses.

- add a test for this
+ fix an issue with checking for methods like read_<param> without
  <param> being a parameter

Change-Id: Ide5021127a02778e7f2f7162555ec8826f1471cb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35495
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>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2025-03-07 10:18:27 +01:00