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

188 Commits

Author SHA1 Message Date
sans
fc40f5e0c9 ma10: improve sea cfg 2023-10-16 17:49:30 +02:00
sans
a19b085c30 hvolt_short stick: make hcp writable 2023-10-16 17:49:30 +02:00
focus
09772eb746 stickmotor addon: add backlash -1 2023-10-16 17:49:30 +02:00
Markus Zolliker
6b8e6498fa Revert "revert commits done before MZ holidays" 
This reverts commit d2885bdd72331b60b5a6f26e0c52683d110406b5.
 2023-10-16 17:49:30 +02:00
sans
fcb5052565 add hvolt_short 2023-10-16 17:49:30 +02:00
sans
ec2bc57ade fix haake_cfg 2023-10-16 17:49:19 +02:00
sans
7142cee0db fix ma7.config.json 2023-10-16 17:49:19 +02:00
focus
a3d7520da9 add ori7 2023-10-16 17:49:19 +02:00
dmc
9d5ed822e8 insert pressure reading into ccrpe_cfg 2023-10-16 17:49:19 +02:00
l_samenv
b6c2cf8d3a MA7: add unit=T to mf 2023-10-16 17:49:19 +02:00
zebra
a26ae0da4e sMA6 encoder mode to CHECK 
after Oksana experienced that it works
 2023-10-16 17:49:19 +02:00
l_samenv
f35dae5893 ma7: sea confg: make ta/tb visible 2023-10-16 17:49:19 +02:00
zebra
1776d7b4b6 consmetic changes to ma6_sample_heat_cfg.py 2023-10-16 17:49:19 +02:00
zebra
34f46ab0b0 MA6: set om.encoder_mode to 'NO' 2023-10-16 17:49:19 +02:00
sans
98a73d7882 add special configurations m6/ma7 sampleheat 2023-10-16 17:49:19 +02:00
sans
e7148a30cb MA7/MA11: make ts drivable 2023-10-16 17:49:19 +02:00
sans
da948468b4 update haake + eurotherm cfg 2023-10-16 17:49:19 +02:00
sans
75df438d69 disable encoder for MA11 stick rotation 2023-10-16 17:49:19 +02:00
focus
10fe42babf add FW (old power rack, via SEA) 2023-10-16 17:49:19 +02:00
Markus Zolliker
8124ed3294 revert commits done before MZ holidays 
they are all not neccessary for SINQ SE operation

Change-Id: Ic9adcccf685752ab90bb6b86005ac8e04b302855
 2023-10-16 17:49:19 +02:00
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