detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-14 22:07:12 +02:00
Code Issues Actions Packages Releases Activity

client and receiver: silent mode put into shared memory, works properly now

Browse Source
This commit is contained in:
maliakal_d
2018-08-15 19:51:04 +02:00
parent 87e8333dfd
commit 830f92dedc
19 changed files with 89 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsReceiverSoftware/src/DataStreamer.cpp
View File

@ -16,7 +16,8 @@ using namespace std;
const string DataStreamer::TypeName = "DataStreamer";
DataStreamer::DataStreamer(int ind, Fifo*& f, uint32_t* dr, int* sEnable, uint64_t* fi, int* fd, char* ajh) :
DataStreamer::DataStreamer(int ind, Fifo*& f, uint32_t* dr, int* sEnable,
uint64_t* fi, int* fd, char* ajh, bool* sm) :
ThreadObject(ind),
runningFlag(0),
generalData(0),
@ -25,14 +26,14 @@ DataStreamer::DataStreamer(int ind, Fifo*& f, uint32_t* dr, int* sEnable, uint64
dynamicRange(dr),
shortFrameEnable(sEnable),
fileIndex(fi),
flippedData(fd),
additionJsonHeader(ajh),
silentMode(sm),
acquisitionStartedFlag(false),
measurementStartedFlag(false),
firstAcquisitionIndex(0),
firstMeasurementIndex(0),
completeBuffer(0),
flippedData(fd),
additionJsonHeader(ajh),
silentMode(false)
completeBuffer(0)
{
if(ThreadObject::CreateThread() == FAIL)
throw std::exception();
@ -272,7 +273,3 @@ int DataStreamer::RestreamStop() {
}
void DataStreamer::SetSilentMode(bool mode) {
silentMode = mode;
}