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

eiger and jungfrau servers int to uint32_t for read and write registers

Browse Source
This commit is contained in:
maliakal_d 2018-03-08 16:46:15 +01:00
parent 8b02aa9e91
commit fee6465213
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.0 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.1
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: 12e4530702b836985408bc1e85ddb0d996a0153b Repsitory UUID: 8b02aa9e91bbee0470492dcf1ff67415851e14fa
Revision: 314 Revision: 315
Branch: 3.1.0-rc Branch: 3.1.0-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: Erik_Frojdh
Last Changed Rev: 3445 Last Changed Rev: 3455
Last Changed Date: 2018-02-23 13:07:05.000000002 +0100 ./Makefile.virtual Last Changed Date: 2018-03-08 16:44:32.000000002 +0100 ./FebRegisterDefs.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 "12e4530702b836985408bc1e85ddb0d996a0153b" #define GITREPUUID "8b02aa9e91bbee0470492dcf1ff67415851e14fa"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Erik_Frojdh"
#define GITREV 0x3445 #define GITREV 0x3455
#define GITDATE 0x20180223 #define GITDATE 0x20180308
#define GITBRANCH "3.1.0-rc" #define GITBRANCH "3.1.0-rc"

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.1 → slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.2
View File

Binary file not shown.

12
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: 0b017b886c879792b644cf8ec1e1562a520a1205 Repsitory UUID: 8b02aa9e91bbee0470492dcf1ff67415851e14fa
Revision: 113 Revision: 117
Branch: 3.0.1 Branch: 3.1.0-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: Erik_Frojdh
Last Changed Rev: 3434 Last Changed Rev: 3455
Last Changed Date: 2018-02-26 13:52:20.000000002 +0100 ./RegisterDefs.h Last Changed Date: 2018-03-08 16:44:32.000000002 +0100 ./RegisterDefs.h

10
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 "0b017b886c879792b644cf8ec1e1562a520a1205" #define GITREPUUID "8b02aa9e91bbee0470492dcf1ff67415851e14fa"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Erik_Frojdh"
#define GITREV 0x3434 #define GITREV 0x3455
#define GITDATE 0x20180226 #define GITDATE 0x20180308
#define GITBRANCH "3.0.1" #define GITBRANCH "3.1.0-rc"

6
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1253,7 +1253,7 @@ int get_adc(int file_des) {
int write_register(int file_des) { int write_register(int file_des) {
int ret=OK,ret1=OK; int ret=OK,ret1=OK;
int n=0; int n=0;
int retval=-1; uint32_t retval=-1;
sprintf(mess,"write to register failed\n"); sprintf(mess,"write to register failed\n");
// receive arguments // receive arguments
@ -1261,7 +1261,7 @@ int write_register(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();
int addr=arg[0]; int addr=arg[0];
int val=arg[1]; uint32_t val=arg[1];
// execute action // execute action
if (differentClients && lockStatus) { if (differentClients && lockStatus) {
@ -1311,7 +1311,7 @@ int write_register(int file_des) {
int read_register(int file_des) { int read_register(int file_des) {
int ret=OK,ret1=OK; int ret=OK,ret1=OK;
int n=0; int n=0;
int retval=-1; uint32_t retval=-1;
sprintf(mess,"read register failed\n"); sprintf(mess,"read register failed\n");
// receive arguments // receive arguments