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

1343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oksana Shliakhtun
9d50412a38 Haake driver 
Change-Id: Ib6aec31ada835ebfb2f8a06b119e3b8189f9f51e
 2024-08-27 15:11:48 +02:00
Oksana Shliakhtun
39dbe1149c Driver for HP multimeter 
Change-Id: I45f70758331680fb7b044d28bf0dc50781d912d3
 2024-08-27 15:11:35 +02:00
camea
a281583cd2 dil5: fix config file after change of frappy_psi/picontrol 
+ fixes in frappy_psi/picontrol.py
 2024-08-21 16:08:44 +02:00
camea
ad15ef3cdb fix camea be filter 2024-08-20 11:42:06 +02:00
zebra
7536454e96 frappy_psi/sea: yet another fix: BUSY after write target 
it seems update_is_running runs in parallel to write_target
and read_status can not run before write_target has finished
due to locks -> call read_status within write_target
 2024-08-20 11:39:04 +02:00
Markus Zolliker
bfbb8172e0 improve picontrol 
after suggestions from Marek (WIP)

- keep Mareks version created during Markus absence for now
- add a class with input_module (which is not a mixin)
- not 100 % tested: HasConvergence now inherits from Drivable

Change-Id: I6b3896e7c0fdaa4379d1cbc5603d43bd7a0b3a48
 2024-08-09 10:56:31 +02:00
l_samenv
258ec60b4c frappy_psi.sea: fix issue with missing BUSY after change target 
The command 'maw' in NICOS sometimes does complete immediately
instead of waiting for reaching the target. It seems this affects
only SEA drivables. The more important fix for this has to be
done in SEA. The fix here is just to improve behaviour in case
SEA would not do as expected.
 2024-08-08 16:35:28 +02:00
l_samenv
2f396e5897 frappy_psi.sea: fix mechanism to avoid ambiguous parameter names 
previous intended behaviour: when an ambiguous name appears
it is prepended by its parent node name in sea separated with
underscore (recursively). however, this was not implemented
properly and did not work.

new behaviour: when the short name of a parameter is ambigous
it is using the full path, joined by underscore
 2024-08-08 15:52:48 +02:00
sans
2c102ad38b config file for keithley 2601b source created 
fixed bug with limits in driver
 2024-07-24 17:39:14 +02:00
sans
b3519c7317 created config file in the new format 
fixed a bug in the vlimit
 2024-07-24 14:56:35 +02:00
sans
9caa3f3e08 change razorbill port to 3000, as it can not be connected in subnet 2024-07-11 16:54:35 +02:00
dmc
bb11f7cc20 add ori7_stick 2024-07-11 16:53:02 +02:00
zebra
ffe6f3cce0 fix bug with status (assign string to tuple) 2024-07-11 16:48:42 +02:00
zebra
91a91d6483 ma7_stick: disable drivable ts because of bug 2024-07-11 16:47:51 +02:00
dmc
7131536770 fix sea/ori7.config.json for use sith std stick 2024-07-08 16:08:49 +02:00
dmc
82c1081b69 fix issue with seadesc 
frappy run main seadesc did no longer work.
fix this
 2024-07-08 16:08:49 +02:00
l_samenv
ff2fcf7651 rename razorbill forwarder addon 2024-07-05 14:18:50 +02:00
l_samenv
21dae2d9ce ACM1219: add checkHWIdent 
waiting 0.5 sec before the first communication helps to start
properly

+ added usb dev names for box
 2024-07-05 10:50:47 +02:00
Paul Neves
476d2087f6 ACM1219: remove wait_before 2024-07-05 10:50:47 +02:00
Paul Neves
bb6cf9caa1 Updated the ACM1219 driver 2024-07-05 10:50:44 +02:00
Paul Neves
c3b1ce4b8c added GNU license 2024-07-05 10:50:19 +02:00
Paul Neves
e4eb5989c3 made displacement and force calibrations writable and updated capacitance channel descriptions 2024-07-05 10:49:34 +02:00
Paul Neves
48393b2332 added RP100, ACM1219, and dummy classes, and razorbillUC220T config file 2024-07-05 10:49:30 +02:00
l_samenv
9eb8f2efc8 add T forwarder for razorbill 2024-07-05 10:39:44 +02:00
Markus Zolliker
46f815af38 [WIP] work on CCU4 
- nv control

Change-Id: I34e634d1e167f0a60d55b014c7117c9274d83c50
 2024-07-02 11:11:40 +02:00
Markus Zolliker
09f4f1d192 frappy_psi.sea: use ReadFailedError 
change error class on reading parameters in SEA from HardwareError
to ReadFailed. This is in most cases more appropriate.

TODO: find errors in SEA that should be should be HardwareErrors
and a mechanism to indicate this

+ for errors related to disabled modules use the DISABLED status

Change-Id: I0342a34185a66dcf874c6ca034b7cefc98bf9c8a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34022
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-06-24 13:43:06 +02:00
Markus Zolliker
15fc9ca16c add sim for ls372 
+ fix bin/sim-server

Change-Id: I6cad963d9e37faea172ca51a327474406ecafa4a
 2024-06-19 17:19:19 +02:00
Markus Zolliker
c6056ad1de [WIP] frappy_psi:ccu4: add HeLevel, N2 
Change-Id: Ib31ec440ecc51b01035d783065cb805b942b61b1
 2024-06-19 17:19:19 +02:00
Markus Zolliker
4da6aa95d7 frappy_psi/ls372: add changing pid 
Change-Id: I8768b1e6609a42553b8e98866540fe33d1b5cd89
 2024-06-19 17:19:19 +02:00
