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

binaries in and updated api versioning

Browse Source
This commit is contained in:
maliakal_d
2021-10-07 19:11:37 +02:00
parent 6b0e6a72df
commit e3e3639829
17 changed files with 75 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6021,9 +6021,10 @@ int set_clock_divider(int file_des) {
modeNotImplemented("clock index (divider set)", args[0]);
}
enum CLKINDEX c = 0;
int val = args[1];
if (ret == OK) {
enum CLKINDEX c = (enum CLKINDEX)args[0];
int val = args[1];
c = (enum CLKINDEX)args[0];
// validate val range
if (val < 2 || val > getMaxClockDivider()) {
char *clock_names[] = {CLK_NAMES};
@ -9284,7 +9285,7 @@ int set_readout_speed(int file_des) {
#endif
if (ret == OK) {
switch (arg) {
#if defined(EIGERD) || !defined(JUNGFRAUD)
#if defined(EIGERD) || defined(JUNGFRAUD)
case FULL_SPEED:
case HALF_SPEED:
case QUARTER_SPEED:
@ -9297,18 +9298,21 @@ int set_readout_speed(int file_des) {
modeNotImplemented("readout speed index", arg);
break;
}
ret = setReadoutSpeed(arg);
if (ret == FAIL) {
sprintf(mess, "Could not set readout speed to %d.\n", arg);
LOG(logERROR, (mess));
} else {
ret = getReadoutSpeed(&retval);
LOG(logDEBUG1, ("retval readout speed: %d\n", retval));
if (ret == OK) {
ret = setReadoutSpeed(arg);
if (ret == FAIL) {
strcpy(mess, "Could not get readout speed\n");
sprintf(mess, "Could not set readout speed to %d.\n", arg);
LOG(logERROR, (mess));
} else {
int retval = 0;
ret = getReadoutSpeed(&retval);
LOG(logDEBUG1, ("retval readout speed: %d\n", retval));
if (ret == FAIL) {
strcpy(mess, "Could not get readout speed\n");
LOG(logERROR, (mess));
}
validate(&ret, mess, arg, retval, "set readout speed", DEC);
}
validate(&ret, mess, arg, retval, "set readout speed", DEC);
}
}