MQTT client fonctionnel

Otarcik_CAN/Sources/CANBus/CANDataLogger.cpp

@@ -4,7 +4,7 @@
 CCANDataLogger::CCANDataLogger():
     mTopicDeviceString("")
 {
-
+    mMQTTCLient = 0;
 }
 
 
@@ -15,7 +15,7 @@ int CCANDataLogger::LogNewData(const QList<CCANMessage *> *MsgList)
 
     //First, clear the current list
     mMQTTMsgList.clear();
-    qDebug("\n\n\n");
+    //qDebug("\n\n\n");
 
     for(int i = 0; i < MsgList->size(); i++)
     {
@@ -25,7 +25,7 @@ int CCANDataLogger::LogNewData(const QList<CCANMessage *> *MsgList)
             QString MsgPayload = "{";
             QString MsgTopic = mTopicDeviceString;
             MsgTopic.append(Msg->mCANMsgName);
-            MsgTopic.append("/");
+           // MsgTopic.append("/");
 
             //For each signal with new data, insert an entry in the JSon payload string
             for(int signal = 0; signal < Msg->mSignalsList.size(); signal++)
@@ -54,7 +54,7 @@ int CCANDataLogger::LogNewData(const QList<CCANMessage *> *MsgList)
             }
             MsgPayload.append("}");
 
-            qDebug("%s",qPrintable(MsgPayload));
+        //    qDebug("%s",qPrintable(MsgPayload));
 
             CMQTTMessage NewMessage(MsgTopic, MsgPayload);
             mMQTTMsgList.append(NewMessage);
@@ -62,6 +62,10 @@ int CCANDataLogger::LogNewData(const QList<CCANMessage *> *MsgList)
         } //if(MsgList->at(i)->mPendingData == true)
     }
 
+    if(mMQTTCLient != 0)
+    {
+        mMQTTCLient->SendMQTTMessages(mMQTTMsgList);
+    }
     return RET_OK;
 
 }
@@ -72,3 +76,8 @@ int CCANDataLogger::SetMQTTTopicDevice(QString DeviceString)
 
     return RET_OK;
 }
+
+int CCANDataLogger::SetMQTTClient(CMQTTClientWrapper *MQTTClient)
+{
+    mMQTTCLient = MQTTClient;
+}