detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 02:00:18 +01: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

8
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@@ -892,7 +892,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
\returns current register value
*/
int writeRegister(int addr, int val);
uint32_t writeRegister(uint32_t addr, uint32_t val);
/**
@@ -910,7 +910,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
\returns current register value
*/
int readRegister(int addr);
uint32_t readRegister(uint32_t addr);
/**
sets a bit in a register
@@ -920,7 +920,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
DO NOT USE!!! ONLY EXPERT USER!!!
*/
int setBit(int addr, int n);
uint32_t setBit(uint32_t addr, int n);
/**
@@ -931,7 +931,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
DO NOT USE!!! ONLY EXPERT USER!!!
*/
int clearBit(int addr, int n);
uint32_t clearBit(uint32_t addr, int n);
/**
set dacs value