From 334d58c3fd854183858e909036a175c0f48415a0 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 16 Aug 2021 15:38:19 +0200 Subject: [PATCH] g2: fix for module id register --- .../gotthard2DetectorServer/RegisterDefs.h | 2 +- .../bin/gotthard2DetectorServer_developer | Bin 234272 -> 234272 bytes slsSupportLib/include/sls/versionAPI.h | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h b/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h index cf0d895ed..009a8d1eb 100644 --- a/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h +++ b/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h @@ -123,7 +123,7 @@ #define DTA_OFFSET_REG (0x0A * REG_OFFSET + BASE_CONTROL) -#define MOD_ID_REG (0x0D * REG_OFFSET + BASE_CONTROL) +#define MOD_ID_REG (0x0B * REG_OFFSET + BASE_CONTROL) #define MOD_ID_OFST (0) #define MOD_ID_MSK (0x0000FFFF << MOD_ID_OFST) diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 1ca8d259e08c038bb256cddf4f8b37b627ecd141..c597c07e135247ddedff217360069a195300466d 100755 GIT binary patch delta 106 zcmZ3mjBmj*z74L*jI5LEl+`EaDhn{OZmv_VXJq7_{7)s?l$(K(p-+k7&Hw!ZRvp{| zEI__PrxF8*28mmBunUO)-~ZqYNPa_$1Vqi|KGo=%jI7PC_O-v-$GH8~J|?p(0Ijnl AP5=M^ delta 106 zcmZ3mjBmj*z74L*j4YGul+`EaDhn{OY_3zTXJq7^{7)s?l$U{#p-+k7&Hw!ZRvp{| zEI__PrxF8*28mmBunUO)-~ZqYNPa_$1Vqi|KGo=%j4aKs_O-v-$GH8~J|?p(0IwY* ARR910 diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index beabadba6..e08aaa3ab 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -6,8 +6,8 @@ #define APICTB 0x210812 #define APIGOTTHARD 0x210812 -#define APIGOTTHARD2 0x210812 #define APIJUNGFRAU 0x210812 #define APIMYTHEN3 0x210812 #define APIMOENCH 0x210812 #define APIEIGER 0x210812 +#define APIGOTTHARD2 0x210816