merge conflict fix

This commit is contained in:
Dhanya Maliakal
2017-12-01 09:20:44 +01:00
7 changed files with 310 additions and 153 deletions

View File

@ -906,6 +906,27 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
*/
int readRegister(int addr);
/**
sets a bit in a register
\param addr address
\param n nth bit ranging from 0 to 31
\returns current register value
DO NOT USE!!! ONLY EXPERT USER!!!
*/
int setBit(int addr, int n);
/**
clear a bit in a register
\param addr address
\param n nth bit ranging from 0 to 31
\returns current register value
DO NOT USE!!! ONLY EXPERT USER!!!
*/
int clearBit(int addr, int n);
/**
set dacs value
\param val value (in V)