made default streamer to be the ip related to hostname, otherwise can be specified from the client, also made it compatible with chip test board detector now

This commit is contained in:
Dhanya Maliakal
2017-09-12 15:00:59 +02:00
parent c37d3feae9
commit 5ff574b33f
13 changed files with 324 additions and 34 deletions

View File

@ -43,12 +43,14 @@ class UDPInterface {
* -setAcquisitionPeriod
* -setNumberOfFrames
* -setAcquisitionTime
* -setSubExpTime
* -setSubExpTime (if eiger)
* -setNumberofSamples (if chip test board)
* -setDynamicRange
* -setFlippedData
* -setActivate
* -setTenGigaEnable
* -setFlippedData (if eiger)
* -setActivate (if eiger)
* -setTenGigaEnable (if eiger)
* -setStreamingPort
* -setStreamingSourceIP
* -setDataStreamEnable
*
*
@ -293,11 +295,17 @@ class UDPInterface {
/*
* Get Number of Frames expected by receiver from detector
* The data receiver status will change from running to idle when it gets this number of frames FIXME: (Not implemented)
* @return number of frames expected
* The data receiver status will change from running to idle when it gets this number of frames FIXME: (for Leo? Not implemented)
* @return number of samples expected
*/
virtual uint64_t getNumberOfFrames() const = 0;
/*
* Get Number of Samples expected by receiver from detector (for chip test board only)
* @return number of samples expected
*/
virtual uint64_t getNumberofSamples() const = 0;
/**
* Get Dynamic Range or Number of Bits Per Pixel
* @return dynamic range that is 4, 8, 16 or 32
@ -337,6 +345,12 @@ class UDPInterface {
*/
virtual uint32_t getStreamingPort() const = 0;
/**
* Get streaming source ip
* @return streaming source ip
*/
virtual char *getStreamingSourceIP() const = 0;
/*************************************************************************
* Setters ***************************************************************
@ -492,12 +506,19 @@ class UDPInterface {
/**
* Set Number of Frames expected by receiver from detector
* The data receiver status will change from running to idle when it gets this number of frames FIXME: (Not implemented)
* The data receiver status will change from running to idle when it gets this number of frames FIXME: (for Leo? Not implemented)
* @param i number of frames expected
* @return OK or FAIL
*/
virtual int setNumberOfFrames(const uint64_t i) = 0;
/**
* Set Number of Samples expected by receiver from detector
* @param i number of Samples expected
* @return OK or FAIL
*/
virtual int setNumberofSamples(const uint64_t i) = 0;
/**
* Set Dynamic Range or Number of Bits Per Pixel
* @param i dynamic range that is 4, 8, 16 or 32
@ -610,6 +631,12 @@ class UDPInterface {
*/
virtual void setStreamingPort(const uint32_t i) = 0;
/**
* Set streaming source ip
* @param c streaming source ip
*/
virtual void setStreamingSourceIP(const char* c) = 0;
//***callback functions***
/**