Commit Graph
1615 Commits
Author SHA1 Message Date
zolliker f83af8fcf5 add water baths waba1..5 2026-06-09 14:21:22 +02:00
zolliker 8547005a72 frappy_psi.phytron: treat disabled limits switches properly 2026-06-09 14:21:22 +02:00
zolliker 458174d281 frappy_psi.sea: add log info for sea port nuber 2026-06-09 14:21:22 +02:00
zolliker 7ce1a0ff74 leiden dilution: a lot of fixes 2026-06-09 14:21:22 +02:00
zolliker 21f8eeae1e jtccr: fixes while testing 2026-06-09 14:21:22 +02:00
zolliker fb4a877751 add femto giga switch (untested) 2026-06-09 14:21:22 +02:00
zolliker 26ac0052d1 move and fix leidenghs config 2026-06-09 14:21:22 +02:00
krieger_jandzolliker 903ea1c113 updates calculation of offset calibrated field magnitude Babs 2026-06-09 14:21:22 +02:00
krieger_jandzolliker 74611ac7b2 added calculation for Hallprobe calibrated Field offsets 2026-06-09 14:21:22 +02:00
mondal_sandzolliker b23ecec7b0 frappy_psi.ValvesHP for capillary rhexometry 2026-06-09 14:21:22 +02:00
zolliker 41c4fed14d frappy_psi.electromagnet: do not call write_main_switch 2026-06-09 14:21:22 +02:00
zolliker 1c2c6077b8 frappy_psi.electromagnet: further improvements 2026-06-09 14:21:22 +02:00
zolliker d4b796ee8e frappy_psi.phytron: implement absolute encoder properly
- issues with power down detection
2026-06-09 14:21:22 +02:00
zolliker 26340545a6 frappy_psi/magfield: fix status of SimpleMagfield
+ improve error message when converting to enum datatype
2026-06-09 14:21:22 +02:00
zolliker 875161b29b frappy.client.interactive: fix error handling while interrupted
Change-Id: If79ebe322eb865fd0780622fdd357c092bf12216
2026-06-09 14:21:22 +02:00
zolliker 286828279c 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-06-09 14:21:22 +02:00
zolliker 5d6b295114 frappy_psi.dilution: improvements on DIL4
Change-Id: I204eaa8ef7a5d4a868c7ca8b17e2ebdae3cd9884
2026-06-09 14:21:22 +02:00
zolliker c9f1b1ae67 frappy_psi.oiclassic: make communication more robust
Change-Id: I4de0c7d1e2db930e38c464e797f23befb7679e31
2026-06-09 14:21:22 +02:00
zolliker 0b2509f432 frappy_psi.electromagnet: further fixes 2026-06-09 14:21:22 +02:00
zolliker 2680f8dafb 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-06-09 14:21:22 +02:00
zolliker 1b17360f0b cfg.emagnet: minor changes 2026-06-09 14:21:22 +02:00
zolliker d4b507dadb frappy_psi.electromagnet: adapt sample holder module 2026-06-09 14:21:22 +02:00
stark_aandzolliker f80f1d06b0 cfg.electromagnet_test: add sample position module 2026-06-09 14:21:22 +02:00
stark_aandzolliker dc7cda05bc frappy_psi.electromagnet: add sample position class 2026-06-09 14:21:22 +02:00
zolliker 4fb54b2448 update flamesample
including fixes on frappy_psi.ls372
2026-06-09 14:21:22 +02:00
zolliker 5d30f45d05 frappy_psi.ls372: fixes
Change-Id: Iba85a2a6539da541f9914cc083659d387189ccb3
2026-06-09 14:21:22 +02:00
zolliker a34e6c6a9a frappy_psi.phytron: fixed issues with limit switches for e-magnet
Change-Id: I4efe1a8465a48c14af11973791dd3bd8faa21452
2026-06-09 14:21:21 +02:00
stark_aandzolliker 80ec0fd3e1 cfg.electromagnet: minor changes 2026-06-09 14:21:21 +02:00
stark_aandzolliker 808f718d4a frappy_psi.electromagnet: add read and write functionality 2026-06-09 14:21:21 +02:00
zolliker 81c732a217 frappy_psi/trinamic: fix home export
Change-Id: Ic903ae96dac288ed681842fc17fca867a08d758c
2026-06-09 14:21:21 +02:00
zolliker 98fa22432b add mupd config file
Change-Id: I594596ca9b4bcc681fe42f6e1720268daaa3e15b
2026-06-09 14:21:21 +02:00
zolliker 65caa47e43 test_attach: fix io test after uri went a parameter
Change-Id: Iad7da73d1abae549bbba83acd2a5f8199c19f908
2026-06-09 14:21:21 +02:00
zolliker d60ba4c101 frappy_psi/trinamic: fix target reached criterium
Change-Id: I6edd0537ab401f04e6c7464d9e12ea10d04c5ec5
2026-06-09 14:21:21 +02:00
zolliker 4241f709df [WIP] superfrappy: state as of 2026-05-06
Change-Id: Ifd83a297dd5593db502bb2c0f6ec1c99717d4a4a
2026-06-09 14:21:21 +02:00
zolliker 87b68d797d frappy_psi.trinamic: various importments with limit switches
Change-Id: I112f12f1b6485c1af88648e4c1c420e5002b047c
2026-06-09 14:21:21 +02:00
zolliker 35b7843303 frappy_psi.softcal: allow blank instead of comma in file path
Change-Id: Ied7b0e72ca6e2ab09c232aa915139ea5d7620951
2026-06-09 14:21:21 +02:00
zolliker 20599d57bc frappy_psi.sea: allow multiple paths for the sea json config
Change-Id: Id9cc99e5599bde40929df6958232513c7c60bc44
2026-06-09 14:21:21 +02:00
zolliker 2b1b614962 frappy_psi/dpm: implement interlock to motor when load to high
Change-Id: Ia82e5c28f8961d2ee5b89b14dc2ae4a497cc3b2f
2026-06-09 14:21:21 +02:00
zolliker 91f2720f9f add Module.setExport to change the export flag
Change-Id: I245845e30cf51ba762ac9b949a0adf188bf16efc
2026-06-09 14:21:21 +02:00
zolliker a6f5e8fccc frappy_psi.dpm: replace initwrite by value=2
initwrite seems not to work anymore
2026-06-09 14:21:21 +02:00
zolliker ec913278a7 sea: simplify retrieving sea port number
Change-Id: I9d636d51cd4abd6849b3b87b4cb136b6ac193051
2026-06-09 14:21:21 +02:00
zolliker 1b63acbe50 frappy_psi.attocube: cosmetic fixes
Change-Id: I0211fed9b8cf7993bd0fed0a25486e7339dafdc5
2026-06-09 14:21:21 +02:00
zolliker e6c0a4c09b frappy_psi/sea: quick fix 2026-06-09 14:21:21 +02:00
zolliker c5f423c05b add various changes to superfrappy
not 100 % sure about the best state ...
2026-06-09 14:21:21 +02:00
zolliker 086aaf6564 fix frappy_psi.trinamic.Motor.read_status and other things
- timing to check if motor does no longer move was not correcct
- added disable_left/disable_right
- make error status more nice (join list)

Change-Id: Ide37450789456658a9180670ae71db735610b282
2026-06-09 14:21:21 +02:00
zolliker f1d9e69f75 fix automatic io creation after IO.uri changed to be a parameter
Change-Id: Ia1e5634ac3aa3d090bab614c4908e9137c123647
2026-06-09 14:21:21 +02:00
zolliker fa2e23af08 leiden GHS: make pressure scale a parameter
Change-Id: I75b919030950ea68a89f92e9ebe23f1d9c5893d8
2026-06-09 14:21:21 +02:00
zolliker 49ae62953a jtccr: change units to mbar
+ some other fixes

Change-Id: I84fbfccbc89ea1a0dfa39beab21cf041d8628558
2026-06-09 14:21:21 +02:00
zolliker 290899a24a [WIP] add superfrappy changes
this is work in progress

Change-Id: I6474494bfc9d92ae176b8db80ea408985a0a7130
2026-06-09 14:21:21 +02:00
zolliker ed8be8765a change sea to use linsetools
TODO: this should support both, servicemanager and linsetools
Change-Id: Ic52c657e1993a0b52127d87d01720dd0cfe7cad7
2026-06-09 14:21:21 +02:00