Commit Graph

Select branches

Hide Pull Requests

andrea

bluefors

develop

dilsc

dilsc_feb2023

flame

flowsas

hot_lakeshore

logo_new

main

mirror

mupd_wip

new_lakeshore

paul

sinqtmp

tmp

tnmr

trinamic

trinamic_persistent

ultrasound

uniax

uniax_may2021

wip

work_obsolete

v0.20.1-7

Mono Color

• 73800fccc2 muwaba: update to current frappy version wip zolliker 2026-09-15 17:35:13 +02:00
• ded47df30b bin/frappy-scan: fix error in print_answer zolliker 2026-09-15 17:34:17 +02:00
• 09fd5cc8f4 furnaces fi,fs and ft from branch new_cryo bluefors zolliker 2026-09-15 16:20:57 +02:00
• d48c75855a add files for new cryo implementation zolliker 2026-09-15 16:10:51 +02:00
• b12dbcab8e frappy.io.BinaryIO: copy the fix for reducing comm. error message zolliker 2026-09-15 16:09:04 +02:00
• b647f90047 frappy.ctrlby: fixes while making furnace work zolliker 2026-09-15 16:03:10 +02:00
• 3d09eece5a frappy_psi.ccu4: fix typo zolliker 2026-09-15 15:49:12 +02:00
• 8342255296 frappy_psi.bkpower.Output: set target in set_target zolliker 2026-09-15 15:48:33 +02:00
• 4a9ee4f50b clear errors on new day zolliker 2026-09-15 15:46:33 +02:00
• 6a422eb539 fix in HasControlledBy zolliker 2026-09-15 15:44:52 +02:00
• 522c99e3a2 reduce logging of communication error messages zolliker 2026-09-15 15:43:49 +02:00
• 71495aa934 frappy_psi.bridge: changes proposed by claude.ai zolliker 2026-09-11 10:16:31 +02:00
• 574fdabf36 state as of 2026-09-11 HAL 2026-09-11 10:17:11 +02:00
• 09f005665f start bluefors test Diego Gassmann 2026-09-08 09:44:48 +02:00
• f8a97a24b0 state as of 20260904 Diego Gassmann 2026-09-04 09:55:25 +02:00
• 90454292f6 state as of 2026-09-03 Diego Gassmann 2026-09-03 10:32:13 +02:00
• 48f595ecf9 files from pc16672 Diego Gassmann 2026-09-01 15:53:41 +02:00
• 3715b082a7 state as of 2026-09-01 Diego Gassmann 2026-09-01 15:50:55 +02:00
• 6b4383cffc changes after testing new_lakeshore stark_a 2026-09-02 15:50:57 +02:00
• 2e0b800d0c some fixes in frappy_psi.lakeshore/lakeshore370 HAL 2026-09-02 08:07:37 +02:00
• 17787359bb frappy_psi.softcal: allow ':' in FRAPPY_CALIB_PATH zolliker 2026-08-31 15:57:44 +02:00
• 23fc0ff629 frappy_psi.haake: make it possible to use the extra sensor only zolliker 2026-08-28 09:44:51 +02:00
• 41b4156401 implemented frappy scripts needed by DIL5 zolliker 2026-08-12 16:49:37 +02:00
• 66027107b6 frappy_psi.raspberry: improve description of Properties zolliker 2026-08-28 08:08:04 +02:00
• 7112f26ffa frappy_psi.thermofisher: fix missing import of Limit zolliker 2026-08-27 18:29:05 +02:00
• ce3d4e2a75 add pt-100 to all wabas zolliker 2026-08-27 17:54:17 +02:00
• a27a9e423a add Pt-100 sensor via SPI to waba1 zolliker 2026-08-27 17:50:34 +02:00
• d04b372199 State as of 19.08.26 stark_a 2026-08-19 17:28:01 +02:00
• 2f3bfeeefc State as of 19.08.26 stark_a 2026-08-19 14:37:38 +02:00
• 5d855eafc8 frappy_psi.ahcapbridge: capacitance need more digits than by default zolliker 2026-08-13 17:27:39 +02:00
• f8494e8a33 frappy_psi.picontrol: reset overflow to 0 on when changing target zolliker 2026-08-13 17:26:49 +02:00
• 50a43179a1 frappy_psi.k2601b: allow parameter 'active' to be written zolliker 2026-08-13 16:36:06 +02:00
• 6fa4698648 DIL5: improved version after tests 2026-08-12 zolliker 2026-08-12 16:45:02 +02:00
• ea0260e586 state as of 12.08.26 stark_a 2026-08-12 16:24:08 +02:00
• a9047ca6f4 remove type annotations zolliker 2026-07-30 08:10:10 +02:00
• c32d8cd21c state as of 01.07.2026, fixing merge conflicts stark_a 2026-07-01 16:43:48 +02:00
• 100cd62189 frappy_psi.mercury.IO.communicate: use UTF-8 for cmd and reply zolliker 2026-07-07 09:26:24 +02:00
• 4ac24459ec lakeshore: fix get_calib_state zolliker 2026-07-06 14:35:11 +02:00
• 0251d52f65 jtccr: add more logic zolliker 2026-07-06 14:34:25 +02:00
• 2c389082f2 implement frappy scripts zolliker 2026-08-11 15:51:11 +02:00
• cfdb637f5d frappy_psi.picontrol: fix error in overflow line fit DIL5 2026-08-11 15:47:15 +02:00
• 102358b933 dil5: minor adjustments l_samenv 2026-06-09 17:08:51 +02:00
• 1cf8b9eee4 DIL5: implement sorb_pump and remove zolliker 2026-08-05 17:33:52 +02:00
• e91b61dc0b state as of 05.08.26 stark_a 2026-08-05 17:23:48 +02:00
• da96ac54e3 frappy_psi.mercury.IO.communicate: use UTF-8 for cmd and reply zolliker 2026-07-07 09:26:24 +02:00
• 7103b8c0da lakeshore: fix get_calib_state zolliker 2026-07-06 14:35:11 +02:00
• 1d44dd2895 jtccr: add more logic zolliker 2026-07-06 14:34:25 +02:00
• 7be29bc4d1 state as of 6.7.2026 zolliker 2026-07-06 10:17:23 +02:00
• 8ab30428a7 mupd: various fixes frappy_psi.dpm/trinamic mupd_wip zolliker 2026-07-03 17:30:33 +02:00
• 040945dbaa frappy_psi.dpm: fix offset zolliker 2026-06-26 16:45:04 +02:00
• a4ede7cfef state as of 01.07.2026 stark_a 2026-07-01 16:43:48 +02:00
• 18ee68190f add more info when calcurve not found zolliker 2026-06-29 14:35:06 +02:00
• 25b9601dca lakeshore: remove leftover from an earlier attemt zolliker 2026-06-19 07:55:43 +02:00
• 733bbcbabf frappy_psi.dpm: change scale_factor by 1e6 zolliker 2026-06-26 15:43:55 +02:00
• 8258d0a3ef make starting a parameter tnmr unknown 2026-06-24 17:06:34 +02:00
• c82ee52b9d update configuration unknown 2026-06-24 16:43:42 +02:00
• 41d8d5c16a HasIO: remove base class limitation for attached io zolliker 2026-06-24 11:30:44 +02:00
• 8f46b741a1 frappy_psi.softcal: improve error message when calcurve is missing zolliker 2026-06-24 11:29:58 +02:00
• 12b6f494b8 frappy_psi.oiclassic: fix levels zolliker 2026-06-24 11:28:16 +02:00
• 0e9d40ff2a electromagnet: set busy status before returning from write_target zolliker 2026-06-24 11:24:57 +02:00
• 6e5a08b194 cfg/addons/leidenexp: changes in 'calibsetup stark_a 2026-06-17 16:10:03 +02:00
• fe1e2ac87b leiden config: versions as of 2026-06-17 zolliker 2026-06-17 15:54:00 +02:00
• 9d7ee8ef9e frappy_psi.jtccr: minor changes stark_a 2026-06-17 10:31:56 +02:00
• 7076d0b105 cfg.electromagnet_test_cfg: minor changes stark_a 2026-06-17 10:31:40 +02:00
• 3064ab8f1c uniax: state as of 2026-06-15 zolliker 2026-06-10 14:05:02 +02:00
• de7db4c1c7 dil5: fix errors after merge with version from gas10ka l_samenv 2026-06-09 15:58:12 +02:00
• dfa26d9daf capillary heater: heater is now a writable zolliker 2025-11-27 17:55:52 +01:00
• a71ea3baed frappy_psi.logo: revised version after merging capillary heater zolliker 2025-11-27 09:00:07 +01:00
• 777d39dcd5 dil5: add sorb_heater and still_heater, fix several issues logo_new l_samenv 2026-06-09 14:10:55 +02:00
• 9127333ac5 frappy_psi.trinamic: fix handling with no limit switches zolliker 2026-06-05 15:45:54 +02:00
• 82697a1e42 fix typo in frappy_psi/softcal.py zolliker 2026-06-05 15:45:21 +02:00
• f83af8fcf5 add water baths waba1..5 zolliker 2026-05-29 10:46:55 +02:00
• 8547005a72 frappy_psi.phytron: treat disabled limits switches properly zolliker 2026-05-28 08:38:48 +02:00
• 458174d281 frappy_psi.sea: add log info for sea port nuber zolliker 2026-05-28 08:38:14 +02:00
• 7ce1a0ff74 leiden dilution: a lot of fixes zolliker 2026-05-26 15:13:58 +02:00
• 21f8eeae1e jtccr: fixes while testing zolliker 2026-05-26 08:50:58 +02:00
• fb4a877751 add femto giga switch (untested) zolliker 2026-05-21 11:22:48 +02:00
• 26ac0052d1 move and fix leidenghs config zolliker 2026-05-21 11:19:57 +02:00
• 903ea1c113 updates calculation of offset calibrated field magnitude Babs krieger_j 2026-05-21 10:31:16 +02:00
• 74611ac7b2 added calculation for Hallprobe calibrated Field offsets krieger_j 2026-05-20 18:39:23 +02:00
• b23ecec7b0 frappy_psi.ValvesHP for capillary rhexometry mondal_s 2026-05-21 10:03:58 +02:00
• 41c4fed14d frappy_psi.electromagnet: do not call write_main_switch zolliker 2026-05-21 10:00:07 +02:00
• 1c2c6077b8 frappy_psi.electromagnet: further improvements zolliker 2026-05-18 15:24:26 +02:00
• d4b796ee8e frappy_psi.phytron: implement absolute encoder properly zolliker 2026-05-18 15:23:06 +02:00
• 26340545a6 frappy_psi/magfield: fix status of SimpleMagfield zolliker 2026-05-20 13:59:29 +02:00
• 875161b29b frappy.client.interactive: fix error handling while interrupted zolliker 2026-05-18 09:38:19 +02:00
• 286828279c make main_switch and ramp read only zolliker 2026-05-18 09:31:33 +02:00
• 5d6b295114 frappy_psi.dilution: improvements on DIL4 zolliker 2026-05-15 17:38:02 +02:00
• c9f1b1ae67 frappy_psi.oiclassic: make communication more robust zolliker 2026-05-15 17:37:41 +02:00
• 0b2509f432 frappy_psi.electromagnet: further fixes zolliker 2026-05-15 17:36:37 +02:00
• 2680f8dafb frappy_psi/electromagnet: improve write safety zolliker 2026-05-15 16:46:30 +02:00
• 1b17360f0b cfg.emagnet: minor changes zolliker 2026-05-13 17:12:09 +02:00
• d4b507dadb frappy_psi.electromagnet: adapt sample holder module zolliker 2026-05-13 17:11:33 +02:00
• f80f1d06b0 cfg.electromagnet_test: add sample position module stark_a 2026-05-13 13:06:22 +02:00
• dc7cda05bc frappy_psi.electromagnet: add sample position class stark_a 2026-05-13 13:05:50 +02:00
• 4fb54b2448 update flamesample zolliker 2026-05-12 16:40:49 +02:00
• 5d30f45d05 frappy_psi.ls372: fixes zolliker 2026-05-12 15:04:14 +02:00
• a34e6c6a9a frappy_psi.phytron: fixed issues with limit switches for e-magnet zolliker 2026-05-12 14:40:54 +02:00
• 80ec0fd3e1 cfg.electromagnet: minor changes stark_a 2026-05-06 17:03:15 +02:00
• 808f718d4a frappy_psi.electromagnet: add read and write functionality stark_a 2026-05-06 17:02:52 +02:00