From d34f396ef826f8bb1b92468f2941a4354b38effe Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Thu, 5 Oct 2023 10:29:33 +0200
Subject: [PATCH] Dev/jf/fix pedestal (#821)

* 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..93d1e3bc84a0a8f24efbe0fe552dc093b580ff48 100755
GIT binary patch
delta 115
zcmcc6E_|U~c!DOgY}L)_fzOyFHo9bl2>(cSc*yYIF(hCo!{ev3K;)0f=R+h7u7cSw
zW;GpaU~cpWiJt+B+@Hl^V6ogW3?y<GEOHGf^3$uCBeb0(lo5!TfS7qZM<~mQJOCNT
BGU)&S

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) {