|
|
3e4ea2515e
|
add ma15 cfg
|
2023-07-03 17:51:28 +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 |
|
|
|
ad36ab1067
|
frappy_psi.thermofisher improvements
- merge Loop with Sensor
- make convergence work
Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
|
2023-06-05 09:50:35 +02:00 |
|
|
|
57d5298c92
|
remove secop-server.spec
Change-Id: I8097a2918bc4e786bd270aeb436efebe9a3bd88f
|
2023-05-31 14:32:04 +02:00 |
|
l_samenv
|
1de5455ef6
|
add haakeuro
|
2023-05-25 09:56:25 +02:00 |
|
l_samenv
|
1ce43a567b
|
fixes in sea cfg files
- json_file must be a string, not a list
- rel_path is no longer to be converted to a list
|
2023-05-10 16:36:32 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
6c02f37bbb
|
issues with StructOf
- depending whether client or server side, handling of optional is different
- fix issues when struct is used as keyworded command arguments
Change-Id: I72b347b1a96ee3bce1f67dace4862c313c12c7a9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30972
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
|
2023-05-02 15:52:51 +02:00 |
|
|
|
da15df076a
|
fetched mlz version
- before some chamges in the gerrit pipline
Change-Id: I33eb2d75f83345a7039d0fb709e66defefb1c3e0
|
2023-05-02 15:25:11 +02:00 |
|
|
|
9fc6b6c0fd
|
add ill3 and ori1 stick
|
2023-05-02 09:31:09 +02:00 |
|
|
|
68b45978a7
|
ppms.cfg: add target=0 in mf
Change-Id: Ibccf95b54ba93a0b0648c61b7630ae376bf3e70e
|
2023-01-23 18:00:20 +01:00 |
|
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 |
|
|
|
397ca350f8
|
add FLAMP furnace
|
2022-11-24 07:56:09 +01:00 |
|
|
|
99220400f1
|
add FS furnace
|
2022-11-24 07:55:36 +01:00 |
|
|
|
4e8636a620
|
heliox: make temperatures seperate modules
|
2022-11-24 07:50:24 +01:00 |
|
|
|
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 |
|
|
|
0c93ca8c75
|
add comment "do not use mb11stick"
|
2022-10-18 16:41:04 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
12cb0cdade
|
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
|
2022-09-12 15:16:57 +02:00 |
|
|
|
7ed7dd7493
|
add combined mb11 / mb11 stick
|
2022-09-12 15:16:26 +02:00 |
|
|
|
031b30a4aa
|
heater slots H2 and H3 are exchanged!
|
2022-09-12 15:15:24 +02:00 |
|
|
|
5a78a5b258
|
fix wrong name (uniax.cfg)
Change-Id: I7b132aa9474edd93321c74fa9262917d0766879f
|
2022-09-08 09:26:01 +02:00 |
|
|
|
38b3a192ab
|
fix move_limit in cfg
Change-Id: Iea99a39155e6172bcc265c350431a438d20f2fc3
|
2022-09-08 08:31:38 +02:00 |
|
|
|
4959619d56
|
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
|
2022-09-08 08:27:43 +02:00 |
|
|
|
6caf4fc993
|
uniax stick
|
2022-09-08 08:27:17 +02:00 |
|
|
|
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 |
|
|
|
9673f7b242
|
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
|
2022-08-22 15:56:48 +02:00 |
|
|
|
292d028fe6
|
add ill5 p sample stick
|
2022-08-22 15:55:58 +02:00 |
|
|
|
aa0c0421c3
|
add Be-Filter addon for boa
|
2022-08-19 12:43:36 +02:00 |
|
