Merge pull request #223 from patrickelectric/protocol_detector

Use Ping and not Sensor in QML, fix #212
bluerobotics · Jul 23, 2018 · abd0b4f · abd0b4f
2 parents 9d34a00 + d9bf2fb
commit abd0b4f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/lib/ping-protocol-cpp b/lib/ping-protocol-cpp
diff --git a/src/sensor/ping.cpp b/src/sensor/ping.cpp
@@ -89,7 +89,7 @@ Ping::Ping() : Sensor()
 void Ping::connectLink(const QStringList& connString)
 {
     if(_detector.isRunning()) {
-        _detector.exit();
+        _detector.requestInterruption();
     }
     setAutoDetect(false);
     QStringList logConnString{

diff --git a/src/sensor/ping.h b/src/sensor/ping.h
@@ -28,7 +28,7 @@ class Ping : public Sensor
      *
      * @param connString Connection string defined as (int:string:arg)
      */
-    void connectLink(const QStringList& connString);
+    Q_INVOKABLE void connectLink(const QStringList& connString);
 
     /**
      * @brief debug function

diff --git a/src/sensor/sensor.h b/src/sensor/sensor.h
@@ -47,15 +47,14 @@ class Sensor : public QObject
      * @param connString Connection string defined as (int:string:arg)
      * @param logConnString Log connection string defined as (int:string:arg)
      */
-    Q_INVOKABLE void connectLink(QStringList connString, const QStringList& logConnString = QStringList());
+    void connectLink(QStringList connString, const QStringList& logConnString = QStringList());
 
     /**
      * @brief Add log link
      *
      * @param connString Log connection string defined as (int:string:arg)
-     * @return Q_INVOKABLE connectLinkLog
      */
-    Q_INVOKABLE void connectLinkLog(QStringList connString);
+    void connectLinkLog(QStringList connString);
 
     /**
      * @brief Set auto detect