merge with 3.0.1 conflicts resolved

This commit is contained in:
Dhanya Maliakal
2017-10-03 14:52:53 +02:00
20 changed files with 219 additions and 28 deletions

View File

@ -81,6 +81,10 @@ void UDPBaseImplementation::initializeMembers(){
dataStreamEnable = false;
streamingPort = 0;
memset(streamingSrcIP, 0, sizeof(streamingSrcIP));
//***receiver parameters***
silentMode = 0;
}
UDPBaseImplementation::~UDPBaseImplementation(){}
@ -207,6 +211,8 @@ uint32_t UDPBaseImplementation::getFifoDepth() const{ FILE_LOG(logDEBUG) << __AT
/***receiver status***/
slsReceiverDefs::runStatus UDPBaseImplementation::getStatus() const{ FILE_LOG(logDEBUG) << __AT__ << " starting"; return status;}
uint32_t UDPBaseImplementation::getSilentMode() const{ FILE_LOG(logDEBUG) << __AT__ << " starting"; return silentMode;}
int UDPBaseImplementation::getActivate() const{FILE_LOG(logDEBUG) << __AT__ << " starting"; return activated;}
uint32_t UDPBaseImplementation::getStreamingPort() const{FILE_LOG(logDEBUG) << __AT__ << " starting"; return streamingPort;}
@ -478,6 +484,14 @@ int UDPBaseImplementation::setFifoDepth(const uint32_t i){
return OK;
}
/***receiver parameters***/
void UDPBaseImplementation::setSilentMode(const uint32_t i){
FILE_LOG(logDEBUG) << __AT__ << " starting";
silentMode = i;
FILE_LOG(logINFO) << "Silent Mode: " << i;
}
/*************************************************************************
* Behavioral functions***************************************************
* They may modify the status of the receiver ****************************