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

merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file

Browse Source
This commit is contained in:
maliakal_d
2018-02-07 11:02:36 +01:00
parent 3da6a6df65 ecf1e9fac1
commit 897cbac27d
31 changed files with 170 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -3166,7 +3166,12 @@ int set_speed(int file_des) {
switch (arg) {
#ifdef JUNGFRAUD
case ADC_PHASE:
adcPhase(val);
retval = adcPhase(val);
if ((retval!=val) && (val>=0)) {
ret=FAIL;
sprintf(mess,"could not change set adc phase: should be %d but is %d \n", val, retval);
cprintf(RED, "Warning: %s", mess);
}
break;
#endif
#ifdef MYTHEND
@ -5290,7 +5295,6 @@ int threshold_temp(int file_des) {
sprintf(mess,"Function (Threshold Temp) is not implemented for this detector\n");
cprintf(RED, "%s", mess);
#else
int arg[2]={-1,-1};
int val=-1;
@ -5305,6 +5309,7 @@ int threshold_temp(int file_des) {
cprintf(RED, "Warning: %s", mess);
}
#ifdef SLS_DETECTOR_FUNCTION_LIST
if (ret==OK) {
#ifdef VERBOSE
@ -5361,6 +5366,7 @@ int temp_control(int file_des) {
val=arg[0];
//ignoring imod
#ifdef SLS_DETECTOR_FUNCTION_LIST
if (ret==OK) {
#ifdef VERBOSE
@ -5372,7 +5378,6 @@ int temp_control(int file_des) {
#ifdef VERBOSE
printf("Temperature control is %d\n", retval);
#endif
if (ret==OK && differentClients && val >= 0)
ret=FORCE_UPDATE;
#endif