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

190 Commits

Author SHA1 Message Date
l_samenv
ab918a33ae cc: replace bool by enum in cc.hav and cc.nav 2023-11-23 15:56:23 +01:00
zebra
67032ff59b ma6: set backlash 2023-10-27 15:11:19 +02:00
zebra
06bec41ed3 ma6: make ts drivable 2023-10-02 16:56:23 +02:00
zebra
4cd6929d4b fix ma15 sea config 2023-10-02 16:55:42 +02:00
zebra
a89f7a3c44 configs for sample heat stick 2023-10-02 16:54:52 +02:00
tasp
3b997d7d86 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-09-22 13:29:23 +02:00
tasp
612295d360 add ill2 2023-09-22 13:29:04 +02:00
tasp
9e39a43193 fix fs config 2023-09-22 13:27:54 +02:00
tasp
6adfafaa27 more consistent ori1 stick json file 2023-09-22 13:27:10 +02:00
Markus Zolliker
f6c4090b96 fix simulation 
+ some fixed in sim_uniax

Change-Id: Ia8703ed988aa904bb2694339f0d3175b28fcb33e
 2023-09-19 16:05:52 +02:00
Markus Zolliker
ecef2b8974 more cfg file fixes 
Change-Id: I0ba86cd17bb07f480cac6f20994ee854c6e811ae
 2023-09-19 15:04:02 +02:00
l_samenv
96a7e2109b cleanup cfg files 2023-09-19 14:43:48 +02:00
l_samenv
e9a195d61e flamedil as of 2023-07-04 2023-09-19 14:17:08 +02:00
l_samenv
6ac3938b78 flamedil as of 2023-07-03 2023-09-19 14:17:08 +02:00
l_samenv
b4cfdcfc1a flame sample combined T 2023-09-19 14:16:21 +02:00
l_samenv
abf7859fd6 frappy_psi.cryoltd: fixes after frappy upgrade 2023-09-19 14:14:12 +02:00
Markus Zolliker
27600e3ddf fix bad cfg files 
Change-Id: Iacba12a2679777dd4ea2892751d82a63221b1361
 2023-09-19 14:07:20 +02:00
focus
dee8f8929e Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-09-08 10:46:13 +02:00
focus
2e143963df stickmotor addon: add backlash -1 2023-09-08 10:45:18 +02:00
sans
4bc82c2896 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-09-06 08:39:22 +02:00
sans
833a68db51 ma10: improve sea cfg 2023-09-06 08:38:49 +02:00
sans
b9f046a665 hvolt_short stick: make hcp writable 2023-09-06 08:38:06 +02:00
Markus Zolliker
db9ce02028 Revert "revert commits done before MZ holidays" 
This reverts commit d2885bdd72331b60b5a6f26e0c52683d110406b5.
 2023-08-18 16:32:16 +02:00
dmc
c4a39306e4 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-08-17 14:10:29 +02:00
dmc
024de0bd32 insert pressure reading into ccrpe_cfg 2023-08-17 14:07:44 +02:00
focus
565e8e6fd3 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-08-10 14:35:03 +02:00
focus
89bc7f6dfe add ori7 2023-08-10 14:34:51 +02:00
sans
c69fe1571a add hvolt_short 2023-08-09 17:39:19 +02:00
Markus Zolliker
c40033a816 update old cfg files 
- change secop_psi to frappy_psi
- remove interface and name in Node

Change-Id: I69242de250c9ecf52e001fce6396347dbf3fedcb
 2023-08-09 17:36:02 +02:00
sans
9df6794678 fix haake_cfg 2023-08-07 16:10:55 +02:00
sans
41f3b7526e fix ma7.config.json 2023-08-07 16:10:30 +02:00
l_samenv
f80624b48d MA7: add unit=T to mf 2023-07-11 15:36:14 +02:00
l_samenv
9e2e6074c8 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2023-07-11 13:27:57 +02:00
zebra
5a13888498 sMA6 encoder mode to CHECK 
after Oksana experienced that it works
 2023-07-11 11:27:20 +02:00
l_samenv
6c5dddc449 ma7: sea confg: make ta/tb visible 2023-07-10 10:55:43 +02:00
focus
78fa49ef74 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-07-07 15:46:05 +02:00
zebra
f80c793cd9 consmetic changes to ma6_sample_heat_cfg.py 2023-07-06 14:49:06 +02:00
zebra
519e9e2ed7 MA6: set om.encoder_mode to 'NO' 2023-07-06 14:48:09 +02:00
sans
14036160f7 add special configurations m6/ma7 sampleheat 2023-07-06 13:06:06 +02:00
sans
131dc60807 MA7/MA11: make ts drivable 2023-07-06 13:04:36 +02:00
sans
49722a858f update haake + eurotherm cfg 2023-07-06 13:04:11 +02:00
sans
c61b674382 disable encoder for MA11 stick rotation 2023-07-06 12:57:07 +02:00
focus
091543be56 add FW (old power rack, via SEA) 2023-07-06 12:53:19 +02:00
Markus Zolliker
d2885bdd72 revert commits done before MZ holidays 
they are all not neccessary for SINQ SE operation

Change-Id: Ic9adcccf685752ab90bb6b86005ac8e04b302855
 2023-07-06 08:03:15 +02:00
Markus Zolliker
975593dd6b update to gerrit version 
Change-Id: Ifdaa28dd961a529cd9197c4c3639744f108b0a6a
 2023-07-05 17:33:05 +02:00
Alexander Zaft
7904f243cb 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-07-05 17:10:56 +02:00
eiger
19f965bced Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-07-03 17:51:43 +02:00
eiger
3e4ea2515e add ma15 cfg 2023-07-03 17:51:28 +02:00
camea
714c820115 fixes in ori3 and dil5 config 2023-07-03 17:49:06 +02:00
Markus Zolliker
b92095974b camea filter addon 
Change-Id: I1d80aa3bfc4e441ad8a69930b81d6cc25cee9511
 2023-06-20 11:05:15 +02:00