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

changed setBit and getBit to uint32_t

Browse Source
This commit is contained in:
Erik Frojdh
2018-03-08 17:13:13 +01:00
parent 8b02aa9e91
commit 0d2dd93498
5 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4904,15 +4904,15 @@ uint32_t multiSlsDetector::readRegister(uint32_t addr){
}
int multiSlsDetector::setBit(int addr, int n) {
int ret1, ret=-100;
uint32_t multiSlsDetector::setBit(uint32_t addr, int n) {
uint32_t ret, ret1;
for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
if (detectors[i]) {
ret1=detectors[i]->setBit(addr,n);
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
if (ret==-100)
if (i==0)
ret=ret1;
else if (ret!=ret1) {
// not setting it to -1 as it is a possible value
@ -4926,15 +4926,15 @@ int multiSlsDetector::setBit(int addr, int n) {
}
int multiSlsDetector::clearBit(int addr, int n) {
int ret1, ret=-100;
uint32_t multiSlsDetector::clearBit(uint32_t addr, int n) {
uint32_t ret, ret1;
for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
if (detectors[i]) {
ret1=detectors[i]->clearBit(addr,n);
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
if (ret==-100)
if (i==0)
ret=ret1;
else if (ret!=ret1) {
// not setting it to -1 as it is a possible value