Markus Zolliker
fa37b43be2 better behaviour on startup in case of errors 
- fix a bug then TcpServer can not start dye to address in use
- report errors when restarting interfaces
- increase timeout. the timeout for waiting all interfaces
  starting up must be higher than a potential successful
  startup of TcpServer, which is currently ~ 10 sec
  (might be reduced, but at both places)

Change-Id: I88b967c4baff79fdf94f4c849dd713d2cba6fabc
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33985
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-06-19 17:19:19 +02:00
Markus Zolliker
986065e1f6 frappy_psi.extparams.StructParam: fix doc + simplify 
- the doc string contained wrong, obsolete information
+ simplify: remove customizeable mapping member name -> param name

Change-Id: I0ffdcb336f45001d45f68238b56e1e257d98dd3d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33993
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-06-19 17:19:19 +02:00
Jenkins system
455f15d975 [deb] Release v0.19.2 2024-06-19 17:19:19 +02:00
Enrico Faulhaber
cefd0fe8b5 frappy_mlz/entangle: fix missing status enum 
finally!

Change-Id: I5be4ded7c8ee87a09be44ba474e26cd023c917c6
 2024-06-19 17:19:19 +02:00
Markus Zolliker
9cd38375c0 frappy_psi.sea: various improvments 
- always open asynio and syncio connections (conenctions for
  update and command)
- better synchronization when reconnecting using threading.Event
- nicer error messages

Change-Id: Ia435c3ccfa2732be4aa9f24a3b6e8484fab715a3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33909
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-06-19 17:19:19 +02:00
sans
86b888b43a fix ovenstick cfg 
fix attached modules:
- 'read' instead of 'value_param'
- 'write' instead of 'target_param'

+ remove comment in cfg/stick/thermalcond_cfg.py
 2024-06-19 15:29:29 +02:00
sans
9eb83df7de fix stick cfg of ma7 and ma11 
fix attached modules:
- 'read' instead of 'value_param'
- 'write' instead of 'target_param'
 2024-06-19 14:57:37 +02:00
Markus Zolliker
20596744f9 frappy_psi.triton: fix heater output issue 
when output_module is not HeaterOutputWith range, the heater limit
can not be changed

Change-Id: If25a609e9f9667dc111cb220024388a51df993ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33913
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-06-17 15:20:21 +02:00
Markus Zolliker
0a98776e27 frappy_psi.triton: bug fixes 
- fix channel numbers
- make sure some channels are selected

Change-Id: I11c553805ed5ee6235e54ce56a5ea68160d1d212
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33911
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-06-17 15:20:21 +02:00
Markus Zolliker
f5667a9267 frappy_psi.picontrol: software control loop 
example usage: use a temperature controller without changing
the calibration setting:
reading the raw sensor, calibrate by software and use 'manual'
heater output

Change-Id: I3dbcf37e7726b48a0516d7aa30758be52b80fe58
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33910
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-06-17 15:20:21 +02:00
Markus Zolliker
8b27e4012c frappy_psi.ah2700: auto create loss module with Pinata 
the loss angle is a separate quantity, which is preferred to
be an extra module. create this automatically.

Change-Id: I97f6be48f3411d8143f2ff85c2c61711fc71e8d6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33908
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-06-17 15:20:21 +02:00
Alexander Zaft
6837b82791 add option for delayed imports 
will make setup checking easier, although it does not work for all cases
(from imports for example)

Change-Id: I2e5cf9b427a6f8e6f603d9662cdb9700d5f9ad9a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33893
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2024-06-17 15:20:21 +02:00
Markus Zolliker
e093bdae96 bug fix in frappy_psi.convergence 
+ various doc improvements

Change-Id: I8ce2a1f006a5e4870285ce1f6015510e21d01a13
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33906
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-06-17 15:20:21 +02:00
sans
a4ee261744 cti7: add cold finger temperature 2024-06-17 10:40:20 +02:00
pc16470
e09ed9ebe3 move magnet from flamedil bananapi to flamemag raspberry 2024-06-12 11:25:49 +02:00
Markus Zolliker
8bc0671f73 fs furnace: move PI with relais to frappy_psi/furnace.py 
Change-Id: Ia8bec296035b3ae23a698f041fe8be39d925d996
 2024-06-12 11:25:22 +02:00
Markus Zolliker
26f9c177f7 HasControlledBy: update target without switching to self control 
when a HeaterOutput module is used e.g. from a software loop,
a method is needed to update the output without switching to
self-controlled

Change-Id: I9c83b4e172e14812a405e836757491622ff5f949
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33903
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>
 2024-06-12 11:25:22 +02:00
Markus Zolliker
4c6bc2ba68 frappy.lib.asynconn: handle ConnectionResetError nicely 
Change-Id: Icba24ffb82369aa78e431d12260f4f3cc795e511
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33902
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>
 2024-06-12 11:25:22 +02:00
l_samenv
ce7de98dc7 fix missing update after error on parameter 
the main error was a suppressed update when the value does not
change, but the readerror gets None

this error was the reason for strange behaviour in frappy.proxy
while finding the cause, other improvements were done:

- nodeStateChange: add 'activating' to the possible online states
- improve status handling in proxy

Change-Id: I2a1873065ab051bdba2200f50e6ad09ae55e168e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33901
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-06-12 11:25:22 +02:00
Jenkins system
1c229c33bd [deb] Release v0.19.1 2024-06-12 11:25:22 +02:00
Alexander Zaft
2d08f25993 mlz: derive Digitaloutput from Drivable 
as the underlying entangle *DigitalOutput may be BUSY and frappy.Writable
disallows this.

Change-Id: I6e4861c6d014f59ad4cc2355a438130173bf6569
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33849
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
 2024-06-12 11:25:22 +02:00