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

188 Commits

Author SHA1 Message Date
Alexander Zaft
95e5102137 Fix entangle integration bugs 
found during ccr-box adaption
* missing param description DigitalOutput
* missing Writable baseclass in DigitalOutput
* rework ccr config file

Change-Id: Ie40f875caacd374b02e6f6175b5fb003619c5f4e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30743
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-04-21 16:17:30 +02:00
Markus Zolliker
79da402ceb AsynConn.uri: better handling for missing scheme 
- check roughly for hostname being a valid address
- allow missing 'tcp' scheme even with missing port number

Change-Id: Ia3ce4cb7b8d2a4b339421eafe21f06fba6d938e6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30582
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-04-21 16:15:20 +02:00
Oksana Shliakhtun
5fb1e649ab Driver for ThermoFisher A 10 
Change-Id: Ic19ae444c3b4242f3bb1fe83852d4521326d0b9d
 2023-04-13 15:14:44 +02:00
Oksana Shliakhtun
ec15a35977 lakeshore ramp 
Change-Id: I323c2b88e554bc2dc9c3f1af2b23f99aa082489f
 2023-03-08 14:37:56 +01:00
Markus Zolliker
0acb80380a fix ppms with proxy 
- proxy: remote parameter status should overddide datatype from
  ProxyModule.status
- ppms: create PpmsDrivable instead of importing from
  (PpmsBase, Drivable). Order matters for status parameter!
- update cfg files

Change-Id: If8fc263cffb903d8b3c1a93a089dcac3597d13a0
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30512
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-03-06 08:24:15 +01:00
Georg Brandl
af32fd308c cfg: repair demo cfg after conversion 
Change-Id: I00b4e92d8e10842e9b2ae1ae904402473e77107f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30488
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2023-03-06 08:24:15 +01:00
Georg Brandl
355eaeb864 config: demo config fixes 
Change-Id: I380e101065179bf0d784bacfe6b79731b40af4c5
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30487
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2023-03-06 08:24:15 +01:00
Alexander Zaft
8799710b38 Convert example configs to python 
Fixes: #4627

Change-Id: I1049af9fa2f3f9ec06e55811dc9ecfa5f359c805
 2023-03-06 08:24:15 +01:00
Oksana Shliakhtun
cae225df41 create qnw driver 
Change-Id: I7b466caf91b7a2a177fa94ac84cdfc315475f959
 2023-03-01 17:49:15 +01:00
Markus Zolliker
4ebb15ca6c add lakeshore demo for hands-on workshop 
- a simple LakeShore model 336 driver

a tutorial follows

Change-Id: I291a615efa5bd58a0dd908949210086d2f82c2ca
 2023-02-20 12:52:05 +01:00
Oksana Shliakhtun
69dd011260 Added alarms 
Change-Id: Idd06278e44e01522ddf904b56a452ce8c704b5a6
 2023-02-02 17:22:08 +01:00
l_samenv
4d28abe141 fix issue with old reading 
- old reading shoould be ignored
- fix channels for CTI7
 2023-01-30 16:56:31 +01:00
Oksana Shliakhtun
a384664639 first version of lakeshore 340 driver 
Change-Id: Ie9a68be61e142802b2e71420b87623b7a4b4f645
 2023-01-24 18:13:34 +01:00
Markus Zolliker
68b45978a7 ppms.cfg: add target=0 in mf 
Change-Id: Ibccf95b54ba93a0b0648c61b7630ae376bf3e70e
 2023-01-23 18:00:20 +01:00
Alexander Zaft
05593d80f6 Bring demo up to date 
* Add python config for test and demo server
* Remove old configs
* Fix issue with slow start of test server

Change-Id: If0e576f4e4dda8b03489fdbb79b209dfcdca29ff
 2023-01-18 16:24:30 +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
Alexander Zaft
52b77ba9e6 Change config to Python 
- Change Configuration format to be python-based.
- move config logic to frappy/config.py
- Add first py-config: cryo_cfg.py
- Adapt test to new expected config format

Change-Id: Iaec484e0e1e21ebbb1e5c74b53be6231329ddf71
 2022-12-20 09:48:14 +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
l_samenv
3ab7eb99ab add flamemag / flamedil config 2022-11-30 14:14:47 +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
4f5cc3059e add FT furnace 2022-11-23 22:41:23 +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
camea
0c93ca8c75 add comment "do not use mb11stick" 2022-10-18 16:41:04 +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
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
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
5a78a5b258 fix wrong name (uniax.cfg) 
Change-Id: I7b132aa9474edd93321c74fa9262917d0766879f
 2022-09-08 09:26:01 +02:00
Markus Zolliker
38b3a192ab fix move_limit in cfg 
Change-Id: Iea99a39155e6172bcc265c350431a438d20f2fc3
 2022-09-08 08:31:38 +02:00
sans
4959619d56 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-09-08 08:27:43 +02:00
sans
6caf4fc993 uniax stick 2022-09-08 08:27:17 +02:00
Markus Zolliker
95eb4e969a change safe current to 0.3, set offset to 15 2022-09-07 13:14:51 +02:00
l_samenv
268ebbe00e Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-08-23 17:21:21 +02:00
l_samenv
ea960f2250 fix ln2fill enum 2022-08-23 17:21:01 +02:00
dmc
9673f7b242 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-08-22 15:56:48 +02:00
dmc
292d028fe6 add ill5 p sample stick 2022-08-22 15:55:58 +02:00
boa
aa0c0421c3 add Be-Filter addon for boa 2022-08-19 12:43:36 +02:00
camea
f23e42de1f fix bugs with persistent_limit parameter 
take into account that reading the switch heater might be delayed
 2022-08-16 16:54:30 +02:00
dmc
b81fc7b122 remove tm from ill5.cfg 
only one SeaDrivable per sea drivable allowed!
 2022-08-15 16:22:02 +02:00
camea
704bba292a add mb11 stick 2022-08-12 15:13:07 +02:00
camea
f1e642b1b0 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-08-12 15:12:23 +02:00
camea
8e3cdc80e4 improvements in magfiels/ips_mercury 
- read voltage
- fix a bug with ._init name conflict
 2022-08-12 15:10:23 +02:00
l_samenv
8f739b11dc ILL1 .cfg created and ILL1stick 2022-07-06 16:14:16 +02:00