206 Commits

Author SHA1 Message Date
3eb5f90ce6 remove unneeded cfg/varioxb_cfg.py
Change-Id: Id731b4462e6bd91de66ee271e916aec044374fce
2024-01-29 10:47:54 +01:00
f1115c937b add cfg files from wip
Change-Id: I71b647c269c10eac7241970377d6f812636d082f
2024-01-29 10:45:42 +01:00
91d0f2c635 remove unneeded config files
Change-Id: I0a6a2d1471172ed2604265454b322a9f11f8d266
2024-01-29 10:41:25 +01:00
614a49f3e3 adopt sea amd cfg changes from wip
Change-Id: I83b82ece53e0cb3394551c122561a042499527d8
2024-01-29 10:33:47 +01:00
Oksana Shliakhtun
c0b928f2f6 Driver for ThermoHaake Phoenix P1 Circulator
Change-Id: I0573eeac2e40b4715072661c819701186733bf94
2023-11-07 13:26:16 +01:00
fb0a689786 ma6: make ts drivable 2023-10-16 17:49:36 +02:00
2ee12a62f0 fix ma15 sea config 2023-10-16 17:49:36 +02:00
de970ece3a configs for sample heat stick 2023-10-16 17:49:36 +02:00
d2e7ce7242 fix simulation
+ some fixed in sim_uniax

Change-Id: Ia8703ed988aa904bb2694339f0d3175b28fcb33e
2023-10-16 17:49:36 +02:00
72fbed289d more cfg file fixes
Change-Id: I0ba86cd17bb07f480cac6f20994ee854c6e811ae
2023-10-16 17:49:36 +02:00
l_samenv
60c6553ee7 cleanup cfg files 2023-10-16 17:49:36 +02:00
l_samenv
44c59bd818 flamedil as of 2023-07-04 2023-10-16 17:49:36 +02:00
l_samenv
c355999e85 flamedil as of 2023-07-03 2023-10-16 17:49:36 +02:00
l_samenv
4f0daf3424 flame sample combined T 2023-10-16 17:49:36 +02:00
l_samenv
ef5f4cd2f3 frappy_psi.cryoltd: fixes after frappy upgrade 2023-10-16 17:49:36 +02:00
bf8d5101b0 add ill2 2023-10-16 17:49:30 +02:00
31b5928725 fix fs config 2023-10-16 17:49:30 +02:00
110855200a more consistent ori1 stick json file 2023-10-16 17:49:30 +02:00
fc40f5e0c9 ma10: improve sea cfg 2023-10-16 17:49:30 +02:00
a19b085c30 hvolt_short stick: make hcp writable 2023-10-16 17:49:30 +02:00
09772eb746 stickmotor addon: add backlash -1 2023-10-16 17:49:30 +02:00
6b8e6498fa Revert "revert commits done before MZ holidays"
This reverts commit d2885bdd72331b60b5a6f26e0c52683d110406b5.
2023-10-16 17:49:30 +02:00
fcb5052565 add hvolt_short 2023-10-16 17:49:30 +02:00
ec2bc57ade fix haake_cfg 2023-10-16 17:49:19 +02:00
7142cee0db fix ma7.config.json 2023-10-16 17:49:19 +02:00
a3d7520da9 add ori7 2023-10-16 17:49:19 +02:00
dmc
9d5ed822e8 insert pressure reading into ccrpe_cfg 2023-10-16 17:49:19 +02:00
l_samenv
b6c2cf8d3a MA7: add unit=T to mf 2023-10-16 17:49:19 +02:00
a26ae0da4e sMA6 encoder mode to CHECK
after Oksana experienced that it works
2023-10-16 17:49:19 +02:00
l_samenv
f35dae5893 ma7: sea confg: make ta/tb visible 2023-10-16 17:49:19 +02:00
1776d7b4b6 consmetic changes to ma6_sample_heat_cfg.py 2023-10-16 17:49:19 +02:00
34f46ab0b0 MA6: set om.encoder_mode to 'NO' 2023-10-16 17:49:19 +02:00
98a73d7882 add special configurations m6/ma7 sampleheat 2023-10-16 17:49:19 +02:00
e7148a30cb MA7/MA11: make ts drivable 2023-10-16 17:49:19 +02:00
da948468b4 update haake + eurotherm cfg 2023-10-16 17:49:19 +02:00
75df438d69 disable encoder for MA11 stick rotation 2023-10-16 17:49:19 +02:00
10fe42babf add FW (old power rack, via SEA) 2023-10-16 17:49:19 +02:00
8124ed3294 revert commits done before MZ holidays
they are all not neccessary for SINQ SE operation

Change-Id: Ic9adcccf685752ab90bb6b86005ac8e04b302855
2023-10-16 17:49:19 +02:00
aa7910c28c update to gerrit version
Change-Id: Ifdaa28dd961a529cd9197c4c3639744f108b0a6a
2023-10-16 17:49:19 +02:00
Alexander Zaft
271bb27699 server: add option to dynamically create devices
add module which scans a connection and registers new devices depending
on the answer.
* change module initialization to demand-based
* move code from server to dispatcher
- remove intermediate step in Attached __get__

TODO:
  factor out dispatcher (regards to playground)
  discuss factoring out of module creation code from server AND
  dispatcher

Change-Id: I7af959b99a84c291c526aac067a4e2bf3cd741d4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31470
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
2023-10-16 17:49:19 +02:00
228902a6ee fixes in ori3 and dil5 config 2023-10-16 17:49:19 +02:00
e36ff9bc41 add ma15 cfg 2023-10-16 17:47:29 +02:00
Oksana Shliakhtun
161fb7b2ca Changed configuration file for Ametek lockin 7270
Change-Id: I7a1f3382df1dcc168cf2997c92ea7696f17a779d
2023-07-12 15:11:19 +02:00
a44d232dea remove unused cfg/sea/*.py
Change-Id: Ide289a30f558386d08ce4cdeb439f7438c072231
2023-06-20 11:07:23 +02:00
32b1d6412d camea filter addon
Change-Id: I1d80aa3bfc4e441ad8a69930b81d6cc25cee9511
2023-06-20 11:03:37 +02:00
fcca3801a4 branch develop: cfgfiles cfg/main for branch wip
Change-Id: Iece67aedc45300b920378a83cfebf5f617c1bad3
2023-06-20 10:55:12 +02:00
720d010c47 frappy_psi.thermofisher improvements
- merge Loop with Sensor
- make convergence work

Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
2023-06-05 09:52:18 +02:00
dc0cc590ed Merge branch 'wip' into develop
Change-Id: Ib5084b8750b31523819c688f4954c52cef4d4a0c
2023-05-31 14:06:05 +02:00
l_samenv
1de5455ef6 add haakeuro 2023-05-25 09:56:25 +02:00
Oksana Shliakhtun
439c9d34c1 add test cfg for lockin
Change-Id: I7985202df5848b30bdf55f62453321932422ab01
2023-05-17 16:04:09 +02:00