CanBusUtil: Add local echo to flags column

Change-Id: Id2a94cced2bf847e4ce0615e2b9e30523accec23
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

5 files changed, 22 insertions, 17 deletions

diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp
index 3ca96fa..b07d97c 100644
--- a/src/tools/canbusutil/canbusutil.cpp
+++ b/src/tools/canbusutil/canbusutil.cpp
@@ -53,9 +53,9 @@ void CanBusUtil::setShowTimeStamp(bool showTimeStamp)
     m_readTask->setShowTimeStamp(showTimeStamp);
 }
 
-void CanBusUtil::setShowFdFlags(bool showFdFlags)
+void CanBusUtil::setShowFlags(bool showFlags)
 {
-    m_readTask->setShowFdFlags(showFdFlags);
+    m_readTask->setShowFlags(showFlags);
 }
 
 void CanBusUtil::setConfigurationParameter(QCanBusDevice::ConfigurationKey key,
@@ -80,7 +80,7 @@ bool CanBusUtil::start(const QString &pluginName, const QString &deviceName, con
         return false;
 
     if (m_listening) {
-        if (m_readTask->isShowFdFlags())
+        if (m_readTask->isShowFlags())
              m_canDevice->setConfigurationParameter(QCanBusDevice::CanFdKey, true);
         connect(m_canDevice.data(), &QCanBusDevice::framesReceived,
                 m_readTask, &ReadTask::handleFrames);
diff --git a/src/tools/canbusutil/canbusutil.h b/src/tools/canbusutil/canbusutil.h
index 19b7868..4d1b7f4 100644
--- a/src/tools/canbusutil/canbusutil.h
+++ b/src/tools/canbusutil/canbusutil.h
@@ -57,7 +57,7 @@ public:
     explicit CanBusUtil(QTextStream &output, QCoreApplication &app, QObject *parent = nullptr);
 
     void setShowTimeStamp(bool showTimeStamp);
-    void setShowFdFlags(bool showFdFlags);
+    void setShowFlags(bool showFlags);
     void setConfigurationParameter(QCanBusDevice::ConfigurationKey key, const QVariant &value);
     bool start(const QString &pluginName, const QString &deviceName, const QString &data = QString());
     int  printPlugins();
diff --git a/src/tools/canbusutil/main.cpp b/src/tools/canbusutil/main.cpp
index e0f4c0e..1277325 100644
--- a/src/tools/canbusutil/main.cpp
+++ b/src/tools/canbusutil/main.cpp
@@ -94,9 +94,10 @@ int main(int argc, char *argv[])
             CanBusUtil::tr("Show timestamp for each received CAN bus frame."));
     parser.addOption(showTimeStampOption);
 
-    const QCommandLineOption showFdFlagsOption({"i", "info"},
-            CanBusUtil::tr("Show extra info (CAN FD flags) for each received CAN bus frame."));
-    parser.addOption(showFdFlagsOption);
+    const QCommandLineOption showFlagsOption({"i", "info"},
+            CanBusUtil::tr("Show flags bitrate switch, error indicator, and local echo"
+                           " for each received CAN bus frame."));
+    parser.addOption(showFlagsOption);
 
     const QCommandLineOption listDevicesOption({"d", "devices"},
             CanBusUtil::tr("Show available CAN bus devices for the given plugin."));
@@ -149,7 +150,7 @@ int main(int argc, char *argv[])
 
     if (parser.isSet(listeningOption)) {
         util.setShowTimeStamp(parser.isSet(showTimeStampOption));
-        util.setShowFdFlags(parser.isSet(showFdFlagsOption));
+        util.setShowFlags(parser.isSet(showFlagsOption));
     } else if (args.size() == 3) {
         data = args.at(2);
     } else if (args.size() == 1 && parser.isSet(listDevicesOption)) {
diff --git a/src/tools/canbusutil/readtask.cpp b/src/tools/canbusutil/readtask.cpp
index 287540f..86dfb73 100644
--- a/src/tools/canbusutil/readtask.cpp
+++ b/src/tools/canbusutil/readtask.cpp
@@ -45,14 +45,14 @@ void ReadTask::setShowTimeStamp(bool showTimeStamp)
     m_showTimeStamp = showTimeStamp;
 }
 
-bool ReadTask::isShowFdFlags() const
+bool ReadTask::isShowFlags() const
 {
-    return m_showFdFlags;
+    return m_showFlags;
 }
 
-void ReadTask::setShowFdFlags(bool showFlags)
+void ReadTask::setShowFlags(bool showFlags)
 {
-    m_showFdFlags = showFlags;
+    m_showFlags = showFlags;
 }
 
 void ReadTask::handleFrames() {
@@ -73,12 +73,16 @@ void ReadTask::handleFrames() {
                     .arg(frame.timeStamp().microSeconds() / 100, 4, 10, QLatin1Char('0'));
         }
 
-        if (m_showFdFlags) {
-            QString flags = QLatin1String("- -  ");
+        if (m_showFlags) {
+            QString flags = QLatin1String("- - -  ");
+
             if (frame.hasBitrateSwitch())
                 flags[0] = QLatin1Char('B');
             if (frame.hasErrorStateIndicator())
                 flags[2] = QLatin1Char('E');
+            if (frame.hasLocalEcho())
+                flags[4] = QLatin1Char('L');
+
             view += flags;
         }
 
diff --git a/src/tools/canbusutil/readtask.h b/src/tools/canbusutil/readtask.h
index a866d3d..345af35 100644
--- a/src/tools/canbusutil/readtask.h
+++ b/src/tools/canbusutil/readtask.h
@@ -47,8 +47,8 @@ class ReadTask : public QObject
 public:
     explicit ReadTask(QTextStream &m_output, QObject *parent = nullptr);
     void setShowTimeStamp(bool showStamp);
-    bool isShowFdFlags() const;
-    void setShowFdFlags(bool isShowFdFlags);
+    bool isShowFlags() const;
+    void setShowFlags(bool isShowFlags);
 
 public slots:
     void handleFrames();
@@ -57,7 +57,7 @@ public slots:
 private:
     QTextStream &m_output;
     bool m_showTimeStamp = false;
-    bool m_showFdFlags = false;
+    bool m_showFlags = false;
 };
 
 #endif // READTASK_H