900/jungfrau temp control default enable (#1041)

* jungfrau: enabling temp control by default at server startup
slsdetectorgroup · Nov 21, 2024 · 0b6d0f9 · 0b6d0f9
1 parent d128d44
commit 0b6d0f9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/RELEASE.txt b/RELEASE.txt
@@ -111,6 +111,13 @@ This document describes the differences between v9.0.0 and v8.0.2
         getMaxClockPhaseShift
 
 
+    *   [Jungfrau] Temperature Control
+        Temperature control is enabled by default at on-board detector server 
+        startup. 
+        As before, the default temperature threshold is 65°C and crossing this
+        value will set a temperature event.
+
+
 
 2.2 Resolved or Changed Features
 ================================

diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv9.0.0 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv9.0.0
diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
@@ -555,6 +555,7 @@ void setupDetector() {
     setNextFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
 
     // temp threshold and reset event
+    setTemperatureControl(DEFAULT_TMP_CNTRL);
     setThresholdTemperature(DEFAULT_TMP_THRSHLD);
     setTemperatureEvent(0);
     if (getChipVersion() == 11) {

diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
@@ -48,6 +48,7 @@
 #define DEFAULT_SETTINGS                 (GAIN0)
 #define DEFAULT_GAINMODE                 (DYNAMIC)
 #define DEFAULT_TX_UDP_PORT              (0x7e9a)
+#define DEFAULT_TMP_CNTRL                (1)
 #define DEFAULT_TMP_THRSHLD              (65 * 1000) // milli degree Celsius
 #define DEFAULT_NUM_STRG_CLLS            (0)
 #define DEFAULT_STRG_CLL_STRT            (0xf)

diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h
@@ -7,8 +7,8 @@
 #define APICTB       "9.0.0 0x241107"
 #define APIGOTTHARD  "9.0.0 0x241107"
 #define APIGOTTHARD2 "9.0.0 0x241107"
-#define APIJUNGFRAU  "9.0.0 0x241107"
 #define APIMYTHEN3   "9.0.0 0x241107"
 #define APIMOENCH    "9.0.0 0x241107"
 #define APIXILINXCTB "9.0.0 0x241107"
 #define APIEIGER     "9.0.0 0x241107"
+#define APIJUNGFRAU "9.0.0 0x241120"