From fee6465213ba06768438b08f4940fd6b83da1ab1 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 8 Mar 2018 16:46:15 +0100 Subject: [PATCH] eiger and jungfrau servers int to uint32_t for read and write registers --- ....0.16.0 => eigerDetectorServerv3.1.0.16.1} | Bin 293060 -> 293060 bytes .../eigerDetectorServer/gitInfo.txt | 10 +++++----- .../eigerDetectorServer/gitInfoEiger.h | 8 ++++---- ...3.1.0.1 => jungfrauDetectorServerv3.1.0.2} | Bin 110264 -> 110264 bytes .../jungfrauDetectorServer/gitInfo.txt | 12 ++++++------ .../jungfrauDetectorServer/gitInfoJungfrau.h | 10 +++++----- .../slsDetectorServer_funcs.c | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) rename slsDetectorSoftware/eigerDetectorServer/bin/{eigerDetectorServerv3.1.0.16.0 => eigerDetectorServerv3.1.0.16.1} (70%) rename slsDetectorSoftware/jungfrauDetectorServer/bin/{jungfrauDetectorServerv3.1.0.1 => jungfrauDetectorServerv3.1.0.2} (99%) diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.0 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.1 similarity index 70% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.0 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.1 index 32e5e515f8ff8be73471bbb2613de5df6b592416..e4262429137a353597e0baf5d2695116a49b0775 100755 GIT binary patch delta 29062 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 F{{w|#b<6+& diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index d047cac0f..651eecb39 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 12e4530702b836985408bc1e85ddb0d996a0153b -Revision: 314 +Repsitory UUID: 8b02aa9e91bbee0470492dcf1ff67415851e14fa +Revision: 315 Branch: 3.1.0-rc -Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3445 -Last Changed Date: 2018-02-23 13:07:05.000000002 +0100 ./Makefile.virtual +Last Changed Author: Erik_Frojdh +Last Changed Rev: 3455 +Last Changed Date: 2018-03-08 16:44:32.000000002 +0100 ./FebRegisterDefs.h diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index 1a7c626de..857ca4ad2 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "12e4530702b836985408bc1e85ddb0d996a0153b" -#define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3445 -#define GITDATE 0x20180223 +#define GITREPUUID "8b02aa9e91bbee0470492dcf1ff67415851e14fa" +#define GITAUTH "Erik_Frojdh" +#define GITREV 0x3455 +#define GITDATE 0x20180308 #define GITBRANCH "3.1.0-rc" diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.1 b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.2 similarity index 99% rename from slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.1 rename to slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.2 index 6dea7da70a259cd5ba81880d1e6b7041067af29f..99ac8fd9c95932b8b320482f037bb15ad67c96e0 100755 GIT binary patch delta 32 ocmdmSmu<&gwh3BHQCp^83}Ten=#p2*#KGLWrEdF{Iz|=)0OH;Zl>h($ delta 32 ocmdmSmu<&gwh3BHt~;k+3}Ten=#p2*q{h^|rEdF{Iz|=)0OF|(q5uE@ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt index 6c9f772b2..f3aa14041 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 0b017b886c879792b644cf8ec1e1562a520a1205 -Revision: 113 -Branch: 3.0.1 -Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3434 -Last Changed Date: 2018-02-26 13:52:20.000000002 +0100 ./RegisterDefs.h +Repsitory UUID: 8b02aa9e91bbee0470492dcf1ff67415851e14fa +Revision: 117 +Branch: 3.1.0-rc +Last Changed Author: Erik_Frojdh +Last Changed Rev: 3455 +Last Changed Date: 2018-03-08 16:44:32.000000002 +0100 ./RegisterDefs.h diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h index adb58a39a..857ca4ad2 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "0b017b886c879792b644cf8ec1e1562a520a1205" -#define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3434 -#define GITDATE 0x20180226 -#define GITBRANCH "3.0.1" +#define GITREPUUID "8b02aa9e91bbee0470492dcf1ff67415851e14fa" +#define GITAUTH "Erik_Frojdh" +#define GITREV 0x3455 +#define GITDATE 0x20180308 +#define GITBRANCH "3.1.0-rc" diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 7e5c3243d..8b6281825 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -1253,7 +1253,7 @@ int get_adc(int file_des) { int write_register(int file_des) { int ret=OK,ret1=OK; int n=0; - int retval=-1; + uint32_t retval=-1; sprintf(mess,"write to register failed\n"); // receive arguments @@ -1261,7 +1261,7 @@ int write_register(int file_des) { n = receiveData(file_des,arg,sizeof(arg),INT32); if (n < 0) return printSocketReadError(); int addr=arg[0]; - int val=arg[1]; + uint32_t val=arg[1]; // execute action if (differentClients && lockStatus) { @@ -1311,7 +1311,7 @@ int write_register(int file_des) { int read_register(int file_des) { int ret=OK,ret1=OK; int n=0; - int retval=-1; + uint32_t retval=-1; sprintf(mess,"read register failed\n"); // receive arguments