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

hostname command failed when connecting to servers in update mode

Browse Source
This commit is contained in:
maliakal_d 2022-02-22 16:50:12 +01:00
parent bf1df92303
commit c14fb92c16
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE.txt
View File

@ -40,6 +40,7 @@ This document describes the differences between v7.0.0 and v6.x.x
- when in discard partial frames or empty mode, the frame number doesnt increase by 1, it increases to that number (so its faster) - when in discard partial frames or empty mode, the frame number doesnt increase by 1, it increases to that number (so its faster)
- file write disabled by default - file write disabled by default
- start non blocking acquisition at modular level - start non blocking acquisition at modular level
- hostname cmd failed when connecting to servers in update mode (ctb, moench, jungfrau, eiger)
2. Resolved Issues 2. Resolved Issues

6
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -67,7 +67,13 @@ int defaultDacValues[NDAC] = DEFAULT_DAC_VALS;
int vLimit = 0; int vLimit = 0;
enum detectorSettings thisSettings = UNINITIALIZED; enum detectorSettings thisSettings = UNINITIALIZED;
int highvoltage = 0; int highvoltage = 0;
// getNumberofchannels return 0 for y in --update mode (virtual servers)
#ifdef VIRTUAL
int nSamples = DEFAULT_NUM_SAMPLES;
#else
int nSamples = 1; int nSamples = 1;
#endif
int detPos[2] = {0, 0}; int detPos[2] = {0, 0};
int isInitCheckDone() { return initCheckDone; } int isInitCheckDone() { return initCheckDone; }

8
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -80,7 +80,6 @@ char scanErrMessage[MAX_STR_LENGTH] = "";
/* initialization functions */ /* initialization functions */
int updateModeAllowedFunction(int file_des) { int updateModeAllowedFunction(int file_des) {
unsigned int listsize = 19;
enum detFuncs list[] = {F_EXEC_COMMAND, enum detFuncs list[] = {F_EXEC_COMMAND,
F_GET_DETECTOR_TYPE, F_GET_DETECTOR_TYPE,
F_GET_FIRMWARE_VERSION, F_GET_FIRMWARE_VERSION,
@ -99,7 +98,12 @@ int updateModeAllowedFunction(int file_des) {
F_UPDATE_KERNEL, F_UPDATE_KERNEL,
F_UPDATE_DETECTOR_SERVER, F_UPDATE_DETECTOR_SERVER,
F_GET_UPDATE_MODE, F_GET_UPDATE_MODE,
F_SET_UPDATE_MODE}; F_SET_UPDATE_MODE,
F_GET_NUM_CHANNELS,
F_GET_NUM_INTERFACES,
F_ACTIVATE};
unsigned int listsize = 22;
for (unsigned int i = 0; i < listsize; ++i) { for (unsigned int i = 0; i < listsize; ++i) {
if ((unsigned int)fnum == list[i]) { if ((unsigned int)fnum == list[i]) {
return OK; return OK;