detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 00:07:13 +02:00
Code Issues Actions Packages Releases Activity

fixed jungfrau server compile errors

Browse Source
This commit is contained in:
maliakal_d
2018-11-08 17:20:41 +01:00
parent 91dd176a0f
commit 7a99d4155a
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer
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: 32924def331e065c3955c593c07ceef2955e89e6 Repsitory UUID: 91dd176a0fb314f583ca6e29140053f1eb742896
Revision: 1 Revision: 5
Branch: refactor Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4104 Last Changed Rev: 4166
Last Changed Date: 2018-10-11 13:46:09.000000002 +0200 ./server_funcs.h Last Changed Date: 2018-11-08 17:15:25.000000002 +0100 ./RegisterDefs.h

6
slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.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 "32924def331e065c3955c593c07ceef2955e89e6" #define GITREPUUID "91dd176a0fb314f583ca6e29140053f1eb742896"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4104 #define GITREV 0x4166
#define GITDATE 0x20181011 #define GITDATE 0x20181108
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

5
slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
View File

@ -1,5 +1,4 @@
#ifndef REGISTER_DEFS_H #pragma once
#define REGISTER_DEFS_H
/* Definitions for FPGA*/ /* Definitions for FPGA*/
#define MEM_MAP_SHIFT 1 #define MEM_MAP_SHIFT 1
@ -398,8 +397,6 @@
#define ASIC_CTRL_DS_TMR_VAL ((0x1F << ASIC_CTRL_DS_TMR_OFST) & ASIC_CTRL_DS_TMR_MSK) #define ASIC_CTRL_DS_TMR_VAL ((0x1F << ASIC_CTRL_DS_TMR_OFST) & ASIC_CTRL_DS_TMR_MSK)
#endif //REGISTERS_G_H

8
slsDetectorServers/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/jungfrauDetectorServer Path: slsDetectorPackage/slsDetectorServers/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: 92123069ce045314a12416a7e8b308875d7f9f21 Repsitory UUID: 91dd176a0fb314f583ca6e29140053f1eb742896
Revision: 7 Revision: 11
Branch: refactor Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4158 Last Changed Rev: 4166
Last Changed Date: 2018-11-02 12:00:46.000000002 +0100 ./Makefile Last Changed Date: 2018-11-08 17:17:22.000000002 +0100 ./RegisterDefs.h

6
slsDetectorServers/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 "92123069ce045314a12416a7e8b308875d7f9f21" #define GITREPUUID "91dd176a0fb314f583ca6e29140053f1eb742896"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4158 #define GITREV 0x4166
#define GITDATE 0x20181102 #define GITDATE 0x20181108
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

2
slsDetectorServers/slsDetectorServer/slsDetectorServer.c
View File

@ -48,7 +48,7 @@ int main(int argc, char *argv[]){
} }
else if(!strcasecmp(argv[i],"-devel")){ else if(!strcasecmp(argv[i],"-devel")){
FILE_LOG(logINFO, ("Detected developer mode\n")); FILE_LOG(logINFO, ("Detected developer mode\n"));
debugflag = DEVELOPER_MODE; debugflag = 1;
} }
#ifdef GOTTHARDD #ifdef GOTTHARDD
else if(!strcasecmp(argv[i],"-phaseshift")){ else if(!strcasecmp(argv[i],"-phaseshift")){

7
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -38,7 +38,6 @@ int (*flist[NUM_DET_FUNCTIONS])(int);
uint32_t dhcpipad = 0; uint32_t dhcpipad = 0;
#endif #endif
enum numberMode {DEC, HEX};
enum updateRet {NO_UPDATE, UPDATE}; enum updateRet {NO_UPDATE, UPDATE};
/* initialization functions */ /* initialization functions */
@ -1924,7 +1923,8 @@ int load_image(int file_des) {
enum imageType index = args[0]; enum imageType index = args[0];
int numChannels = args[1]; int numChannels = args[1];
short int imageVals[numChannels] = {0}; short int imageVals[numChannels];
memset(imageVals, 0, numChannels * sizeof(short int));
if (numChannels > 0) { if (numChannels > 0) {
if (receiveData(file_des, imageVals, numChannels * sizeof(short int), OTHER) < 0) { if (receiveData(file_des, imageVals, numChannels * sizeof(short int), OTHER) < 0) {
return printSocketReadError(); return printSocketReadError();
@ -1975,7 +1975,8 @@ int read_counter_block(int file_des) {
return printSocketReadError(); return printSocketReadError();
int startACQ = args[0]; int startACQ = args[0];
int numChannels = args[1]; int numChannels = args[1];
short int retval[numChannels] = {0}; short int retval[numChannels];
memset(retval, 0, numChannels * sizeof(short int));
FILE_LOG(logDEBUG1, ("Read counter block with start acq bit: %d\n", startACQ)); FILE_LOG(logDEBUG1, ("Read counter block with start acq bit: %d\n", startACQ));
#ifndef GOTTHARDD #ifndef GOTTHARDD

6
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
View File

@ -1,6 +1,8 @@
#pragma once #pragma once
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
enum numberMode {DEC, HEX};
// initialization functions // initialization functions
int printSocketReadError(); int printSocketReadError();
void init_detector(); void init_detector();
@ -9,8 +11,8 @@ const char* getFunctionName(enum detFuncs func);
void function_table(); void function_table();
void functionNotImplemented(); void functionNotImplemented();
void modeNotImplemented(char* modename, int mode); void modeNotImplemented(char* modename, int mode);
void validate(int arg, int retval, char* modename, int hex); void validate(int arg, int retval, char* modename, enum numberMode nummode);
void validate64(int64_t arg, int64_t retval, char* modename, int hex); void validate64(int64_t arg, int64_t retval, char* modename, enum numberMode nummode);
int M_nofunc(int); int M_nofunc(int);
int M_nofuncMode(int); int M_nofuncMode(int);