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

conflict resolution with developer

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-10-03 15:12:56 +02:00
parent 4669d408d4 0b82aabd2b
commit e54767b69d
20 changed files with 220 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsReceiverSoftware/include/DataStreamer.h
View File

@@ -51,6 +51,12 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
*/
static void ResetRunningMask();
/**
* Set Silent Mode
* @param mode 1 sets 0 unsets
*/
static void SetSilentMode(bool mode);
//*** non static functions ***
//*** getters ***
@@ -181,6 +187,11 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
/** Fifo structure */
Fifo* fifo;
/** Silent Mode */
static bool SilentMode;
/** ZMQ Socket - Receiver to Client */
ZmqSocket* zmqSocket;