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

1292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
camea
b7a1f17e5e fix new statemachine with ips magfield 
+ add on_error, on_restart etc. to states.py
+ add n_retry argument to mercury change/multichange
 2022-12-19 15:12:00 +01:00
Bjoern Pedersen
db3b190c26 Improve jenkinsfile 
Change-Id: I68efdd1a20135a0374fb9692e369a315824786ea
 2022-12-19 14:34:48 +01:00
Alexander Zaft
c522c41654 GUI: add logging infra, switch to argparse 
First part for #4662

Change-Id: I75877337e8ea35d4c4555471ee4518c942dac88a
 2022-12-08 16:38:00 +01:00
Enrico Faulhaber
929e41ffff Merge "Fix identification response" 2022-12-06 18:00:10 +01:00
Alexander Zaft
8d99a8c536 Fix identification response 
- fix header, but accept both responses
- warn when counterpart uses old behaviour

Fixes: #4659
Change-Id: Ib8869755898bf20edcbc7ae93157c943f816ebc1
 2022-12-06 14:43:45 +01:00
Markus Zolliker
a14c282993 redesign of the state machine 
With the current implementation, we run into a deadlock with the lock
from the state machine interfering with the accessLock on the module.
We can not wait for the state machine to finish while having the
accessLock locked by write_target. As a consequence, when restarting
the state machine we should not wait, but remember the state function
to call and postpone the restart after the cleanup has finished.
For this, we want to know the status before calling the state function.

- create HasState mixin, using doPoll for driving the machine
- StatusCode decorator for assigning a status to a state function
- remove the state machines 'threaded' option
- 'Retry' is now a unique value instead of a class. The retry period
  is determined by the (fast) poll interval.
- return 'Finish' instead of None for finishing the machine. returning
  None for state function is now an error, as this might happen
  easily inadvertently.

Change-Id: Icb31367442f10e98be69af3e05a84f12ce5cc966
 2022-12-06 10:18:50 +01:00
l_samenv
a0d14c30be attocube: more robust moving 
- try up to 10 times when end of travel or no more progress
- issue WARN instead of ERROR when moving did not work
 2022-12-02 10:37:45 +01:00
l_samenv
e668b6a439 attocube: add offset and change to HasTargetLimits 2022-12-02 09:12:51 +01:00
l_samenv
3483c3374d allow pollinterval = 0 2022-12-02 09:10:07 +01:00
l_samenv
d71a512454 new features HasTargetLimits and HasSimpleOffset 
according to standard
 2022-12-02 09:07:20 +01:00
l_samenv
b1608c4d7f Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-12-02 09:00:12 +01:00
l_samenv
e4c1f35e4a add attocube 2022-12-02 08:54:26 +01:00
l_samenv
3ab7eb99ab add flamemag / flamedil config 2022-11-30 14:14:47 +01:00
l_samenv
ef9d89993c new specs of HasOffset and target_limits 2022-11-30 14:14:06 +01:00
l_samenv
9887ba0721 improve Attached 
- allow a default value
- make copy method work properly
 2022-11-30 14:11:05 +01:00
Alexander Zaft
d09634a55d Fix error Message for too large arrays 
Change-Id: I69b6789ef9f463565918a395120b8f5ad3494b20
 2022-11-28 09:28:37 +01:00
zebra
397ca350f8 add FLAMP furnace 2022-11-24 07:56:09 +01:00
zebra
99220400f1 add FS furnace 2022-11-24 07:55:36 +01:00
dmc
4e8636a620 heliox: make temperatures seperate modules 2022-11-24 07:50:24 +01:00
dmc
f14bd553a8 disable closed loop on MA10 rotator 2022-11-24 07:49:36 +01:00
camea
2845a82236 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-11-23 22:41:49 +01:00
camea
4f5cc3059e add FT furnace 2022-11-23 22:41:23 +01:00
l_samenv
d845fedc03 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-11-21 14:38:40 +01:00
l_samenv
1b2e364f70 magfield adapted to new state machine 2022-11-21 14:37:53 +01:00
l_samenv
4405b2b02c new state machine, HasStates mixin 2022-11-21 14:13:52 +01:00
l_samenv
49b9bfa11d improvements for triton 
- set cooldown channel befor setting action
- improve max heater setting
 2022-11-15 16:57:52 +01:00
l_samenv
df428f4c0c check readback and try up to 3 times when it does not match 2022-11-15 16:57:00 +01:00
Markus Zolliker
b17030afa2 Merge "interactive client: fix detection of overriding modules" 2022-11-10 17:01:34 +01:00
Markus Zolliker
37c9efb27b interactive client: fix detection of overriding modules 
+ add docstring to PrettyFloat

