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

@ -239,6 +239,12 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
*/
runStatus getStatus() const;
/**
* Get Silent Mode
* @return silent mode
*/
uint32_t getSilentMode() const;
/**
* Get activate
* If deactivated, receiver will write dummy packets 0xFF
@ -443,6 +449,12 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
*/
int setFifoDepth(const uint32_t i);
//***receiver parameters***
/**
* Set Silent Mode
* @param i silent mode. 1 sets, 0 unsets
*/
void setSilentMode(const uint32_t i);
/*************************************************************************
* Behavioral functions***************************************************
@ -656,6 +668,11 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
/** streaming port */
char streamingSrcIP[MAX_STR_LENGTH];
//***receiver parameters***
uint32_t silentMode;
//***callback parameters***
/**
* Call back for start acquisition