Commit Graph
1622 Commits
Author SHA1 Message Date
stark_a 9d7ee8ef9e frappy_psi.jtccr: minor changes 2026-06-17 10:32:20 +02:00
stark_a 7076d0b105 cfg.electromagnet_test_cfg: minor changes 2026-06-17 10:32:20 +02:00
zolliker 3064ab8f1c uniax: state as of 2026-06-15 2026-06-15 12:00:31 +02:00
l_samenv de7db4c1c7 dil5: fix errors after merge with version from gas10ka
- Interlock: initialize _mismatch in initModule
- set_vm_value: round also when no scale is used
- airpressure is a flag, not a value -> threshold=0.5
2026-06-09 16:08:06 +02:00
zollikerandl_samenv dfa26d9daf capillary heater: heater is now a writable
The value should show the actual heater power, but
we do not know yet the address. Currently the value
is just equal to the maxheater parameter.
2026-06-09 16:08:06 +02:00
zollikerandl_samenv a71ea3baed frappy_psi.logo: revised version after merging capillary heater
- check that dil5 still works!

Change-Id: Ibe98e64088f2f886888af170a1f38d699927eb58
2026-06-09 16:08:06 +02:00
l_samenv 80decb21cf dil5: add sorb_heater and still_heater, fix several issues 2026-06-09 14:10:55 +02:00
zolliker 775566d57a frappy_psi.trinamic: fix handling with no limit switches 2026-06-05 15:45:54 +02:00
zolliker a58bec0201 fix typo in frappy_psi/softcal.py 2026-06-05 15:45:21 +02:00
zolliker aa3c2f7c81 add water baths waba1..5 2026-05-29 10:46:55 +02:00
zolliker 3a3064a133 frappy_psi.phytron: treat disabled limits switches properly 2026-05-28 08:38:48 +02:00
zolliker 653a792ce8 frappy_psi.sea: add log info for sea port nuber 2026-05-28 08:38:14 +02:00
zolliker b34e3c3c3e leiden dilution: a lot of fixes 2026-05-26 15:15:09 +02:00
zolliker c64135318b jtccr: fixes while testing 2026-05-26 08:50:58 +02:00
zolliker e6d65bdea5 add femto giga switch (untested) 2026-05-21 11:24:07 +02:00
zolliker 207c92898c move and fix leidenghs config 2026-05-21 11:24:07 +02:00
krieger_jandzolliker de664af9eb updates calculation of offset calibrated field magnitude Babs 2026-05-21 10:50:12 +02:00
krieger_jandzolliker 4ae0041421 added calculation for Hallprobe calibrated Field offsets 2026-05-21 10:50:12 +02:00
mondal_sandzolliker 5829ec6474 frappy_psi.ValvesHP for capillary rhexometry 2026-05-21 10:05:52 +02:00
zolliker 32c5c8f96e frappy_psi.electromagnet: do not call write_main_switch 2026-05-21 10:00:50 +02:00
zolliker 701759393c frappy_psi.electromagnet: further improvements 2026-05-21 10:00:50 +02:00
zolliker 95cf793178 frappy_psi.phytron: implement absolute encoder properly
- issues with power down detection
2026-05-21 10:00:50 +02:00
zolliker e5a78b84a7 frappy_psi/magfield: fix status of SimpleMagfield
+ improve error message when converting to enum datatype
2026-05-20 14:00:52 +02:00
zolliker 0decbf52d2 frappy.client.interactive: fix error handling while interrupted
Change-Id: If79ebe322eb865fd0780622fdd357c092bf12216
2026-05-18 09:38:19 +02:00
zolliker a0e250d638 make main_switch and ramp read only
this seems not to be changeable over the interface
+ improve status text while and after stopping

Change-Id: I83b301bdaba152d1e7bf843cd8d5172ca5307faa
2026-05-18 09:31:33 +02:00
zolliker ed22bb659a frappy_psi.dilution: improvements on DIL4
Change-Id: I204eaa8ef7a5d4a868c7ca8b17e2ebdae3cd9884
2026-05-15 17:38:33 +02:00
zolliker 68d678b32a frappy_psi.oiclassic: make communication more robust
Change-Id: I4de0c7d1e2db930e38c464e797f23befb7679e31
2026-05-15 17:38:33 +02:00
zolliker 7a5d71d1cf frappy_psi.electromagnet: further fixes 2026-05-15 17:36:37 +02:00
zolliker d884c00204 frappy_psi/electromagnet: improve write safety
- move mf._data to io_mf.data
- add more info to data: data_size, name_pos
- check if name matches before write