Change-Id: Idc92e169e94d0c2bd3f9b8958870393295c87b18
 2022-11-10 15:58:28 +01:00
Enrico Faulhaber
4167ce7b00 fix sorce package name 
Change-Id: I91cd5d5e6d2da00eedc3e2ff0ee2a1d3e9ed4b04
 2022-11-10 15:00:27 +01:00
Jenkins system
2b7b2267d2 [deb] Release v0.15.0 2022-11-10 14:46:02 +01:00
Enrico Faulhaber
8071c21819 Merge "Fix typo in .description" 2022-11-10 14:43:32 +01:00
Enrico Faulhaber
e16ef3ae87 Merge "rename debian files" 2022-11-10 14:42:54 +01:00
Björn Pedersen
51147d8e09 Fix doc warnings/errors 
Change-Id: Idd6feeb66d58bc562853d3a82831645ef2d5ccf6
 2022-11-10 11:12:32 +02:00
Alexander Zaft
6909eb8541 rename debian files 
Change-Id: Ib990ecb8ef5ad856eb32110e5448064acf9a5a12
 2022-11-10 09:46:46 +01:00
Björn Pedersen
5d6b208671 CI build: upgrade base image 
- use python 3.9 (3.9 bullseyse)
- add latex-fonts-extra to fix missing tgtermes.sty
- in bullseye python3-pytango has been renamend to python3-tango
 (https://packages.debian.org/stable/python/python3-tango)

Change-Id: I06c8d8e432644f657057d14bbe754f28e2c10dd4
 2022-11-10 09:08:21 +01:00
Alexander Zaft
b3eebb6c6a rename debian package files 
Change-Id: I376082a68ceacd6fda984dc8dc1d53fa4afbbfef
 2022-11-09 16:31:40 +01:00
Alexander Zaft
7f166a5b8c Rename from secop to frappy 
debian/ is still missing, will follow in next commit.

Fixes: #4626

Change-Id: Ia87c28c1c75b8402eedbfca47f888585a7881f44
 2022-11-09 16:29:29 +01:00
Alexander Zaft
c1eb764b09 fixed pylint warnings 
Change-Id: Ibb3da77e9a53b7293a280659defc029416e30e3b
 2022-11-09 17:19:17 +02:00
Christian Felder
a9d798fabc Fix typo in .description 
Change-Id: I84def1c25279a2492d39931590f32a3b6fea8856
 2022-11-08 17:44:58 +01:00
Alexander Zaft
a928c95efd Merge "Add requirements-gui.txt and add PyQT5" 2022-11-03 15:50:19 +01:00
Enrico Faulhaber
7df4584150 Merge "Remove iohandler left-overs from docs" 2022-11-03 15:00:54 +01:00
Alexander Zaft
b7cebe2cd8 Add requirements-gui.txt and add PyQT5 
Change-Id: I8e2cdcc2d0353f4384ba8ea026e02af65064ece9
 2022-11-03 14:41:25 +01:00
Georg Brandl
b8b2dafaf8 Makefile: fix release target 
Change-Id: I1cc94a91cbb03c046092a814163664a507c88bdc
 2022-11-03 13:56:24 +01:00
Björn Pedersen
f66411dded Remove iohandler left-overs from docs 
The iohandler module has been remove in 28526

Change-Id: I24c86f88c8a37f85018cfcdec48279a1438da408
 2022-11-03 13:52:27 +01:00
Jenkins system
ce4bbec766 [deb] Release v0.14.3 2022-11-03 13:51:52 +01:00
Enrico Faulhaber
355810a887 MLZ/entangle: fix AnalogOutput.read_status() 
Change-Id: I584cd8f559b6c57f3c73105b28bc533526f6f492
 2022-11-03 12:59:58 +01:00
Bjoern Pedersen
aa98604f88 Upgrade for ci 
fixes outdated options and macros in Jenkinsfile
fixes outdated options in pylintrc

Change-Id: Ib064cc8b4235536c21288733676438297e15736d
 2022-11-03 12:27:37 +01:00
Georg Brandl
b0051ca3f0 secop_mlz/amagnet: formatting fixup 
Change-Id: I05ec4568c87d58f32cf48479ac653075e2211ed3
 2022-10-28 16:20:29 +02:00
Enrico Faulhaber
92edbb27ea change repo to secop/frappy 
Change-Id: I515c0d958c87d555156861db83a7b22c60046ead
 2022-10-21 12:40:33 +02:00