detectors/slsDetectorPackage
24
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-13 08:38:14 +01:00
Code Issues Actions Packages Releases Activity

done

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-09-16 12:49:39 +02:00
parent 58713a90aa
commit 9c8f663b8e
8 changed files with 198 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
slsReceiverSoftware/include/UDPBaseImplementation.h
View File

@@ -154,6 +154,13 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
*/
uint32_t getFrameToGuiFrequency() const;
/**
* Get the data stream enable
* @return 1 to send via zmq, else 0
*/
uint32_t getDataStreamEnable() const;
/**
* Get Acquisition Period
* @return acquisition period
@@ -298,10 +305,17 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
/**
* Set the Frequency of Frames Sent to GUI
* @param i 0 for random frame requests, n for nth frame frequency
* @param freq 0 for random frame requests, n for nth frame frequency
* @return OK or FAIL
*/
int setFrameToGuiFrequency(const uint32_t i);
int setFrameToGuiFrequency(const uint32_t freq);
/**
* Set the data stream enable
* @param enable 0 to disable, 1 to enable
* @return OK or FAIL
*/
uint32_t setDataStreamEnable(const uint32_t enable);
/**
* Set Acquisition Period
@@ -525,7 +539,9 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
/* Short Frame Enable or index of adc enabled, else -1 if all enabled (gotthard specific) TODO: move to setROI */
int shortFrameEnable;
/** Frequency of Frames sent to GUI */
uint32_t FrameToGuiFrequency;
uint32_t frameToGuiFrequency;
/** Data Stream Enable from Receiver */
int32_t dataStreamEnable;

17
slsReceiverSoftware/include/UDPInterface.h
View File

@@ -214,6 +214,12 @@ class UDPInterface {
*/
virtual uint32_t getFrameToGuiFrequency() const = 0;
/**
* Get the data stream enable
* @return 1 to send via zmq, else 0
*/
virtual uint32_t getDataStreamEnable() const = 0;
/**
* Get Acquisition Period
* @return acquisition period
@@ -355,10 +361,17 @@ class UDPInterface {
/**
* Set the Frequency of Frames Sent to GUI
* @param i 0 for random frame requests, n for nth frame frequency
* @param freq 0 for random frame requests, n for nth frame frequency
* @return OK or FAIL
*/
virtual int setFrameToGuiFrequency(const uint32_t i) = 0;
virtual int setFrameToGuiFrequency(const uint32_t freq) = 0;
/**
* Set the data stream enable
* @param enable 0 to disable, 1 to enable
* @return OK or FAIL
*/
virtual uint32_t setDataStreamEnable(const uint32_t enable) = 0;
/**
* Set Acquisition Period

13
slsReceiverSoftware/include/UDPStandardImplementation.h
View File

@@ -107,12 +107,18 @@ class UDPStandardImplementation: private virtual slsReceiverDefs, public UDPBase
void setShortFrameEnable(const int i);
/**
* Overridden method
* Set the Frequency of Frames Sent to GUI
* @param i 0 for random frame requests, n for nth frame frequency
* @param freq 0 for random frame requests, n for nth frame frequency
* @return OK or FAIL
*/
int setFrameToGuiFrequency(const uint32_t i);
int setFrameToGuiFrequency(const uint32_t freq);
/**
* Set the data stream enable
* @param enable 0 to disable, 1 to enable
* @return OK or FAIL
*/
uint32_t setDataStreamEnable(const uint32_t enable);
/**
* Overridden method
@@ -702,7 +708,6 @@ private:
/** Set to self-terminate data callback threads waiting for semaphores */
bool killAllDataCallbackThreads;
bool dataCallbackEnabled;
//***general and listening thread parameters***

3
slsReceiverSoftware/include/slsReceiverTCPIPInterface.h
View File

@@ -176,6 +176,9 @@ private:
/** Sets the receiver to send every nth frame to gui, or only upon gui request */
int set_read_frequency();
/* Set the data stream enable */
int set_data_stream_enable();
/** Enable File Write*/
int enable_file_write();

4
slsReceiverSoftware/include/sls_receiver_funcs.h
View File

@@ -49,7 +49,9 @@ enum {
F_ENABLE_RECEIVER_OVERWRITE, /**< set overwrite flag in receiver */
F_ENABLE_RECEIVER_TEN_GIGA, /**< enable 10Gbe in receiver */
F_SET_RECEIVER_FIFO_DEPTH /**< set receiver fifo depth */
F_SET_RECEIVER_FIFO_DEPTH, /**< set receiver fifo depth */
F_STREAM_DATA_FROM_RECEIVER /**< stream data from receiver to client */
/* Always append functions hereafter!!! */
};