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

168 Commits

Author SHA1 Message Date
Markus Zolliker
aa7910c28c update to gerrit version 
Change-Id: Ifdaa28dd961a529cd9197c4c3639744f108b0a6a
 2023-10-16 17:49:19 +02:00
Alexander Zaft
271bb27699 server: add option to dynamically create devices 
add module which scans a connection and registers new devices depending
on the answer.
* change module initialization to demand-based
* move code from server to dispatcher
- remove intermediate step in Attached __get__

TODO:
  factor out dispatcher (regards to playground)
  discuss factoring out of module creation code from server AND
  dispatcher

Change-Id: I7af959b99a84c291c526aac067a4e2bf3cd741d4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31470
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>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-10-16 17:49:19 +02:00
camea
228902a6ee fixes in ori3 and dil5 config 2023-10-16 17:49:19 +02:00
eiger
e36ff9bc41 add ma15 cfg 2023-10-16 17:47:29 +02:00
Oksana Shliakhtun
161fb7b2ca Changed configuration file for Ametek lockin 7270 
Change-Id: I7a1f3382df1dcc168cf2997c92ea7696f17a779d
 2023-07-12 15:11:19 +02:00
Markus Zolliker
a44d232dea remove unused cfg/sea/*.py 
Change-Id: Ide289a30f558386d08ce4cdeb439f7438c072231
 2023-06-20 11:07:23 +02:00
Markus Zolliker
32b1d6412d camea filter addon 
Change-Id: I1d80aa3bfc4e441ad8a69930b81d6cc25cee9511
 2023-06-20 11:03:37 +02:00
Markus Zolliker
fcca3801a4 branch develop: cfgfiles cfg/main for branch wip 
Change-Id: Iece67aedc45300b920378a83cfebf5f617c1bad3
 2023-06-20 10:55:12 +02:00
Markus Zolliker
720d010c47 frappy_psi.thermofisher improvements 
- merge Loop with Sensor
- make convergence work

Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
 2023-06-05 09:52:18 +02:00
Markus Zolliker
dc0cc590ed Merge branch 'wip' into develop 
Change-Id: Ib5084b8750b31523819c688f4954c52cef4d4a0c
 2023-05-31 14:06:05 +02:00
l_samenv
1de5455ef6 add haakeuro 2023-05-25 09:56:25 +02:00
Oksana Shliakhtun
439c9d34c1 add test cfg for lockin 
Change-Id: I7985202df5848b30bdf55f62453321932422ab01
 2023-05-17 16:04:09 +02:00
l_samenv
1ce43a567b fixes in sea cfg files 
- json_file must be a string, not a list
- rel_path is no longer to be converted to a list
 2023-05-10 16:36:32 +02:00
Markus Zolliker
750b5a7794 add empty description to Mod() for Sea classes 
Change-Id: I3890782b4e08291f73db0bfc4671c6cbc14f05d6
 2023-05-09 08:19:03 +02:00
l_samenv
5bc0b94c6d fix mb11 slot for updated mercury driver 2023-05-04 15:25:05 +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
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
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
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
Oksana Shliakhtun
ab1fdbae16 draft versions of lock-in and signal generator 
Change-Id: Icf4e3968efc3028af0de699a68a98a81e04ac9b6
 2023-04-26 11:33:49 +02:00
Oksana Shliakhtun
2d628e151c finished thermofisher 
but: convergence does not work yet properly
Change-Id: I834f8368730c347ba9f08a03eceae1a60fc66f90
 2023-04-26 10:23:48 +02:00
Alexander Zaft
d18e368ab9 make entangle mapping a dict 
Change-Id: I38d863a907469674001f0721140f88c17b53635b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30911
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-04-21 16:17:30 +02:00
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