Change-Id: Ibf544acb5f350a5a4dd6f5866148b95bea50ff86
2026-05-15 16:46:30 +02:00
zolliker fdaacc0b5b cfg.emagnet: minor changes 2026-05-13 17:12:09 +02:00
zolliker 32dee33fac frappy_psi.electromagnet: adapt sample holder module 2026-05-13 17:11:33 +02:00
stark_a 633af3bb52 cfg.electromagnet_test: add sample position module 2026-05-13 13:06:22 +02:00
stark_a 8a1ee235a2 frappy_psi.electromagnet: add sample position class 2026-05-13 13:05:50 +02:00
zolliker c65e7aa07c update flamesample
including fixes on frappy_psi.ls372
2026-05-12 16:40:49 +02:00
zolliker fa76d87e19 frappy_psi.ls372: fixes
Change-Id: Iba85a2a6539da541f9914cc083659d387189ccb3
2026-05-12 15:04:14 +02:00
zolliker 37b23ea0af frappy_psi.phytron: fixed issues with limit switches for e-magnet
Change-Id: I4efe1a8465a48c14af11973791dd3bd8faa21452
2026-05-12 14:40:54 +02:00
stark_a e9c9bd7003 cfg.electromagnet: minor changes 2026-05-06 17:03:55 +02:00
stark_a 48323e1336 frappy_psi.electromagnet: add read and write functionality 2026-05-06 17:03:55 +02:00
zolliker 5f01f135b1 frappy_psi/trinamic: fix home export
Change-Id: Ic903ae96dac288ed681842fc17fca867a08d758c
2026-05-06 16:12:18 +02:00
zolliker cd5dfb299f add mupd config file
Change-Id: I594596ca9b4bcc681fe42f6e1720268daaa3e15b
2026-05-06 16:09:56 +02:00
zolliker 6e49aeb61f test_attach: fix io test after uri went a parameter
Change-Id: Iad7da73d1abae549bbba83acd2a5f8199c19f908
2026-05-06 16:05:04 +02:00
zolliker fe368e64ab frappy_psi/trinamic: fix target reached criterium
Change-Id: I6edd0537ab401f04e6c7464d9e12ea10d04c5ec5
2026-05-06 16:02:56 +02:00
zolliker 331f3e02b1 [WIP] superfrappy: state as of 2026-05-06
Change-Id: Ifd83a297dd5593db502bb2c0f6ec1c99717d4a4a
2026-05-06 16:02:02 +02:00
zolliker 8cb0844ac8 frappy_psi.trinamic: various importments with limit switches
Change-Id: I112f12f1b6485c1af88648e4c1c420e5002b047c
2026-05-04 16:17:46 +02:00
zolliker b6fb14250c frappy_psi.softcal: allow blank instead of comma in file path
Change-Id: Ied7b0e72ca6e2ab09c232aa915139ea5d7620951
2026-05-04 16:16:43 +02:00
zolliker 949bacca63 frappy_psi.sea: allow multiple paths for the sea json config
Change-Id: Id9cc99e5599bde40929df6958232513c7c60bc44
2026-05-04 16:14:41 +02:00
zolliker 2559f369a3 frappy_psi/dpm: implement interlock to motor when load to high
Change-Id: Ia82e5c28f8961d2ee5b89b14dc2ae4a497cc3b2f
2026-05-04 16:13:36 +02:00
zolliker 49c7de72d3 add Module.setExport to change the export flag
Change-Id: I245845e30cf51ba762ac9b949a0adf188bf16efc
2026-05-04 16:12:27 +02:00
zolliker 540ad23d24 frappy_psi.dpm: replace initwrite by value=2
initwrite seems not to work anymore
2026-04-29 11:28:11 +02:00
zolliker 8aad4b10a7 sea: simplify retrieving sea port number
Change-Id: I9d636d51cd4abd6849b3b87b4cb136b6ac193051
2026-04-24 09:17:52 +02:00