From 8f8a92b9c5b025f517c0d743d4ce4a9077191f2c Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 11 Mar 2025 09:29:01 +0100 Subject: [PATCH 1/2] jungfrau firmware dates for fw v 1.6 and fw2.6 --- .../jungfrauDetectorServer/slsDetectorServer_defs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h index 8ffaf5eaa..cc2b0928b 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -5,8 +5,8 @@ #include "sls/sls_detector_defs.h" #define MIN_REQRD_VRSN_T_RD_API 0x171220 -#define REQRD_FRMWRE_VRSN_BOARD2 0x230920 // 1.0 pcb (version = 010) -#define REQRD_FRMWRE_VRSN 0x230921 // 2.0 pcb (version = 011) +#define REQRD_FRMWRE_VRSN_BOARD2 0x250209 // 1.0 pcb (version = 010) +#define REQRD_FRMWRE_VRSN 0x250208 // 2.0 pcb (version = 011) #define NUM_HARDWARE_VERSIONS (2) #define HARDWARE_VERSION_NUMBERS \ From 4dcbcad43521226c06c8885c4830086ebef5fc3b Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 11 Mar 2025 09:34:37 +0100 Subject: [PATCH 2/2] jungfrau server binary for fw 1.6 and 2.6 --- .../bin/jungfrauDetectorServer_developer | Bin 314668 -> 314668 bytes slsSupportLib/include/sls/versionAPI.h | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 85d75b8b439859fcd535f5d919673f4d72da3a1c..2f3a61cfd845eb96123a32dd5a478ad57c4b17f0 100755 GIT binary patch delta 79 zcmZ28OL)yJ;R%||=f7G_U-*_;Vxx-}vxq7K!$VFci)UZ|vMV?~RApd%$idXSh`D_c jGb0c)ZC}L9yj-2paJ!c_^L}|o!*(uj=IvbGEJ{rPhbkH} delta 79 zcmZ28OL)yJ;R%||=bq1)zVI!x#6}k{W)WouhKCBA7SF!^Wmj-~sLa6lP?58F5p(+@ jW=0@p+P;XHdAT~H!FDfg=Kb=F2JKwl%-gxVS(KUprZ^h8 diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 4fbb0db7b..17637b81c 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -3,10 +3,10 @@ /** API versions */ #define APILIB "developer 0x241122" #define APIRECEIVER "developer 0x241122" -#define APICTB "developer 0x250310" +#define APICTB "developer 0x250310" #define APIGOTTHARD2 "developer 0x250310" -#define APIJUNGFRAU "developer 0x250310" -#define APIMYTHEN3 "developer 0x250310" -#define APIMOENCH "developer 0x250310" +#define APIMYTHEN3 "developer 0x250310" +#define APIMOENCH "developer 0x250310" #define APIXILINXCTB "developer 0x250310" -#define APIEIGER "developer 0x250310" +#define APIEIGER "developer 0x250310" +#define APIJUNGFRAU "developer 0x250311"