mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-09 11:30:43 +02:00
Merge branch '3.0.1' into developer
This commit is contained in:
commit
34908edd6a
@ -28,6 +28,10 @@ int slsDetectorUsers::setOnline(int const online){
|
|||||||
return myDetector->setOnline(online);
|
return myDetector->setOnline(online);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int slsDetectorUsers::setReceiverOnline(int const online){
|
||||||
|
return myDetector->setReceiverOnline(online);
|
||||||
|
}
|
||||||
|
|
||||||
void slsDetectorUsers::startMeasurement(){
|
void slsDetectorUsers::startMeasurement(){
|
||||||
myDetector->acquire(0);
|
myDetector->acquire(0);
|
||||||
}
|
}
|
||||||
|
@ -110,6 +110,13 @@ class slsDetectorUsers
|
|||||||
*/
|
*/
|
||||||
int setOnline(int const online=-1);
|
int setOnline(int const online=-1);
|
||||||
|
|
||||||
|
/** @short sets the receivers onlineFlag
|
||||||
|
\param online can be: -1 returns wether the receiver is in online (1) or offline (0) state; 0 receiver in offline state; 1 receiver in online state
|
||||||
|
\returns 0 (offline) or 1 (online)
|
||||||
|
*/
|
||||||
|
int setReceiverOnline(int const online=-1);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@short start measurement and acquires
|
@short start measurement and acquires
|
||||||
\returns OK/FAIL
|
\returns OK/FAIL
|
||||||
|
Loading…
x
Reference in New Issue
Block a user