jfmartel/YULTek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changement à la source de données MQTT

Browse Source 
Début codage Watchdog CAN
This commit is contained in:
jfmartel
2023-06-06 17:59:30 -04:00
parent 31c6287b5d
commit 48e9ca3f9c
36 changed files with 2061 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp
+63 -20
View File
@@ -1,11 +1,13 @@
#include "MQTTClientWrapper.h"
#include "OtarcikCan.h"
#include "CANDevice.h"
CMQTTClientWrapper::CMQTTClientWrapper()
{
connect(&mMQTTClient,&QMqttClient::stateChanged,this,&CMQTTClientWrapper::StateChanged);
mMQTTRefreshTimer = new QTimer;
mMQTTRefreshTimer->setSingleShot(true);
connect(mMQTTRefreshTimer,&QTimer::timeout,this,&CMQTTClientWrapper::MQTTSendTimerExpired);
mProgramPtr = 0;
}
@@ -45,29 +47,29 @@ int CMQTTClientWrapper::DisconnectFromBroker()
int CMQTTClientWrapper::NewMQTTMessages(QList<CMQTTMessage> MessagesList)
{
if(mMQTTClient.state() != QMqttClient::Connected)
{
return RET_GENERAL_ERROR;
}
if(mMQTTRefreshTimer->remainingTime() > 0)
{
// qDebug("MQTT timer value: %d",mMQTTRefreshTimer->remainingTime());
return RET_OK;
}
if(MessagesList.isEmpty())
{
return RET_GENERAL_ERROR;
}
// if(mMQTTClient.state() != QMqttClient::Connected)
// {
// return RET_GENERAL_ERROR;
// }
// if(mMQTTRefreshTimer->remainingTime() > 0)
// {
// // qDebug("MQTT timer value: %d",mMQTTRefreshTimer->remainingTime());
// return RET_OK;
// }
// if(MessagesList.isEmpty())
// {
// return RET_GENERAL_ERROR;
// }
for(int i = 0; i < MessagesList.size(); i++)
{
qint32 res = mMQTTClient.publish(MessagesList.at(i).mMessageTopic,MessagesList.at(i).mMessagePayload.toLocal8Bit(),0,true);
qDebug("%s : %s",qPrintable(MessagesList.at(i).mMessageTopic), qPrintable(MessagesList.at(i).mMessagePayload));
// for(int i = 0; i < MessagesList.size(); i++)
// {
// qint32 res = mMQTTClient.publish(MessagesList.at(i).mMessageTopic,MessagesList.at(i).mMessagePayload.toLocal8Bit(),0,true);
// qDebug("%s : %s",qPrintable(MessagesList.at(i).mMessageTopic), qPrintable(MessagesList.at(i).mMessagePayload));
}
mMQTTRefreshTimer->start(mMQTTParams.mMQTTTransmitTimeout);
qDebug("Sent %d MQTT messages",MessagesList.size());
// }
// mMQTTRefreshTimer->start(mMQTTParams.mMQTTTransmitTimeout);
// qDebug("Sent %d MQTT messages",MessagesList.size());
return RET_OK;
@@ -81,11 +83,13 @@ void CMQTTClientWrapper::StateChanged()
{
qDebug("MQTT client Disconnected");
mProgramPtr->SetMQTTConnectionSatusRequest(false);
mMQTTRefreshTimer->stop();
break;
}
case QMqttClient::Connected:
{
mProgramPtr->SetMQTTConnectionSatusRequest(true);
mMQTTRefreshTimer->start(mMQTTParams.mMQTTTransmitTimeout);
qDebug("MQTT client Connected");
break;
}
@@ -101,4 +105,43 @@ int CMQTTClientWrapper::SendMQTTTestMessage()
{
mMQTTClient.publish(QString("Otarcik/Test"),QString("Test Payload").toLocal8Bit(),0,true);
qDebug("Sending MQTT test message");
return RET_OK;
}
int CMQTTClientWrapper::SetCANDevicesList(QList<CCANDevice *> *List)
{
mCANDevicesList = List;
return RET_OK;
}
void CMQTTClientWrapper::MQTTSendTimerExpired()
{
if(mMQTTClient.state() != QMqttClient::Connected)
{
return;
}
if(mCANDevicesList == 0)
{
return;
}
//Send the CANbus devices messsages
for(int j = 0; j < mCANDevicesList->size(); j++)
{
CCANDevice *Device = mCANDevicesList->at(j);
QList<CMQTTMessage> *MessagesList = Device->GetMQTTMessagesList();
if(MessagesList != 0)
{
for(int i = 0; i < MessagesList->size(); i++)
{
qint32 res = mMQTTClient.publish(MessagesList->at(i).mMessageTopic,MessagesList->at(i).mMessagePayload.toLocal8Bit(),0,true);
qDebug("%s : %s",qPrintable(MessagesList->at(i).mMessageTopic), qPrintable(MessagesList->at(i).mMessagePayload));
}
qDebug("Sent %d MQTT messages",MessagesList->size());
}
}
mMQTTRefreshTimer->start(mMQTTParams.mMQTTTransmitTimeout);
}
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.h
+5
View File
@@ -8,7 +8,9 @@
#include "MQTTMessage.h"
#include <QList>
class COtarcikCan;
class CCANDevice;
class CMQTTClientWrapper : public QObject
{
@@ -21,6 +23,7 @@ public:
int NewMQTTMessages(QList<CMQTTMessage> MessagesList);
int DisconnectFromBroker();
int SendMQTTTestMessage();
int SetCANDevicesList(QList<CCANDevice*> *List);
COtarcikCan *mProgramPtr;
QString mMQTTClientID;
@@ -30,9 +33,11 @@ public:
private:
QMqttClient mMQTTClient;
CCloudParams mMQTTParams;
QList<CCANDevice*> *mCANDevicesList;
public slots:
void StateChanged();
void MQTTSendTimerExpired();
};