145 Commits

Author SHA1 Message Date
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
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
704bba292a add mb11 stick 2022-08-12 15:13:07 +02:00
f1e642b1b0 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-08-12 15:12:23 +02:00
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
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
131082313d added stick-motor addon 2022-07-05 10:57:43 +02:00
f12b0b3da0 add ill5 gas pressure stick
not yet tested
2022-07-04 14:23:51 +02:00
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
f495313018 dil2/3/4: added more temperatures, added dil3 2022-06-28 08:22:13 +02:00
18ded2159c changed mf from Readable to Drivable 2022-06-28 08:09:00 +02:00
760fc9eb40 added jtccr sea cfg 2022-06-27 11:06:45 +02:00
5d348eb7b1 fix ma6 stick motor port 2022-06-27 11:06:00 +02:00
86767e2fa1 add still and sorb heaters to dil5 2022-06-21 15:32:15 +02:00
778ac17172 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-06-14 15:08:35 +02:00
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
8b2abf7044 fix iodev to io in ill4stick.cfg 2022-06-10 14:31:44 +02:00
182a8c7e49 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-06-10 13:22:04 +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
a35231f5bd fixes in mb11/dil5
- no need fro second slot in TemperatureLoop, PressureLoop
- only ValvePos needs two slots
- added testwise heater to mix chamber

Change-Id: Iac4592d037a5e6a4f586041762992d75cc77e3de
2022-06-07 14:26:30 +02:00
9c7b6aeb94 various fixes on mb11/dil5 2022-06-07 11:45:25 +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
7fc030191d Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-05-19 18:10:14 +02:00
l_samenv
3959da6847 stick rotatation is either om or stickrot 2022-05-19 18:10:02 +02:00
39171fe06e add limits to phytron
Change-Id: I431374efab7a858db6a652f78533b13b12ba6d57
2022-05-19 18:05:52 +02:00
0972e8c7e8 add sign to phytron motor
+ fixes in ma10 config
2022-05-19 17:58:54 +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
9fa5aba052 add dom motor to MA7
Change-Id: I32b9ec469e030da90519b0a9e3d38b881e94d59f
2022-04-28 17:21:46 +02:00
bc13a912b4 change descr of ccr3 (ZEBRA) 2022-04-28 16:32:38 +02:00
l_samenv
33ba9ca946 add ccr3
+ add missing ma6.config.json
2022-04-28 16:31:20 +02:00
7d43f1cd58 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-04-28 13:43:46 +02:00
21a3865c5d general ini files for main, stick and addons 2022-04-28 13:43:09 +02:00
l_samenv
6752997048 replace 'iodev' by 'io' in cfg files 2022-04-22 16:45:12 +02:00