mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-20 08:38:00 +02:00
merge conflict fix
This commit is contained in:
@ -559,6 +559,30 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
|
||||
DO NOT USE!!! ONLY EXPERT USER!!!
|
||||
*/
|
||||
virtual int readRegister(int addr)=0;
|
||||
|
||||
|
||||
/**
|
||||
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!!!
|
||||
*/
|
||||
virtual int setBit(int addr, int n)=0;
|
||||
|
||||
|
||||
/**
|
||||
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!!!
|
||||
*/
|
||||
virtual int clearBit(int addr, int n)=0;
|
||||
|
||||
|
||||
/**
|
||||
Returns the IP of the last client connecting to the detector
|
||||
*/
|
||||
|
Reference in New Issue
Block a user