detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-04 22:58:40 +01:00
Code Issues Actions Packages Releases Activity

review: removing size in sendtoDetector

Browse Source
This commit is contained in:
maliakal_d
2019-05-07 09:47:53 +02:00
parent 932e377765
commit df938c2535
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/src/slsDetector.cpp
View File

@@ -2678,10 +2678,9 @@ uint32_t slsDetector::getADCEnableMask() {
} }
void slsDetector::setADCInvert(uint32_t value) { void slsDetector::setADCInvert(uint32_t value) {
uint32_t arg = value; FILE_LOG(logDEBUG1) << "Setting ADC Invert to 0x" << std::hex << value << std::dec;
FILE_LOG(logDEBUG1) << "Setting ADC Invert to 0x" << std::hex << arg << std::dec;
if (shm()->onlineFlag == ONLINE_FLAG) { if (shm()->onlineFlag == ONLINE_FLAG) {
sendToDetector(F_SET_ADC_INVERT, &arg, nullptr); sendToDetector(F_SET_ADC_INVERT, value, nullptr);
} }
} }
@@ -2689,7 +2688,7 @@ uint32_t slsDetector::getADCInvert() {
uint32_t retval = -1; uint32_t retval = -1;
FILE_LOG(logDEBUG1) << "Getting ADC Invert"; FILE_LOG(logDEBUG1) << "Getting ADC Invert";
if (shm()->onlineFlag == ONLINE_FLAG) { if (shm()->onlineFlag == ONLINE_FLAG) {
sendToDetector(F_GET_ADC_INVERT, nullptr, 0, &retval, sizeof(retval)); sendToDetector(F_GET_ADC_INVERT, nullptr, retval);
FILE_LOG(logDEBUG1) << "ADC Invert: 0x" << std::hex << retval << std::dec; FILE_LOG(logDEBUG1) << "ADC Invert: 0x" << std::hex << retval << std::dec;
} }
return retval; return retval;
@@ -2784,13 +2783,12 @@ std::vector<int> slsDetector::getReceiverDbitList() {
} }
int slsDetector::setReceiverDbitOffset(int value) { int slsDetector::setReceiverDbitOffset(int value) {
int arg = value;
int retval = -1; int retval = -1;
if (value >= 0) if (value >= 0)
shm()->rxDbitOffset = value; shm()->rxDbitOffset = value;
FILE_LOG(logDEBUG1) << "Setting digital bit offset in receiver to " << arg; FILE_LOG(logDEBUG1) << "Setting digital bit offset in receiver to " << value;
if (shm()->rxOnlineFlag == ONLINE_FLAG) { if (shm()->rxOnlineFlag == ONLINE_FLAG) {
sendToReceiver(F_RECEIVER_DBIT_OFFSET, arg, retval); sendToReceiver(F_RECEIVER_DBIT_OFFSET, value, retval);
FILE_LOG(logDEBUG1) << "Receiver digital bit offset: " << retval; FILE_LOG(logDEBUG1) << "Receiver digital bit offset: " << retval;
} }
return shm()->rxDbitOffset; return shm()->rxDbitOffset;