From bf26533fd81b114fb60ee6ca6fd4602b7766c023 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 5 Oct 2023 10:28:51 +0200 Subject: [PATCH] 8.0.0.rc: jf fix pedestal (#820) * jf pedestal fix: touch enable bit last --- .../bin/jungfrauDetectorServer_developer | Bin 312272 -> 312272 bytes .../slsDetectorFunctionList.c | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 30f790a2b3345fed18be6082b2c44944e89cc831..11d6ed3870be5b94dac8bc609169df164a7a68a7 100755 GIT binary patch delta 115 zcmcc6E_|U~c!DOgYz4>kz-P=78(lI&gnuMEJY@Lq7!t6P;qlX1Ao9oL^C6N3SHbKT zvzm@IFgN;x#Ls|5?$6>duvqRG1`;_87P$r#`RUcn5!%iX$_T_vK+L?IBb4Pt9stAs BG8O;; delta 115 zcmcc6E_|U~c!DOgXaV>1z-P=78(lI&lz(~!>|}WSVit(}J&VKON3z31hX0NsApTvj z=!ePsLnIZ>g4qvdH63eUZuAGq9s!G72kNm{?ikk05!%iX$_T_vK+L?IBb4Pt9stx9 BG7|s* diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index 0060ce55a..a3972d215 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -2552,8 +2552,7 @@ void setPedestalMode(int enable, uint8_t frames, uint16_t loops) { if (enable) { LOG(logINFOBLUE, ("Enabling pedestal mode [frames: %hhu, loops: %hu]\n", frames, loops)); - // enable - bus_w(addr, bus_r(addr) | PEDESTAL_MODE_ENBLE_MSK); + // frames bus_w(addr, bus_r(addr) & ~PEDESTAL_MODE_LNGTH_MSK); bus_w(addr, bus_r(addr) | ((frames << PEDESTAL_MODE_LNGTH_OFST) & @@ -2562,6 +2561,8 @@ void setPedestalMode(int enable, uint8_t frames, uint16_t loops) { bus_w(addr, bus_r(addr) & ~PEDESTAL_MODE_ITRTNS_MSK); bus_w(addr, bus_r(addr) | ((loops << PEDESTAL_MODE_ITRTNS_OFST) & PEDESTAL_MODE_ITRTNS_MSK)); + // enable + bus_w(addr, bus_r(addr) | PEDESTAL_MODE_ENBLE_MSK); // if it was switched off before, remember the #frames and #triggers if (prevPedestalEnable == 0) {