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

785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
camea
b10c722ff6 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-12-19 15:13:20 +01:00
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
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
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
camea
0c93ca8c75 add comment "do not use mb11stick" 2022-10-18 16:41:04 +02:00
camea
971c1dcfee Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-10-04 15:13:23 +02:00
camea
498dbd4179 sea.py: fix status datatype 
sea status is a string (not a tuple) and needs therefore
special treatment.
interestingly this bug did not yet appear ...
 2022-10-04 15:11:57 +02:00
l_samenv
00b0a54f12 ramp unit must be $/min 2022-09-22 17:12:54 +02:00
l_samenv
48076edd99 improve magfield and ips_mercury 2022-09-22 17:12:30 +02:00
Jenkins system
485e81bfb0 [deb] Release v0.13.1 
Change-Id: Ib038475d75de7b2976bc463423c2493eb531c02a
 2022-09-21 16:19:34 +02:00
Enrico Faulhaber
0df50bb0f9 secop_mlz: minor rework entangle client 
Change-Id: Ie406b4220c22cdbf302a1fd36f2d7407d81a47fa
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28951
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>
 2022-09-21 16:17:01 +02:00
Markus Zolliker
de5f17695c make startup faster in case of errors 
When the io of one SECoP module fails, it takes ages to startup
because each parameter poll takes the time to wait for a timeout.
After the first communication error on an io, no more startup polls
are tried on the modules using this io.

Change-Id: I0d250953dfe91a7d68d2d2b108395cc25d471afe
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28588
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>
 2022-09-21 16:16:48 +02:00
Markus Zolliker
e4aa2149f7 phytron: fix warning on repeated comm. error 
log only a warning when several retries ware successful

Change-Id: I2f1dfba920b0841914da82229820bcdd4b97c6e9
 2022-09-21 11:35:42 +02:00
Markus Zolliker
9f656546df fix undefined status in softcal 2022-09-20 12:07:11 +02:00
Markus Zolliker
5affb9f31b fix bug in persistent.py 
- use dirname instead of basename
 2022-09-20 12:07:11 +02:00
Markus Zolliker
5e3bf96df1 rework of uniax 
- try to deal with anomaly at 17 N
- reduce pid on overshoot
- use new statemachine
 2022-09-20 12:07:11 +02:00
Markus Zolliker
07995e2235 fix bug when restarting statemachine 
fixed bad if clause
+ better debug message on restart/stop
 2022-09-20 12:07:10 +02:00
zebra
54f091d0fe disable encoder for ma6 stick motor 2022-09-19 11:38:33 +02:00
zebra
14a71427fa jtccr: fix rel_paths 2022-09-19 11:37:56 +02:00
Markus Zolliker
486be9604e [WIP] uniax: removed do_ prefix 
Change-Id: I98d56a8ece681515de8f05767c67686715212c09
 2022-09-16 14:57:58 +02:00
Markus Zolliker
a8f1495bc8 [WIP] uniax after changing to StateMachine 
Change-Id: I0173f8c8eaaeb2526477d05803a615673297667d
 2022-09-16 14:53:42 +02:00
Markus Zolliker
3ab9821860 improve formatting of values 
Change-Id: I4a9290e85ee2071a3f2cfe0d00bc7dc4dcb4caed
 2022-09-16 08:06:45 +02:00
Markus Zolliker
0b9e227669 state after discussion with users 
- cirterium for "no substantial forece change" must be improved
 2022-09-16 08:16:15 +02:00
Markus Zolliker
befba09acc fix main value unit 
Change-Id: I27186e66bf065e015680a6925c5428714444c25e
 2022-09-14 14:54:48 +02:00
Markus Zolliker
554f265eb8 fix main value unit 
Change-Id: I30c6107fae31b5087bac75d66db6be8dee78a757
 2022-09-14 14:53:59 +02:00
Markus Zolliker
4287ec6477 apply main unit also in structured types 
Change-Id: I5a3efb167f2b460b847d8e7ac75a21848976b5f8
 2022-09-14 14:50:39 +02:00
Markus Zolliker
aad1c33742 improvements on interactive client 
- add selective logging
- fix handling of exceptions

Change-Id: I7e2c2d4ed12302874c3bb2cc7bd707aa8e487341
 2022-09-14 13:59:51 +02:00
Markus Zolliker
b0315e133b rework switch timing 
- specific things in ips_mercury.py
- general things in magfield.py

Change-Id: I7c2bae815b9a80a17803b44b8941ef3dea3adb60
 2022-09-14 13:58:12 +02:00
l_samenv
c3f55435da add reading of slave currents and voltages 
with fast polling
 2022-09-14 10:59:55 +02:00
camea
12cb0cdade Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-09-12 15:16:57 +02:00
camea
7ed7dd7493 add combined mb11 / mb11 stick 2022-09-12 15:16:26 +02:00
camea
031b30a4aa heater slots H2 and H3 are exchanged! 2022-09-12 15:15:24 +02:00
Markus Zolliker
3597adf869 fix code for current framwork version 
- remove _iodev, use HasIo instead of HasIodev
- add earlyInit super call
 2022-09-08 14:57:06 +02:00
Markus Zolliker
8bfe969a95 HasIO: attached io must not be mandatory 
as an uri might be given instead.
 2022-09-08 14:55:36 +02:00
Markus Zolliker
5a78a5b258 fix wrong name (uniax.cfg) 
Change-Id: I7b132aa9474edd93321c74fa9262917d0766879f
 2022-09-08 09:26:01 +02:00