From bebf1b0a13d16b4c921f3cd2ca40dbe2ac996cdb Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Fri, 17 Sep 2021 08:41:30 +0200
Subject: [PATCH 1/2] jungfrau 2.0 calibrated settings

---
 .../jungfrauDetectorServer/slsDetectorServer_defs.h  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
index fb8f81312..36454c925 100644
--- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
@@ -4,7 +4,7 @@
 
 #define MIN_REQRD_VRSN_T_RD_API  0x171220
 #define REQRD_FRMWRE_VRSN_BOARD2 0x210831 // 1.0 pcb (version = 010)
-#define REQRD_FRMWRE_VRSN        0x210622 // 2.0 pcb (version = 011)
+#define REQRD_FRMWRE_VRSN        0x210910 // 2.0 pcb (version = 011)
 
 #define CTRL_SRVR_INIT_TIME_US (300 * 1000)
 
@@ -144,7 +144,7 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };
 // 2.0 pcb
 #define SAMPLE_ADC_FULL_SPEED                                                  \
     (SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_0_VAL +                 \
-     SAMPLE_DGTL_SAMPLE_1_VAL + SAMPLE_DECMT_FACTOR_FULL_VAL) // 0x100
+     SAMPLE_DGTL_SAMPLE_1_VAL + SAMPLE_DECMT_FACTOR_FULL_VAL) // 0x0100
 #define SAMPLE_ADC_HALF_SPEED                                                  \
     (SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_1_VAL +                 \
      SAMPLE_DGTL_SAMPLE_3_VAL + SAMPLE_DECMT_FACTOR_HALF_VAL) // 0x1310
@@ -159,13 +159,13 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };
     (SAMPLE_ADC_SAMPLE_0_VAL + SAMPLE_ADC_DECMT_FACTOR_1_VAL +                 \
      SAMPLE_DGTL_SAMPLE_6_VAL + SAMPLE_DECMT_FACTOR_QUARTER_VAL) // 0x2610
 
-#define ADC_PHASE_FULL_SPEED           (150) // 2.0 pcb
-#define ADC_PHASE_HALF_SPEED           (200) // 2.0 pcb
-#define ADC_PHASE_QUARTER_SPEED        (200) // 2.0 pcb
+#define ADC_PHASE_FULL_SPEED           (175) // 2.0 pcb
+#define ADC_PHASE_HALF_SPEED           (175) // 2.0 pcb
+#define ADC_PHASE_QUARTER_SPEED        (175) // 2.0 pcb
 #define ADC_PHASE_HALF_SPEED_BOARD2    (110)  // 1.0 pcb (2 resistor network)
 #define ADC_PHASE_QUARTER_SPEED_BOARD2 (220)  // 1.0 pcb (2 resistor network)
 
-#define DBIT_PHASE_FULL_SPEED           (85)  // 2.0 pcb
+#define DBIT_PHASE_FULL_SPEED           (100) // 2.0 pcb
 #define DBIT_PHASE_HALF_SPEED           (150) // 2.0 pcb
 #define DBIT_PHASE_QUARTER_SPEED        (150) // 2.0 pcb
 #define DBIT_PHASE_HALF_SPEED_BOARD2    (150) // 1.0 pcb (2 resistor network)

From b7e8343ca472791fe8b9290c6decbaa8de7cdde6 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Fri, 17 Sep 2021 08:42:48 +0200
Subject: [PATCH 2/2] binaries in

---
 .../bin/jungfrauDetectorServer_developer      | Bin 272028 -> 272028 bytes
 slsSupportLib/include/sls/versionAPI.h        |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index 2a1a25a364f4d90e167a3275fade646ad0f4f993..e603c7ac0740bb133c95d05ed8d37e42a7084662 100755
GIT binary patch
delta 104
zcmbPpR$$IqfeD(-E*1}`e@tYS*yys3iAjKS^B1NBR!MPA#stO}3=9GcU;tz}JXB<0
zcqqO(mqXf=eLaK1ZiR;_llyHm8P`w#X<N>?esiJSP9a9|X6?Xs?LbB#X4<YD$Xs|8
E0Kmr~G5`Po

delta 104
zcmbPpR$$IqfeD(-&Jp{ke@tYS*yys3iAjlV^B1NBR!K2V#stO}3=9GcU;tz}JXB<0
zcqq0xmqXf=eHw$pZiR=TllyHm8Ba|9X<N>CVsoM0P9a9IX6?Xs?LbB#X4<YD$Xs|8
E0K+RGMF0Q*

diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h
index 431aab529..1fa5279d1 100644
--- a/slsSupportLib/include/sls/versionAPI.h
+++ b/slsSupportLib/include/sls/versionAPI.h
@@ -8,6 +8,6 @@
 #define APICTB 0x210916
 #define APIGOTTHARD 0x210916
 #define APIGOTTHARD2 0x210916
-#define APIJUNGFRAU 0x210916
 #define APIMYTHEN3 0x210916
 #define APIMOENCH 0x210916
+#define APIJUNGFRAU 0x210917