detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +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

2
slsDetectorServers/slsDetectorServer/slsDetectorServer.c
View File

@ -48,7 +48,7 @@ int main(int argc, char *argv[]){
}
else if(!strcasecmp(argv[i],"-devel")){
FILE_LOG(logINFO, ("Detected developer mode\n"));
debugflag = DEVELOPER_MODE;
debugflag = 1;
}
#ifdef GOTTHARDD
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;
#endif
enum numberMode {DEC, HEX};
enum updateRet {NO_UPDATE, UPDATE};
/* initialization functions */
@ -1924,7 +1923,8 @@ int load_image(int file_des) {
enum imageType index = args[0];
int numChannels = args[1];
short int imageVals[numChannels] = {0};
short int imageVals[numChannels];
memset(imageVals, 0, numChannels * sizeof(short int));
if (numChannels > 0) {
if (receiveData(file_des, imageVals, numChannels * sizeof(short int), OTHER) < 0) {
return printSocketReadError();
@ -1975,7 +1975,8 @@ int read_counter_block(int file_des) {
return printSocketReadError();
int startACQ = args[0];
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));
#ifndef GOTTHARDD

6
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
View File

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