Runs but hangs...

This commit is contained in:
2024-03-04 12:25:45 +01:00
parent 224ad84ca9
commit 3366414ff8
2 changed files with 5 additions and 3 deletions

View File

@@ -123,6 +123,8 @@ class ecmcDAQChannelItem {
if(first) { if(first) {
dataIndexToReturn_ = 0; dataIndexToReturn_ = 0;
} }
dataIndexToReturn_++;
return 0.0;
if(dataIndexToReturn_ >= dataElementCount_) { if(dataIndexToReturn_ >= dataElementCount_) {
printf("ERROR: Try to read outside data buffer for data item %s\n", name_.c_str()); printf("ERROR: Try to read outside data buffer for data item %s\n", name_.c_str());

View File

@@ -67,13 +67,13 @@ double ecmcDAQDataChannel::getData(int first){
first = false; first = false;
} }
if(dataItems_[currItemIndex_]->empty()) { if(dataItems_[currItemIndex_]->empty() && currItemIndex_+1<itemCounter_) {
// get first index of next dataItem // get first index of next dataItem
first = true; first = true;
currItemIndex_++; currItemIndex_++;
} }
if(currItemIndex_>=itemCounter_) { if(currItemIndex_ >= itemCounter_) {
printf("No more data here!!!\n"); printf("No more data here!!!\n");
return 0; return 0;
//throw std::runtime_error( "Item index out of range"); //throw std::runtime_error( "Item index out of range");