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

969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
l_samenv
5bc0b94c6d fix mb11 slot for updated mercury driver 2023-05-04 15:25:05 +02:00
Markus Zolliker
bbe70fb3cb add missing files from secop_psi 
- all of them have to be checked!

Change-Id: I89d55ca683d0b2710222f14c2c3cd42f8fbf3a1f
 2023-05-03 11:24:47 +02:00
Markus Zolliker
31be98c62e MB11: increase persistent_limit to 11.1 
Change-Id: I6849877212a8fc2ac16ef80d727581ae7f6c5e94
 2023-05-02 16:49:35 +02:00
amor
94070121c7 converted smamor 2023-05-02 16:43:09 +02:00
zebra
1961f91567 add switching_sensor 2023-05-02 16:39:34 +02:00
zebra
e38139089f add hvolt_long and varioxstick (zebra) 2023-05-02 16:38:27 +02:00
zebra
e2c51b3dd1 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-05-02 16:35:50 +02:00
zebra
b77c222b72 add setsamp to ma02.config.json 2023-05-02 16:34:23 +02:00
sans
b55af7b20b add ma7two, oventwo and ovenstick (sans) 2023-05-02 16:32:04 +02:00
hrpt
72add69b65 add rt and sch (from hrpt) 2023-05-02 16:19:07 +02:00
dmc
1a44c2d513 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-05-02 16:09:16 +02:00
camea
0fb10a0a10 converted cfg files from camea 2023-05-02 16:07:38 +02:00
Markus Zolliker
748ea1400a improve interactive client 
- remove irrelevant traceback on remote errors
- add run() function to execute scripts
- when started with bin/frappy-cli, use separate namespace

Change-Id: Ic808a76fa76ecd8d814d52b15a6d7d2203c6a2f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30957
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-02 15:54:32 +02:00
Markus Zolliker
5784aa0f5d improve mercury temperature loop 
- remove appearance of Done
- add auto flow
- try up to 3 times in 'change' method if read back does not match

Change-Id: I98928307bda87190d34aed663023b157311d4495
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30981
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-02 15:54:14 +02:00
Markus Zolliker
6c02f37bbb issues with StructOf 
- depending whether client or server side, handling of optional is different
- fix issues when struct is used as keyworded command arguments

Change-Id: I72b347b1a96ee3bce1f67dace4862c313c12c7a9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30972
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-02 15:52:51 +02:00
Markus Zolliker
d6d564f4aa a playground for debugging drivers 
playground for trying out drivers by calling methods read_*
and write_* directly without starting a real SECoP server

Change-Id: Ia7d2366920d29794a4eda5d7bfb2b62d4930eb65
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30944
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-02 15:52:19 +02:00
Markus Zolliker
da15df076a fetched mlz version 
- before some chamges in the gerrit pipline

Change-Id: I33eb2d75f83345a7039d0fb709e66defefb1c3e0
 2023-05-02 15:25:11 +02:00
dmc
9fc6b6c0fd add ill3 and ori1 stick 2023-05-02 09:31:09 +02:00
Markus Zolliker
b19a8c2e5c converter for creating python config files 
+ testmode in server returns errors
+ fix in (old) statemachine

Change-Id: Icdfd6c3d8f70e717fecd61e8a54adad326be6000
 2023-01-23 18:00:56 +01:00
Markus Zolliker
68b45978a7 ppms.cfg: add target=0 in mf 
Change-Id: Ibccf95b54ba93a0b0648c61b7630ae376bf3e70e
 2023-01-23 18:00:20 +01:00
Markus Zolliker
7d4dfdebbd fix bug in k2601b 
convert returned float (which is integer) to int

Change-Id: I8363f4d5188f2b1be89f1383da20c76522286424
 2023-01-23 18:00:20 +01:00
Markus Zolliker
6c325460f7 make doc when .git is not there 
accept failure of secop.version.get_version()

Change-Id: Ia689bd4f56b848bc354c0d68826a3174f0746a97
 2023-01-23 18:00:20 +01:00
Markus Zolliker
c70b61e4e5 relax identification check 
accept *,SECoP,*

Change-Id: Ieb56e9c57fc5eb18e025fbc2f1d17a9d6e3f0a97
 2023-01-23 18:00:20 +01:00
l_samenv
589b857039 add driver for LakeShore 372 
- including channelswitcher
 2022-12-21 11:05:15 +01:00
l_samenv
ad4a6d2e09 improved cyoltd (flame magnet) 
- use a statemachine
- do more control in frappy, switching from persistent to driven
  internally
- a lot of fixes
 2022-12-21 11:00:19 +01:00
l_samenv
766f15beee improvements in magfield 
- use HasTargetLimits instead of HasLimits
- move ramp_tmo parameter to SompleMagfield
- add last_target method
- fix progress check in SimpleMagfield.ramp_to_target
- better mechanism for setting to persistent mode after restart
- fix switching mode
- fix on_error
- fix condition for shortcut start_field_change -> check_switch_off
- remove direct status updates
- move check for manual switch heater operations to ips_mercury
 2022-12-21 10:57:41 +01:00
l_samenv
79b8cd7b2d fix inheritance of status codes attached to state functions 2022-12-21 10:38:11 +01:00
l_samenv
bd0f3a0b07 fixe in triton and mercury 2022-12-19 16:13:06 +01:00
l_samenv
c4f9f2ef4b rename action to dil_action 2022-12-19 16:12:06 +01:00
l_samenv
0820d537c3 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-12-19 16:09:40 +01:00
camea
1a6aa893e4 move persistent_field parameter from magnet.py to ips_magnet.py 
'persistent_field' is in principle the same as 'value'.
however, on IPS it might be different, at least it is a seperate
HW parameter
 2022-12-19 16:03:44 +01:00
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
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
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