detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 16:27:13 +02:00
Code Issues Actions Packages Releases Activity

made sure that server knows whether to stop sending to receiver even if receiver is down, made sure error in configuremac is shown when doing start receiver

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@292 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-10-12 10:20:19 +00:00
parent f6a2d599a0
commit 733f5b1f3e
5 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4512,13 +4512,15 @@ int slsDetector::configureMAC(){
strcpy(arg[2],getServerMAC());
//#ifdef VERBOSE
#ifdef VERBOSE
std::cout<< "slsDetector configureMAC "<< std::endl;
//#endif
#endif
for(i=0;i<3;i++){
if(!strcmp(arg[i],"none"))
return -1;
if(!strcmp(arg[i],"none")){
std::cout<< "Configure MAC Error. IP/MAC Addresses has INVALID format"<< std::endl;
return FAIL;
}
}
#ifdef VERBOSE
@ -5275,9 +5277,11 @@ slsDetectorDefs::synchronizationMode slsDetector::setSynchronization(synchroniza
/*receiver*/
int slsDetector::setReceiverOnline(int off) {
if (off!=GET_ONLINE_FLAG) {
thisDetector->receiverOnlineFlag=off;
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG)
setReceiverTCPSocket();
if(strcmp(thisDetector->receiverIP,"none")){
thisDetector->receiverOnlineFlag=off;
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG)
setReceiverTCPSocket();
}
}
return thisDetector->receiverOnlineFlag;
}
@ -5561,7 +5565,8 @@ int slsDetector::startReceiver(){
int slsDetector::stopReceiver(){
int fnum=F_STOP_RECEIVER;
int ret = FAIL;
//different iret for server, should not return ok if receiver didnt connect
int ret = FAIL,iret;
char mess[100];
#ifdef VERBOSE
@ -5586,20 +5591,18 @@ int slsDetector::stopReceiver(){
}
//tell the server to NOT send to receiver and instead to CPU
if(ret==OK){
if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (controlSocket) {
if (controlSocket->Connect()>=0) {
controlSocket->SendDataOnly(&fnum,sizeof(fnum));
controlSocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret==FAIL){
controlSocket->ReceiveDataOnly(mess,sizeof(mess));
std::cout<< "Detector returned error: " << mess << std::endl;
}
controlSocket->Disconnect();
if (ret==FORCE_UPDATE)
ret=updateDetector();
if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (controlSocket) {
if (controlSocket->Connect()>=0) {
controlSocket->SendDataOnly(&fnum,sizeof(fnum));
controlSocket->ReceiveDataOnly(&iret,sizeof(iret));
if (iret==FAIL){
controlSocket->ReceiveDataOnly(mess,sizeof(mess));
std::cout<< "Detector returned error: " << mess << std::endl;
}
controlSocket->Disconnect();
if (iret==FORCE_UPDATE)
updateDetector();
}
}
}