detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 03:10:02 +02:00
Code Issues Actions Packages Releases Activity

minor bug fix if same client: client ip only 8 bytes instead of 16 bytes copied, added user class functionality for long term use:stopacquisition

Browse Source
This commit is contained in:
maliakal_d 2017-10-12 10:18:15 +02:00
parent f2f061ae18
commit a59309b13f
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -346,6 +346,11 @@ int slsDetectorUsers::startAcquisition() {
return myDetector->startAcquisition(); return myDetector->startAcquisition();
} }
int slsDetectorUsers::stopAcquisition() {
return myDetector->stopAcquisition();
}
int slsDetectorUsers::setReceiverSilentMode(int i) { int slsDetectorUsers::setReceiverSilentMode(int i) {
return myDetector->setReceiverSilentMode(i); return myDetector->setReceiverSilentMode(i);
} }

10
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -598,11 +598,19 @@ class slsDetectorUsers
int stopReceiver(); int stopReceiver();
/** /**
start detector acquisition in non blocking mode start detector real time acquisition in non blocking mode
does not include scans, scripts, incrementing file index, s
tarting/stopping receiver, resetting frames caught in receiver
\returns OK if all detectors are properly started, FAIL otherwise \returns OK if all detectors are properly started, FAIL otherwise
*/ */
int startAcquisition(); int startAcquisition();
/**
stop detector real time acquisition
\returns OK if all detectors are properly started, FAIL otherwise
*/
int stopAcquisition();
/** /**
* set receiver in silent mode * set receiver in silent mode
* @param i 1 sets, 0 unsets (-1 gets) * @param i 1 sets, 0 unsets (-1 gets)

2
slsDetectorSoftware/slsReceiverInterface/receiverInterface.cpp
View File

@ -163,7 +163,7 @@ int receiverInterface::getLastClientIP(int fnum, char retval[]){
dataSocket->SendDataOnly(&fnum,sizeof(fnum)); dataSocket->SendDataOnly(&fnum,sizeof(fnum));
dataSocket->ReceiveDataOnly(&ret,sizeof(ret)); dataSocket->ReceiveDataOnly(&ret,sizeof(ret));
dataSocket->ReceiveDataOnly(retval,sizeof(retval)); dataSocket->ReceiveDataOnly(retval,INET_ADDRSTRLEN);
return ret; return ret;
} }