detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 15:20:02 +02:00
Code Issues Actions Packages Releases Activity

jungfrau and eiger server bug fix: module_firmware_version gets stuck as it expects an int, but should have been for module_serial_number

Browse Source
This commit is contained in:
maliakal_d 2018-04-06 12:15:57 +02:00
parent da010a03d7
commit d28f293485
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

10
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 98752e1cdbd78167ad20c6a01a17852b1a2263a7 Repsitory UUID: da010a03d725b6f18020d2142d58771534414274
Revision: 326 Revision: 328
Branch: developer Branch: developer
Last Changed Author: Gemma_Tinti Last Changed Author: Erik_Frojdh
Last Changed Rev: 3733 Last Changed Rev: 3751
Last Changed Date: 2018-03-21 08:34:29.000000002 +0100 ./FebRegisterDefs.h Last Changed Date: 2018-04-03 16:29:39.000000002 +0200 ./xparameters.h

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "98752e1cdbd78167ad20c6a01a17852b1a2263a7" #define GITREPUUID "da010a03d725b6f18020d2142d58771534414274"
#define GITAUTH "Gemma_Tinti" #define GITAUTH "Erik_Frojdh"
#define GITREV 0x3733 #define GITREV 0x3751
#define GITDATE 0x20180321 #define GITDATE 0x20180403
#define GITBRANCH "developer" #define GITBRANCH "developer"

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

10
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 98752e1cdbd78167ad20c6a01a17852b1a2263a7 Repsitory UUID: da010a03d725b6f18020d2142d58771534414274
Revision: 133 Revision: 135
Branch: developer Branch: developer
Last Changed Author: Gemma_Tinti Last Changed Author: Erik_Frojdh
Last Changed Rev: 3733 Last Changed Rev: 3751
Last Changed Date: 2018-03-21 08:34:29.000000002 +0100 ./RegisterDefs.h Last Changed Date: 2018-04-03 16:29:40.000000002 +0200 ./RegisterDefs.h

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "98752e1cdbd78167ad20c6a01a17852b1a2263a7" #define GITREPUUID "da010a03d725b6f18020d2142d58771534414274"
#define GITAUTH "Gemma_Tinti" #define GITAUTH "Erik_Frojdh"
#define GITREV 0x3733 #define GITREV 0x3751
#define GITDATE 0x20180321 #define GITDATE 0x20180403
#define GITBRANCH "developer" #define GITBRANCH "developer"

2
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -653,7 +653,7 @@ int get_id(int file_des) {
n = receiveData(file_des,&arg,sizeof(arg),INT32); n = receiveData(file_des,&arg,sizeof(arg),INT32);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
if (arg == MODULE_FIRMWARE_VERSION) { if (arg == MODULE_SERIAL_NUMBER) {
n = receiveData(file_des,&imod,sizeof(imod),INT32); n = receiveData(file_des,&imod,sizeof(imod),INT32);
if (n < 0) return printSocketReadError(); if (n < 0) return printSocketReadError();
} }