Commit Graph
1594 Commits
Author SHA1 Message Date
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
zolliker 9ab679eb6a frappy.io: make uri a parameter
Change-Id: I971ca513622079a4710ddebcddcf9edeba5e49db
2026-06-09 14:21:21 +02:00
zolliker 15ec8cbf5f frappy_psi.ahcapbridge: improve serial echo recover mechanism
99 tries instead of 3

Change-Id: If86fb9ef7bbb48a0c988f641e4033a9b58b13f28
2026-06-09 14:21:21 +02:00
stark_aandzolliker acb8c15090 frappy_psi: minor changes 2026-06-09 14:21:21 +02:00
stark_aandzolliker 040fe51e71 cfg: add electromagnet test cfg 2026-06-09 14:21:21 +02:00
stark_aandzolliker 62fe2a86ba frappy_psi: add electromagnet (IO read implemented) 2026-06-09 14:21:21 +02:00
stark_aandzolliker 45b3246a8b cfg.cp2800: add file 2026-06-09 14:21:21 +02:00
stark_aandzolliker e8bc100329 frappy_psi.CP2800: add file 2026-06-09 14:21:21 +02:00
zolliker 7bfd79b1e3 frappy_psi.bronkhorst: fixes during test 2026-06-09 14:21:21 +02:00
zolliker 81282167c3 frappy-psi.jtccr: fixes, use parameters instead of properties
limit should be visible and should also be modifiable for test
purposes

+ remove vm (as it is not connected and may be removed later)
2026-06-09 14:21:21 +02:00
zolliker cf6592da53 frappy_psi.lakeshore: improved calcurve handling
instead of keeping track a lookup for curve keys and
of empty curves, loop over curve_cache. this is easier code
and not a real performace problem
2026-06-09 14:21:21 +02:00
zolliker bdfa1d1a38 frappy_psi.hepump: check conn. before reading digital inputs
trinamic: export input3 if available
Change-Id: Idacfb92a37ab8a8a5d7bb7502d23a9f3c6d962e7
2026-06-09 14:21:21 +02:00
zolliker 5d1874b138 frappy_psi.lakeshore: split out model dependent part
Change-Id: I02eed008c1e6e29f9d2c2a2dfb2086a62407dd60
2026-06-09 14:21:21 +02:00
stark_aandzolliker 7dd2df5401 cfg.fungen_test: minor changes 2026-06-09 14:21:21 +02:00
stark_aandzolliker 9f19d0a5cd frappy_psi.fungen: tested and adapted 2026-06-09 14:21:21 +02:00
zolliker d81ba8f403 frappy_psi.ccracks: fix missing Param call / lsc_model 2026-06-09 14:21:21 +02:00
zolliker 28c8e197b0 frappy.verion: cosmetic fix intendation 2026-06-09 14:21:21 +02:00
zolliker 2a72a94f4a further work on superfrappy 2026-06-09 14:21:21 +02:00
zolliker 6f717f6a03 add superfrappy 2026-06-09 14:21:21 +02:00
stark_aandzolliker 565956e5e3 cfg: add fungen_cfg 2026-06-09 14:21:21 +02:00
stark_aandzolliker 1081def4c6 frappy_psi: add fungen (not tested) 2026-06-09 14:21:21 +02:00
zolliker c8e1d9de2e fixes after first test with JTCCR 2026-06-09 14:21:21 +02:00