Commit Graph

220 Commits

Author SHA1 Message Date
14ee1d66e0 kapillarheizung: state as of 2025-11-26
Comment from Markus:
This needs some redesign. We should not map each
logo parameter to a SECoP module.
I guess that the switch to turn off the heater should be
integrated into the heater modules.

In addition we have to rebase to the wip branch, which would need
a merged version of frappy_psi/logo.py.
2025-11-26 16:20:47 +01:00
6d90f02dd6 in the config file some modules required a frappy.logo.ControlHeater class
this class does not exist.
in the config these modules where now defined using the HeaterParam class
The Server starts, but iti is unclear if it fullfils the intended behaviour
Please fix
2025-03-20 15:25:22 +01:00
a26b7b69fa added description, remove not working cernox 2024-11-18 11:23:22 +01:00
92a8dfac5d fixed heater level
- should be percent
- round to integer before writing to logo
2024-06-11 13:47:36 +02:00
dmc
5e5f262472 remove dinp/dout from sea json temperature
dinp and dout is not available on ls336 and not really
needed on ls340
2024-06-06 15:28:21 +02:00
9995ac8165 fix ori4 config (align to other cryos) 2024-06-06 08:59:32 +02:00
Georg Brandl
6dfb3bcee8 add config for the Entangle simulation server
Change-Id: I9e7564707fc98d3b5dc3182d7837b222aefef582
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33692
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>
2024-05-28 17:29:37 +02:00
76349e38f9 add cfg files from zebra: Ma10heat, ma10high_t, ma6_sampleheat 2024-05-03 08:25:50 +02:00
798c268eb4 hvolt_long_cfg.py 2024-05-02 16:36:43 +02:00
a7ff73a34d set comlog automatically on 2024-05-02 14:54:52 +02:00
dmc
bf018e74ba add backlash to MA10 motor 2024-05-02 14:47:36 +02:00
dmc
801f80af7f add cfg files for gas stick 2024-05-02 14:47:36 +02:00
26fa5371e9 add piezo/thermalc from sans 2024-05-02 13:06:40 +02:00
2bad1ffee5 update haake/ma7/ma11/ovenstick from sans 2024-05-02 11:47:33 +02:00
55c96ffe4f add FW cfg 2024-04-30 09:24:07 +02:00
17a44ef42a fixed dilsc, fist try before tests
Change-Id: Iaac5f07c27879c7c17be2e25defde19e9ddd1566
2024-04-29 12:18:12 +02:00
l_samenv
adfb561308 add cetoni pump for flowsas project 2024-04-03 11:31:38 +02:00
l_samenv
8ee97ade63 adjust cfg foe attocube to current example 2024-03-27 17:13:58 +01:00
db29776dd5 reworked attocube
- step_mode: soft closed loop, stepwise, reading encoder after a delay
- calib_steps command to determine step size

Change-Id: I27bdffb4d564ac9c55a6473704ac2de6ad92bac8
2024-03-25 16:47:13 +01:00
16b826394f fixes for attocube
Change-Id: Id5eeb749ba010fec59d1c2f8a3258ee34a47e246
2024-03-20 16:59:04 +01:00
l_samenv
ea8570d422 wip: fix attocube 2024-03-20 16:12:03 +01:00
l_samenv
5b0da3ba98 fixes on 2023-11-27
- ls372 autorange: wait one sec. more for switching
- keep only one channel, even after target is reached
- intermediate target only when T is raise, but not when lowered
2024-02-23 10:13:05 +01:00
l_samenv
8cb9154bb5 flamesample: use odd fraction for limits
workaround for problems when driving exactly to the limit
2024-02-23 10:10:29 +01:00
l_samenv
813d1b76ef remove 1K plate heater configuration
this heater does not exist
2024-02-19 12:47:52 +01:00
Alexander Zaft
a16ec6cc91 mlz/demo: move old examples to Attached
change very early version of module attachments in GarfieldMagnet and
MagnetigField to use Attached

Change-Id: I616ad17bc72cd93d86e1b3e3609543cfe90edcd8
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32250
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
2024-01-29 13:34:29 +01:00
a8bafde64e add test cfg for lockin 7270
Change-Id: Ic6d66b625feb44e8130266901f1296adcb11f532
2024-01-29 10:58:21 +01:00
Oksana Shliakhtun
17b7a01ce1 Driver for ThermoHaake Phoenix P1 Circulator
Change-Id: I0573eeac2e40b4715072661c819701186733bf94
2024-01-29 10:29:33 +01:00
l_samenv
bc7922f5c8 iono pi max demo (drums)
+ fix spacing in ionopimax.py
2024-01-25 09:40:10 +01:00
9e000528d2 add vacuum furnace cfg file 2024-01-11 16:33:06 +01:00
afb49199a1 fixes in mb11/dil5 cfg files
- add flowpars
- increase om range to -360
- add sea config
2023-12-04 15:45:00 +01:00
l_samenv
ab918a33ae cc: replace bool by enum in cc.hav and cc.nav 2023-11-23 15:56:23 +01:00
67032ff59b ma6: set backlash 2023-10-27 15:11:19 +02:00
06bec41ed3 ma6: make ts drivable 2023-10-02 16:56:23 +02:00
4cd6929d4b fix ma15 sea config 2023-10-02 16:55:42 +02:00
a89f7a3c44 configs for sample heat stick 2023-10-02 16:54:52 +02:00
3b997d7d86 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-09-22 13:29:23 +02:00
612295d360 add ill2 2023-09-22 13:29:04 +02:00
9e39a43193 fix fs config 2023-09-22 13:27:54 +02:00
6adfafaa27 more consistent ori1 stick json file 2023-09-22 13:27:10 +02:00
f6c4090b96 fix simulation
+ some fixed in sim_uniax

Change-Id: Ia8703ed988aa904bb2694339f0d3175b28fcb33e
2023-09-19 16:05:52 +02:00
ecef2b8974 more cfg file fixes
Change-Id: I0ba86cd17bb07f480cac6f20994ee854c6e811ae
2023-09-19 15:04:02 +02:00
l_samenv
96a7e2109b cleanup cfg files 2023-09-19 14:43:48 +02:00
l_samenv
e9a195d61e flamedil as of 2023-07-04 2023-09-19 14:17:08 +02:00
l_samenv
6ac3938b78 flamedil as of 2023-07-03 2023-09-19 14:17:08 +02:00
l_samenv
b4cfdcfc1a flame sample combined T 2023-09-19 14:16:21 +02:00
l_samenv
abf7859fd6 frappy_psi.cryoltd: fixes after frappy upgrade 2023-09-19 14:14:12 +02:00
27600e3ddf fix bad cfg files
Change-Id: Iacba12a2679777dd4ea2892751d82a63221b1361
2023-09-19 14:07:20 +02:00
dee8f8929e Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-09-08 10:46:13 +02:00
2e143963df stickmotor addon: add backlash -1 2023-09-08 10:45:18 +02:00
4bc82c2896 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-09-06 08:39:22 +02:00