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

Corrections et développement. V1.01

Browse Source
This commit is contained in:
jfmartel
2023-06-17 12:58:06 -04:00
parent 428cec7c29
commit abc91f1932
37 changed files with 850 additions and 13378 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CloudLogging/CloudParams.cpp
+5 -2
View File
@@ -13,7 +13,8 @@ QDataStream &operator>>(QDataStream &in, CCloudParams &dest)
>> dest.mMQTTBrokerPort
>> dest.mMQTTBrokerUserName
>> dest.mMQTTTopicPrefix
>> dest.mMQTTTransmitTimeout;
>> dest.mMQTTTransmitTimeout
>> dest.mMQTTClientID;
return in;
}
@@ -24,7 +25,8 @@ QDataStream &operator<<(QDataStream &out, const CCloudParams &source)
<< source.mMQTTBrokerPort
<< source.mMQTTBrokerUserName
<< source.mMQTTTopicPrefix
<< source.mMQTTTransmitTimeout;
<< source.mMQTTTransmitTimeout
<< source.mMQTTClientID;
return out;
}
@@ -41,6 +43,7 @@ CCloudParams& CCloudParams::operator=(const CCloudParams &source)
this->mMQTTBrokerUserName = source.mMQTTBrokerUserName;
this->mMQTTTopicPrefix = source.mMQTTTopicPrefix;
this->mMQTTTransmitTimeout = source.mMQTTTransmitTimeout;
this->mMQTTClientID = source.mMQTTClientID;
return *this;
}
Otarcik_CAN/Sources/CloudLogging/CloudParams.h
+1
View File
@@ -13,6 +13,7 @@ public:
QString mMQTTTopicPrefix;
quint32 mMQTTBrokerPort;
quint32 mMQTTTransmitTimeout;
QString mMQTTClientID;
CCloudParams &operator=(const CCloudParams &source);
};
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp
+3 -3
View File
@@ -23,7 +23,7 @@ CMQTTClientWrapper::~CMQTTClientWrapper()
int CMQTTClientWrapper::SetMQTTParams(CCloudParams *Params)
{
mMQTTParams = *Params;
mMQTTClientID = "Otarcik_Station_Ville_Emard";
// mMQTTClientID = "Otarcik_Station_Ville_Emard";
return RET_OK;
}
@@ -32,7 +32,7 @@ int CMQTTClientWrapper::ConnectToBroker()
{
//Setup the client before connecting.
mMQTTClient.setAutoKeepAlive(true);
mMQTTClient.setClientId(mMQTTClientID);
mMQTTClient.setClientId(mMQTTParams.mMQTTClientID);
mMQTTClient.setHostname(mMQTTParams.mMQTTBrokerHostName);
mMQTTClient.setPort(mMQTTParams.mMQTTBrokerPort);
mMQTTClient.setPassword(mMQTTParams.mMQTTBrokerPassword);
@@ -143,7 +143,7 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
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));
QString LogMsg = QString("Envoi d'un message MQTT. Topic: %1 Payload: %2").arg(MessagesList->at(i).mMessageTopic).arg(MessagesList->at(i).mMessagePayload);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(LogMsg,false);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(LogMsg,true,3);
}
qDebug("Sent %d MQTT messages",MessagesList->size());
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
int SetCANDevicesList(QList<CCANDevice*> *List);
COtarcikCan *mProgramPtr;
QString mMQTTClientID;
// QString mMQTTClientID;
QTimer *mMQTTRefreshTimer;
QTimer *mMQTTReconnectTimer;