tempo-plotter Changeset - cd91cca62e03 · protofusion repositories

Changeset - cd91cca62e03

Parent rev.

Child rev.

[Not reviewed]

new-reader

0 5 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-05-29 16:58:21
hy@ozderya.net

added debug mode (extra log messages) for framed reader

5 files changed with 32 insertions and 1 deletions:

src/framedreader.cpp

src/framedreader.h

src/framedreadersettings.cpp

src/framedreadersettings.h

src/framedreadersettings.ui

0 comments (0 inline, 0 general)

src/framedreader.cpp

➞

Show inline comments

@@ @@ -33,12 +33,13 @@ FramedReader::FramedReader(QIODevice* de @@
     _numOfChannels = _settingsWidget.numOfChannels();
     hasSizeByte = _settingsWidget.frameSize() == 0;
     frameSize = _settingsWidget.frameSize();
     syncWord = _settingsWidget.syncWord();
     checksumEnabled = _settingsWidget.isChecksumEnabled();
     onNumberFormatChanged(_settingsWidget.numberFormat());
     debugModeEnabled = _settingsWidget.isDebugModeEnabled();
     checkSettings();
     // init setting connections
     connect(&_settingsWidget, &FramedReaderSettings::numberFormatChanged,
             this, &FramedReader::onNumberFormatChanged);
@@ @@ -51,12 +52,15 @@ FramedReader::FramedReader(QIODevice* de @@
     connect(&_settingsWidget, &FramedReaderSettings::frameSizeChanged,
             this, &FramedReader::onFrameSizeChanged);
     connect(&_settingsWidget, &FramedReaderSettings::checksumChanged,
             [this](bool enabled){checksumEnabled = enabled; reset();});
     connect(&_settingsWidget, &FramedReaderSettings::debugModeChanged,
             [this](bool enabled){debugModeEnabled = enabled;});
     // init reader state
     reset();
+}
 void FramedReader::enable(bool enabled)
+{
@@ @@ -232,12 +236,13 @@ void FramedReader::onDataReady() @@
                     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)

src/framedreader.h

➞

Show inline comments

@@ @@ -54,12 +54,13 @@ private: @@
     bool paused;
     unsigned settingsInvalid;   /// settings are all valid if this is 0, if not no reading is done
     QByteArray syncWord;
     bool checksumEnabled;
     bool hasSizeByte;
     unsigned frameSize;
     bool debugModeEnabled;
     /// Checks the validity of syncWord and frameSize then shows an
     /// error message. Also updates `settingsInvalid`. If settings are
     /// valid `settingsInvalid` should be `0`.
     void checkSettings();
@@ @@ -76,13 +77,12 @@ private: @@
     /// reads payload portion of the frame, calculates checksum and commits data
     /// @note should be called only if there are enough bytes on device
     void readFrameDataAndCheck();
     // `data` contains i th channels data
     void addChannelData(unsigned int channel, double* data, unsigned size);
 private slots:
     void onDataReady();
     void onNumberFormatChanged(NumberFormat numberFormat);
     void onNumOfChannelsChanged(unsigned value);
     void onSyncWordChanged(QByteArray);

src/framedreadersettings.cpp

➞

Show inline comments

@@ @@ -32,12 +32,15 @@ FramedReaderSettings::FramedReaderSettin @@
     connect(ui->cbChecksum, &QCheckBox::toggled,
             [this](bool enabled)
+            {
                 emit checksumChanged(enabled);
             });
     connect(ui->cbDebugMode, &QCheckBox::toggled,
             this, &FramedReaderSettings::debugModeChanged);
     connect(ui->rbFixedSize, &QRadioButton::toggled,
             ui->spSize, &QWidget::setEnabled);
     connect(ui->rbFixedSize, &QRadioButton::toggled,
             [this](bool checked)
+            {
@@ @@ -132,6 +135,11 @@ unsigned FramedReaderSettings::frameSize @@
+}
 bool FramedReaderSettings::isChecksumEnabled()
+{
     return ui->cbChecksum->isChecked();
+}
 bool FramedReaderSettings::isDebugModeEnabled()
+{
     return ui->cbDebugMode->isChecked();
+}

src/framedreadersettings.h

➞

Show inline comments

@@ @@ -43,22 +43,24 @@ public: @@
     unsigned numOfChannels();
     NumberFormat numberFormat();
     Endianness endianness();
     QByteArray syncWord();
     unsigned frameSize(); /// If frame bye is enabled `0` is returned
     bool isChecksumEnabled();
     bool isDebugModeEnabled();
 signals:
     /// If sync word is invalid (empty or 1 nibble missing at the end)
     /// signaled with an empty array
     void syncWordChanged(QByteArray);
     /// `0` indicates frame size byte is enabled
     void frameSizeChanged(unsigned);
     void checksumChanged(bool);
     void numOfChannelsChanged(unsigned);
     void numberFormatChanged(NumberFormat);
     void debugModeChanged(bool);
 private:
     Ui::FramedReaderSettings *ui;
 private slots:
     void onSyncWordEdited();

src/framedreadersettings.ui

➞

Show inline comments

@@ @@ -72,12 +72,28 @@ @@
     </rect>
    </property>
    <property name="text">
     <string>All is well.</string>
    </property>
   </widget>
   <widget class="QCheckBox" name="cbDebugMode">
    <property name="geometry">
     <rect>
      <x>360</x>
      <y>160</y>
      <width>111</width>
      <height>22</height>
     </rect>
    </property>
    <property name="toolTip">
     <string>Enable printing of extra log messages that can be useful for debugging</string>
    </property>
    <property name="text">
     <string>Debug Mode</string>
    </property>
   </widget>
   <widget class="QGroupBox" name="groupBox">
    <property name="geometry">
     <rect>
      <x>1</x>
      <y>39</y>
      <width>204</width>

0 comments (0 inline, 0 general)