72 Commits

Author SHA1 Message Date
dmc
024de0bd32 insert pressure reading into ccrpe_cfg 2023-08-17 14:07:44 +02:00
l_samenv
f80624b48d MA7: add unit=T to mf 2023-07-11 15:36:14 +02:00
5a13888498 sMA6 encoder mode to CHECK
after Oksana experienced that it works
2023-07-11 11:27:20 +02:00
519e9e2ed7 MA6: set om.encoder_mode to 'NO' 2023-07-06 14:48:09 +02:00
14036160f7 add special configurations m6/ma7 sampleheat 2023-07-06 13:06:06 +02:00
49722a858f update haake + eurotherm cfg 2023-07-06 13:04:11 +02:00
c61b674382 disable encoder for MA11 stick rotation 2023-07-06 12:57:07 +02:00
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
f304ac019e fix cfg files (extra_modules/single_module)
Change-Id: I1821e1e0dc960d48a3e343c53195808798b7f969
2023-06-06 16:49:54 +02:00
3e26dd49d0 jtccr: fix cfg for extra_modules / single_module 2023-06-06 16:45:31 +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
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
31be98c62e MB11: increase persistent_limit to 11.1
Change-Id: I6849877212a8fc2ac16ef80d727581ae7f6c5e94
2023-05-02 16:49:35 +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
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
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
397ca350f8 add FLAMP furnace 2022-11-24 07:56:09 +01:00
99220400f1 add FS furnace 2022-11-24 07:55:36 +01:00
dmc
f14bd553a8 disable closed loop on MA10 rotator 2022-11-24 07:49: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
14a71427fa jtccr: fix rel_paths 2022-09-19 11:37:56 +02:00
7ed7dd7493 add combined mb11 / mb11 stick 2022-09-12 15:16:26 +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
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
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
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
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