Fix reconnecting

Author: vranki

README.md

@@ -42,6 +42,10 @@ Known users:
     * Simple to use Voice control made for Zibo's awesome 738X (most likely will work for 739 Ultimate)
     * https://github.com/Najsr/X-Plane-Voice-Control
 
+Note: X-Plane has UDP interface that can be used to do lot of things ExtPlane normally
+would do. See https://github.com/dotsha747/libXPlane-UDP-Client for a c++ client
+for the UDP interface.
+
 ## Transformer ##
 
 ExtPlane-Transformer is an application that works as ExtPlane

clients/extplane-client-qt/dataref.cpp

@@ -16,7 +16,6 @@ DataRef::DataRef(QObject *parent) : QObject(parent)
 }
 
 DataRef::~DataRef() {
-    qDebug() << Q_FUNC_INFO << m_name << m_clientDataRef;
     if(m_clientDataRef) {
         m_clientDataRef->unsubscribe();
         m_clientDataRef = nullptr;

clients/extplane-client-qt/extplaneconnection.cpp

@@ -31,8 +31,8 @@ void ExtPlaneConnection::startConnection() {
 void ExtPlaneConnection::stopConnection() {
     DEBUG << "Stopping connection";
     BasicTcpClient::disconnectFromHost();
-    qDeleteAll(dataRefs.values());
-    dataRefs.clear();
+    // qDeleteAll(dataRefs.values());
+    // dataRefs.clear();
     emit connectionMessage("Stopped connection");
 }
 
@@ -116,10 +116,14 @@ void ExtPlaneConnection::receivedLineSlot(QString & line) {
         if(line=="EXTPLANE 1") {
             server_ok = true;
             emit connectionMessage(QString("Connected to ExtPlane at %1:%2").arg(hostName()).arg(port()));
+            DEBUG << "Setting update interval to " << m_updateInterval;
             setUpdateInterval(m_updateInterval);
             // Sub all refs
-            for(ClientDataRef *ref : dataRefs)
+            DEBUG << "REFS" << dataRefs.count();
+            for(ClientDataRef *ref : dataRefs) {
+                DEBUG << "Subscribing to ref" << ref->name();
                 subRef(ref);
+            }
         }
         return;
     } else { // Handle updates

util/basictcpclient.cpp

@@ -10,15 +10,15 @@ BasicTcpClient::BasicTcpClient(QObject *parent) : QTcpSocket(parent)
     connect(this, SIGNAL(readyRead()), this, SLOT(readClient()));
     connect(this, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
             this, SLOT(socketStateChanged(QAbstractSocket::SocketState)));
-    connect(&reconnectTimer, SIGNAL(timeout()), this, SLOT(tryReconnect()));
-    reconnectTimer.setInterval(5000);
-    reconnectTimer.setSingleShot(false);
+    connect(&m_reconnectTimer, SIGNAL(timeout()), this, SLOT(tryReconnect()));
+    m_reconnectTimer.setInterval(5000);
+    m_reconnectTimer.setSingleShot(false);
 }
 
 void BasicTcpClient::startConnection() {
     close();
 
-    reconnectTimer.start();
+    m_reconnectTimer.start();
     if(m_host.isEmpty() || !m_port) {
         m_networkError = QString("Host or port not set - can't connect to %1:%2").arg(m_host).arg(m_port);
         emit networkErrorChanged(m_networkError);
@@ -105,7 +105,7 @@ void BasicTcpClient::tryReconnect() {
 void BasicTcpClient::socketStateChanged(QAbstractSocket::SocketState state)
 {
     if(connected()) {
-        reconnectTimer.stop();
+        m_reconnectTimer.stop();
         m_networkError = "";
         emit networkErrorChanged(m_networkError);
     }
@@ -117,7 +117,7 @@ void BasicTcpClient::socketError(QAbstractSocket::SocketError err) {
     INFO << "Socket error:" << errorString();
     m_networkError = errorString() + " : " + m_host + ":" + QString::number(m_port);
     emit networkErrorChanged(m_networkError);
-    reconnectTimer.start();
+    m_reconnectTimer.start();
 }
 
 void BasicTcpClient::readClient() {

util/basictcpclient.h

@@ -50,7 +50,7 @@ private slots:
     void socketStateChanged(QAbstractSocket::SocketState state);
 
 private:
-    QTimer reconnectTimer;
+    QTimer m_reconnectTimer;
     QString m_lineEnding;
     QString m_host;
     QString m_networkError;