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

solving merging conflicts from 3.1.0 to developer

Browse Source
This commit is contained in:
maliakal_d
2018-03-14 15:45:35 +01:00
parent 06cdf8ad92 85aa47b835
commit b58c3e8951
129 changed files with 1120 additions and 8750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1100,13 +1100,13 @@ class multiSlsDetector : public slsDetectorUtils {
int writeRegister(int addr, int val);
uint32_t writeRegister(uint32_t addr, uint32_t val);
int writeAdcRegister(int addr, int val);
int readRegister(int addr);
uint32_t readRegister(uint32_t addr);
/**
sets a bit in a register
@ -1116,7 +1116,7 @@ class multiSlsDetector : public slsDetectorUtils {
DO NOT USE!!! ONLY EXPERT USER!!!
*/
int setBit(int addr, int n);
uint32_t setBit(uint32_t addr, int n);
/**
@ -1127,7 +1127,7 @@ class multiSlsDetector : public slsDetectorUtils {
DO NOT USE!!! ONLY EXPERT USER!!!
*/
int clearBit(int addr, int n);
uint32_t clearBit(uint32_t addr, int n);
@ -1244,6 +1244,7 @@ class multiSlsDetector : public slsDetectorUtils {
slsDetector *operator()(int pos) {if (pos>=0 && pos< MAXDET) return detectors[pos]; return NULL;};
//receiver
/**