49 Commits

Author SHA1 Message Date
19f965bced Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-07-03 17:51:43 +02:00
3e4ea2515e add ma15 cfg 2023-07-03 17:51:28 +02:00
714c820115 fixes in ori3 and dil5 config 2023-07-03 17:49:06 +02:00
a6a3f80e30 remove sign=-1 from cfg files 2023-06-05 13:02:40 +02:00
l_samenv
1de5455ef6 add haakeuro 2023-05-25 09:56:25 +02:00
94070121c7 converted smamor 2023-05-02 16:43:09 +02:00
e38139089f add hvolt_long and varioxstick (zebra) 2023-05-02 16:38:27 +02:00
e2c51b3dd1 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-05-02 16:35:50 +02:00
b77c222b72 add setsamp to ma02.config.json 2023-05-02 16:34:23 +02:00
b55af7b20b add ma7two, oventwo and ovenstick (sans) 2023-05-02 16:32:04 +02:00
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
0fb10a0a10 converted cfg files from camea 2023-05-02 16:07:38 +02:00
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
397ca350f8 add FLAMP furnace 2022-11-24 07:56:09 +01:00
99220400f1 add FS furnace 2022-11-24 07:55:36 +01:00
4f5cc3059e add FT furnace 2022-11-23 22:41:23 +01:00
54f091d0fe disable encoder for ma6 stick motor 2022-09-19 11:38:33 +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
boa
aa0c0421c3 add Be-Filter addon for boa 2022-08-19 12:43:36 +02:00
dmc
b81fc7b122 remove tm from ill5.cfg
only one SeaDrivable per sea drivable allowed!
2022-08-15 16:22:02 +02:00
l_samenv
8f739b11dc ILL1 .cfg created and ILL1stick 2022-07-06 16:14:16 +02:00
6554e5de47 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-07-05 11:02:15 +02:00
60ec1edb32 fix He-fill enum 2022-07-05 11:00:35 +02:00
f12b0b3da0 add ill5 gas pressure stick
not yet tested
2022-07-04 14:23:51 +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
f495313018 dil2/3/4: added more temperatures, added dil3 2022-06-28 08:22:13 +02:00
760fc9eb40 added jtccr sea cfg 2022-06-27 11:06:45 +02:00
6da1a89459 add dil4/variox, fix ma10 in cfg 2022-06-10 13:21:20 +02:00
f1d5e82bb4 remove unneccessary fiels in cfg/sea 2022-06-10 13:20:12 +02:00
l_samenv
3563a0db16 fix ill4 2022-05-31 16:44:53 +02:00
4bfb76ca82 IPS mercury
+ mb11, dil5, dil2, variox configs
2022-05-30 12:09:57 +02:00
l_samenv
f276b973f5 add variox 2022-05-16 15:28:30 +02:00
l_samenv
8739ef04d7 add ori3 2022-05-12 16:39:28 +02:00
aea73d976c add ori6 2022-05-12 16:23:58 +02:00
l_samenv
4c98a4c706 add sticks and cfg
ma02, ma10, ma11, mbe
2022-05-12 16:16:26 +02:00
l_samenv
62146aa477 add heliox stick 2022-05-05 10:31:50 +02:00
l_samenv
9ff8c3ba54 add ma10, add stick motors 2022-04-29 11:08:04 +02:00
l_samenv
33ba9ca946 add ccr3
+ add missing ma6.config.json
2022-04-28 16:31:20 +02:00
l_samenv
6752997048 replace 'iodev' by 'io' in cfg files 2022-04-22 16:45:12 +02:00
1ac2f8557c fixes in sch5 2022-04-20 15:53:15 +02:00
b6cadf4a69 add ill4
+ fixes in focus-be-filter
2021-11-04 07:51:37 +01:00
1619e042e9 added fftf furnace and smamor 2021-06-08 11:06:39 +02:00
70c3f5f37f created SeaConfigCreator
running frappy with 'seadesc' cfg does the same as previously
starting 'sea' cfg and performing seaconn:_describe automatically

create mbe.cfg
2021-05-19 17:41:18 +02:00
61aeafdfb6 added cfg files for SINQ Frappy
Change-Id: Icb1ea5e2e1f9aedd77a6bac7ed6b14458aea4aa7
2021-04-27 17:54:20 +02:00
12b0549cc0 merged master with work
Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59
2021-03-03 09:00:45 +01:00