tempo-plotter Changeset - 20096d6c5a5f · protofusion repositories

Changeset - 20096d6c5a5f

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-08-12 16:59:40
hy@ozderya.net

fixed pause not working on custom frame format reader

1 file changed with 7 insertions and 0 deletions:

src/framedreader.cpp

0 comments (0 inline, 0 general)

src/framedreader.cpp

➞

Show inline comments

@@ @@ -182,164 +182,171 @@ void FramedReader::onSyncWordChanged(QBy @@
     syncWord = word;
     checkSettings();
     reset();
+}
 void FramedReader::onFrameSizeChanged(unsigned value)
+{
     if (value == 0)
+    {
         hasSizeByte = true;
+    }
     else
+    {
         hasSizeByte = false;
         frameSize = value;
+    }
     checkSettings();
     reset();
+}
 void FramedReader::onDataReady()
+{
     if (settingsInvalid) return;
     // loop until we run out of bytes or more bytes is required
     unsigned bytesAvailable;
     while ((bytesAvailable = _device->bytesAvailable()))
+    {
         if (!gotSync) // read sync word
+        {
             char c;
             _device->getChar(&c);
             if (c == syncWord[sync_i]) // correct sync byte?
+            {
                 sync_i++;
                 if (sync_i == (unsigned) syncWord.length())
+                {
                     gotSync = true;
+                }
+            }
             else
+            {
                 if (debugModeEnabled) qCritical() << "Missed " << sync_i+1 << "th sync byte.";
+            }
+        }
         else if (hasSizeByte && !gotSize) // skipped if fixed frame size
+        {
             frameSize = 0;
             _device->getChar((char*) &frameSize);
             if (frameSize == 0) // check size
+            {
                 qCritical() << "Frame size is 0!";
                 reset();
+            }
             else if (frameSize % (_numOfChannels * sampleSize) != 0)
+            {
                 qCritical() <<
                     QString("Frame size is not multiple of %1 (#channels * sample size)!") \
                     .arg(_numOfChannels * sampleSize);
                 reset();
+            }
             else
+            {
                 if (debugModeEnabled) qDebug() << "Frame size:" << frameSize;
                 gotSize = true;
+            }
+        }
         else // read data bytes
+        {
             // have enough data bytes? (+1 for checksum)
             if (bytesAvailable < (checksumEnabled ? frameSize+1 : frameSize))
+            {
                 break;
+            }
             else // read data bytes and checksum
+            {
                 readFrameDataAndCheck();
                 reset();
+            }
+        }
+    }
+}
 void FramedReader::reset()
+{
     sync_i = 0;
     gotSync = false;
     gotSize = false;
     if (hasSizeByte) frameSize = 0;
     calcChecksum = 0;
+}
 // Important: this function assumes device has enough bytes to read a full frames data and checksum
 void FramedReader::readFrameDataAndCheck()
+{
     // if paused just read and waste data
     if (paused)
+    {
         _device->read((checksumEnabled ? frameSize+1 : frameSize));
         return;
+    }
     // a package is 1 set of samples for all channels
     unsigned numOfPackagesToRead = frameSize / (_numOfChannels * sampleSize);
     double* channelSamples = new double[numOfPackagesToRead * _numOfChannels];
     for (unsigned i = 0; i < numOfPackagesToRead; i++)
+    {
         for (unsigned int ci = 0; ci < _numOfChannels; ci++)
+        {
             channelSamples[ci*numOfPackagesToRead+i] = (this->*readSample)();
+        }
+    }
     // read checksum
     unsigned rChecksum = 0;
     bool checksumPassed = false;
     if (checksumEnabled)
+    {
         _device->read((char*) &rChecksum, 1);
         calcChecksum &= 0xFF;
         checksumPassed = (calcChecksum == rChecksum);
+    }
     if (!checksumEnabled || checksumPassed)
+    {
         // commit data
         for (unsigned int ci = 0; ci < _numOfChannels; ci++)
+        {
             _channelMan->addChannelData(
                 ci,
                 channelSamples + ci*numOfPackagesToRead,
                 numOfPackagesToRead);
             sampleCount += numOfPackagesToRead;
+        }
         emit dataAdded();
+    }
     else
+    {
         qCritical() << "Checksum failed! Received:" << rChecksum << "Calculated:" << calcChecksum;
+    }
     delete channelSamples;
+}
 template<typename T> double FramedReader::readSampleAs()
+{
     T data;
     _device->read((char*) &data, sizeof(data));
     if (checksumEnabled)
+    {
         for (unsigned i = 0; i < sizeof(data); i++)
+        {
             calcChecksum += ((unsigned char*) &data)[i];
+        }
+    }
     if (_settingsWidget.endianness() == LittleEndian)
+    {
         data = qFromLittleEndian(data);
+    }
     else
+    {
         data = qFromBigEndian(data);
+    }
     return double(data);
+}

0 comments (0 inline, 0 general)