linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,305 Commits 18 Branches 1 Tag
93fa2c818bcaef06704ea88cde082f7216ca837c
Commit Graph

1305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexander Zaft
89df37462c datatypes: add more detail to error messages 
the error messages for tuple and array swallow all details useful for
debugging. add the original exception for some context

Change-Id: I8e1036bfab10c09d5f9c8af05ac3306af89f54c4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33850
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
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
Markus Zolliker
69938f7ce8 frappy_psi.ah2700: create loss module automatically 
using the Pinata mechanism

Change-Id: I07b06b2563241600fbe454366089717a59d55bdc
 2024-06-12 11:25:22 +02:00
dmc
913b40ac92 varioxbstick: add meaning to T_sample 2024-06-12 09:26:01 +02:00
zebra
070e78f626 cfg/sea, hepump: add neodry to enum 2024-06-11 13:21:15 +02:00
l_samenv
a44f3fae50 frappy.modulebase: fix missing update after error on parameter 2024-06-11 08:36:36 +02:00
dmc
5a54503fe7 varioxB: add std stick 2024-06-10 15:48:37 +02:00
l_samenv
f702854066 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2024-06-10 10:11:52 +02:00
l_samenv
67fa50a9e0 [WIP] fixes for gas10ka / varioxB 
treat proxy for io correctly
 2024-06-10 10:11:03 +02:00
dmc
5e5f262472 remove dinp/dout from sea json temperature 
dinp and dout is not available on ls336 and not really
needed on ls340
 2024-06-06 15:28:21 +02:00
hrpt
9995ac8165 fix ori4 config (align to other cryos) 2024-06-06 08:59:32 +02:00
Markus Zolliker
b1f9c74269 frappy.client.readParameter: handle connection errors correctly 
update cache in case of connection errors, as they are not handled
in the rx thread

Change-Id: Icf3377020ec314fcef2982a4e6dc64356f787273
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33744
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>
 2024-05-28 17:29:55 +02:00
Markus Zolliker
63210c9924 SecopClient.online must be True while activating 
as callbacks trigger by updates while activating may check for
online state

+ remove unused imports

Change-Id: I37df839abf6b7225389b803347234a3d0bc8d799
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33745
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2024-05-28 17:29:55 +02:00
Jenkins system
47c5e297d4 [deb] Release v0.19.0 2024-05-28 17:29:55 +02:00
Georg Brandl
6cd83eabcc fix LimitsType to be actually used and validated 
Change-Id: Id0f67e91f4ff57d4c29c33960e736c8c3ae77209
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33683
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2024-05-28 17:29:37 +02:00
Jens Krüger
caaefec6db Fix abslimits reading from entangle device 
Fixes: #4864
Related: #4866

Change-Id: I393a35784766c0e09367a90debfc8b59b290626e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33672
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2024-05-28 17:29:37 +02:00
Georg Brandl
6dfb3bcee8 add config for the Entangle simulation server 
Change-Id: I9e7564707fc98d3b5dc3182d7837b222aefef582
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33692
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2024-05-28 17:29:37 +02:00
l_samenv
d492f7326f frappy_psi.parmod: make async 2024-05-07 10:25:02 +02:00
l_samenv
7929c37027 frappy_psi.sea: better timeout behaviour 
timeout parameter not only for requests but also for connects
this might avoid blocking situations
 2024-05-07 10:23:21 +02:00
zebra
76349e38f9 add cfg files from zebra: Ma10heat, ma10high_t, ma6_sampleheat 2024-05-03 08:25:50 +02:00
Markus Zolliker
647d87f70f frappy.client: avoid shutdown callback sent twice 
in case th rx thread crashes, the shutdown callback is called twice
-> improve cleanup code in __rxthread

Change-Id: I0d20aa4304d94b17565b018ad8528d61bbbcbc83
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33614
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-05-03 08:14:10 +02:00
tasp
798c268eb4 hvolt_long_cfg.py 2024-05-02 16:36:43 +02:00
eiger
9467f5233c increase mercury timeout 
+ set try_cnt for IPS to 0 (do no longer know why)
 2024-05-02 14:54:52 +02:00
eiger
a7ff73a34d set comlog automatically on 2024-05-02 14:54:52 +02:00
dmc
bf018e74ba add backlash to MA10 motor 2024-05-02 14:47:36 +02:00
dmc
801f80af7f add cfg files for gas stick 2024-05-02 14:47:36 +02:00
sans
26fa5371e9 add piezo/thermalc from sans 2024-05-02 13:06:40 +02:00
sans
2bad1ffee5 update haake/ma7/ma11/ovenstick from sans 2024-05-02 11:47:33 +02:00
Markus Zolliker
b2b77c70ea SecopClient.__del__ must not call callbacks 
otherwise a nasty deadlock might happen in NICOS

Change-Id: Ie1a333979b77683ce35683aede042ce86159fe65
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33583
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-05-02 08:40:32 +02:00
Markus Zolliker
192cde605e frappy.client.SecopClient: add the option to use no logging at all 
using a dummy NullLogger

Change-Id: I1f12c7307d3d8e37243488b8a11c6abcf087af86
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33582
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-05-02 08:40:32 +02:00
Markus Zolliker
c7d23e40e9 frappy.client.interactive: improve logging and error handling 
- redesign logging, using python logging
- stop watching when an erro happens during update

Change-Id: Ibe96569ecc45df429b571232374c451de3f82f1f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33431
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-05-02 08:38:49 +02:00
Markus Zolliker
2561e82086 frappy.client: improve error handling more 
- implement a 'handleError' callback
- SecopClient.handleError is registered as a callback and by default
  logs errors up to a limited number of times
- the cache is customized to return an item indicating an undefined value,
  helping to avoid follow up errors.
+ frappy.errors: cosmetic fix
+ frappy.client: cosmetic changes

Change-Id: I4614e1d27c7aea3a1a722176c6be55f8563597cd
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33429
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-05-02 08:38:49 +02:00
focus
55c96ffe4f add FW cfg 2024-04-30 09:24:07 +02:00
Markus Zolliker
17a44ef42a fixed dilsc, fist try before tests 
Change-Id: Iaac5f07c27879c7c17be2e25defde19e9ddd1566
 2024-04-29 12:18:12 +02:00
Alexander Zaft
fcdee8e3ec gui: sort qt imports 
Change-Id: Id8dfdd7b07bff6e337eb71a436dd51762f9b5fa7
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33389
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-04-08 17:01:20 +02:00
Markus Zolliker
dddf74df9e frappy.client: catch errors on callbacks 
buggy updates or errors in callbacks are now converted into
error updates, buggy error updates are skipped.

-> the receive thread should no longer crash

Change-Id: I97e3999db73e64f73dfbc380fac3d7685b6ca31c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33386
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>
 2024-04-08 17:01:03 +02:00
Alexander Zaft
ac251ea515 test: add uri attach test 
Change-Id: I8a021c53c9987ed03ce31c8481f73573b943d1f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33417
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-04-08 17:01:03 +02:00
Alexander Zaft
9e4f9b7b95 gui: more specialized input widgets 
Change-Id: I8b768b2069ae28a58d540165bd95f31ad7e984e0
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33390
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-04-08 17:01:03 +02:00
Markus Zolliker
4f65ae7e46 frappy.client: cleanup properly after a reply timeout 
when a reply to a request is not received within 10 s a timeout
error is raised, but any further requests with the same identifier
will be blocked - fix this

Change-Id: Id2fbc8bb6e6ecfd54bba1fa57b62e626e49b54c8
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33385
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-04-08 17:01:03 +02:00