mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-21 19:30:03 +02:00
bugfix, always 12 dr
This commit is contained in:
parent
92beb3aa2a
commit
a936cc26cc
@ -1228,17 +1228,17 @@ int Feb_Control_GetDynamicRange(unsigned int *retval) {
|
|||||||
*retval = 4;
|
*retval = 4;
|
||||||
} else if (DAQ_STATIC_BIT_M8 & Feb_Control_staticBits) {
|
} else if (DAQ_STATIC_BIT_M8 & Feb_Control_staticBits) {
|
||||||
*retval = 8;
|
*retval = 8;
|
||||||
}
|
|
||||||
|
|
||||||
int disable16 = 0;
|
|
||||||
if (!Feb_Control_Get16bitConversionDisabled(&disable16)) {
|
|
||||||
LOG(logERROR, ("Could not get dynamic range (12 or 16 bit)\n"));
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (disable16) {
|
|
||||||
*retval = 12;
|
|
||||||
} else {
|
} else {
|
||||||
*retval = 16;
|
int disable16 = 0;
|
||||||
|
if (!Feb_Control_Get16bitConversionDisabled(&disable16)) {
|
||||||
|
LOG(logERROR, ("Could not get dynamic range (12 or 16 bit)\n"));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
if (disable16) {
|
||||||
|
*retval = 12;
|
||||||
|
} else {
|
||||||
|
*retval = 16;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user