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

268 Commits

Author SHA1 Message Date
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
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
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
l_samenv
7ef386424c Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-07-06 11:24:56 +02:00
l_samenv
53b3dd2fad fix stick motor port number on ma02-ts 2022-07-06 11:24:27 +02:00
focus
6554e5de47 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-07-05 11:02:15 +02:00
focus
60ec1edb32 fix He-fill enum 2022-07-05 11:00:35 +02:00
focus
131082313d added stick-motor addon 2022-07-05 10:57:43 +02:00
tasp
f12b0b3da0 add ill5 gas pressure stick 
not yet tested
 2022-07-04 14:23:51 +02:00
tasp
5ecd9557a3 add lev to ill5 cfg 2022-07-04 14:23:08 +02:00
l_samenv
3769ddca75 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-06-29 11:51:01 +02:00
l_samenv
a4dec7b832 fix ill5 cfg 2022-06-29 11:49:51 +02:00
focus
f495313018 dil2/3/4: added more temperatures, added dil3 2022-06-28 08:22:13 +02:00
zebra
18ded2159c changed mf from Readable to Drivable 2022-06-28 08:09:00 +02:00
zebra
760fc9eb40 added jtccr sea cfg 2022-06-27 11:06:45 +02:00
zebra
5d348eb7b1 fix ma6 stick motor port 2022-06-27 11:06:00 +02:00
camea
86767e2fa1 add still and sorb heaters to dil5 2022-06-21 15:32:15 +02:00
camea
778ac17172 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-06-14 15:08:35 +02:00
camea
dfbc1c757a fixes in mercury an triton 
- Valve is now a drivable, as it will check success, and retry,
  which might take around 1 second
+ some more
 2022-06-14 15:07:17 +02:00
focus
8b2abf7044 fix iodev to io in ill4stick.cfg 2022-06-10 14:31:44 +02:00