From 8d7a55c2dfdae20ff8bff2ad8c1362b6d66bc202 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 31 Jan 2022 09:22:02 +0100 Subject: [PATCH] const changed to fix kernel parsing for CET --- .../bin/ctbDetectorServer_developer | Bin 304788 -> 304788 bytes .../bin/eigerDetectorServer_developer | Bin 413415 -> 413415 bytes .../bin/gotthard2DetectorServer_developer | Bin 260248 -> 260248 bytes .../bin/gotthardDetectorServer_developer | Bin 257140 -> 257140 bytes .../bin/jungfrauDetectorServer_developer | Bin 287720 -> 287720 bytes .../bin/moenchDetectorServer_developer | Bin 293312 -> 293312 bytes .../bin/mythen3DetectorServer_developer | Bin 273664 -> 273664 bytes .../slsDetectorServer/src/common.c | 4 ++-- slsSupportLib/include/sls/versionAPI.h | 14 +++++++------- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 07df039ab03266ebf74e3e20aace56095ab08497..e95ec9345a15d6a02876ef22320467010c785738 100755 GIT binary patch delta 57 zcmbPoR%psup$VGI-{){mH$2ZQvC-uPC!^tHT`qA(!_BT-AFUY;o6X(Y&D|J*mD K+s)lrViN!{X%Wu= diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index af335056513f75ccb38ef81a7e32ca64332dff92..276826ebeb9401783a4ed59e109f2b55b26ee90c 100755 GIT binary patch delta 89 zcmaDpSMvE>$qm*rjE0jJ*hx?RZ_PQ`K!zL03wSLv*+G_b@>?0f=0!5w7s)U(7BL#O rFX?04zNC-oP0!?jjVv673XvTR@(d#FbEKJpm<5Pgx6hGg^EL(m$;Tf! delta 89 zcmaDpSMvE>$qm*rj2e>{*hx?RZ_PQ`K!zL03wSLv*+G_b@>?0f=0!5w7s)U(7BOnH qFX?04zNC-oO%G3lJcEd>f&h!9W@JbE9BF1CW&vW>?Q^8ryo~{&njQ-P diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 1f02fd29fd52287e53eefbbc74a2e9e36c25a9ae..239ef1fc5730fa490af323adbc251aab9c30f4c8 100755 GIT binary patch delta 48 xcmbR7k$=WV{tY=QOfEi?^Hj_rl=|kgD#i}IB;?Mz1*ftYDK(^2MW#sI!d5qJOq delta 48 xcmbR7k$=WV{tY=QOe|iL^Hj_rl=|kgD#i}IB;?Mz1*ftYDK(^2MW#sH_H5V8OO diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index 1f2f6590fea3f743874f227dec52840923c47c24..6f46fc0d34a6bb0e4054a10caad345966ca0004c 100755 GIT binary patch delta 53 zcmexzga6A7{t24Q-{){oe`v%kvC$=mgVAvEMh`o6W7-&8--Lm}$GY I6|?Oo05cmBTL1t6 delta 53 zcmexzga6A7{t24QU)VXPKQv;N*yxhO!Kg8LBZoMn#^#e8xrU4y&E{6^=2nbA%(UIy IirID(02ZPVrT_o{ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index a686a9adf87b9c8031eb9e1451115c36a13ec386..86475b80983a46b97a5e871dffa7079495c4cd19 100755 GIT binary patch delta 75 zcmaEHT=2zl!3mno-{tIG4uBOAuOEy0I1s-jsO4v delta 75 zcmaEHT=2zl!3mnoU)Z^)8_r;s*ys|#A*sR0n85ggfkA))41g?$he`|#4>dNg+D&GvTf_I8Xw%ml>D K+wJXG8m$3G1ri_t diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index e66eb1dddcb3075dfc4f08eb9a6130f760a8e31e..9bc8887f319af23eb0e5460fcec4a7331fdd6a3d 100755 GIT binary patch delta 48 xcmZp;CD3q7U_*@xlZ(&fIu$brrM~&D%HdKVyLr*9_C>Q8ftYFgqFKywlK|4&6TAQb delta 48 xcmZp;CD3q7U_*@x6N}g6Iu$brrM~&D%HdKVyLr*9_C>Q8ftYFgqFKywlK{Li67~Q9 diff --git a/slsDetectorServers/slsDetectorServer/src/common.c b/slsDetectorServers/slsDetectorServer/src/common.c index 6058e6f30..026e0edfd 100644 --- a/slsDetectorServers/slsDetectorServer/src/common.c +++ b/slsDetectorServers/slsDetectorServer/src/common.c @@ -74,7 +74,7 @@ int getTimeFromString(char *buf, time_t *result) { // remove timezone as strptime cannot validate timezone despite // documentation (for blackfin) LOG(logDEBUG, ("kernel v %s\n", buffer)); - const char *timezone = {"CEST"}; + char *timezone = {"CEST"}; char *res = strstr(buffer, timezone); // remove CET as well if (res == NULL) { @@ -668,4 +668,4 @@ int deleteFile(char *mess, char *fname, char *errorPrefix) { ("\tFile does not exist anyway: %s (%s)\n", fullname, errorPrefix)); } return OK; -} \ No newline at end of file +} diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 24f9dbde6..06340984d 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -6,10 +6,10 @@ #define APIRECEIVER 0x211124 #define APIGUI 0x211124 -#define APICTB 0x220128 -#define APIGOTTHARD 0x220128 -#define APIGOTTHARD2 0x220128 -#define APIJUNGFRAU 0x220128 -#define APIMYTHEN3 0x220128 -#define APIMOENCH 0x220128 -#define APIEIGER 0x220128 +#define APICTB 0x220131 +#define APIGOTTHARD 0x220131 +#define APIGOTTHARD2 0x220131 +#define APIJUNGFRAU 0x220131 +#define APIMYTHEN3 0x220131 +#define APIMOENCH 0x220131 +#define APIEIGER 0x220131