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

V1.08 déployée

Browse Source
This commit is contained in:
jfmartel
2025-05-03 20:26:14 -04:00
parent e298577c2f
commit c0dd8562fb
24 changed files with 1623 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CloudLogging/CloudParams.cpp
+11 -3
View File
@@ -8,8 +8,10 @@ CCloudParams::CCloudParams()
mMQTTBrokerPort = 0;
mMQTTBrokerUserName.clear();
mMQTTTopicPrefix.clear();
mMQTTTransmitTimeout = 0;
mMQTTTransmitTimeout = 10000;
mMQTTClientID.clear();
mMQTTBrokerActive = true;
mMQTTEnableDataLogging = true;
}
CCloudParams::CCloudParams(CCloudParams &Other)
@@ -26,7 +28,9 @@ QDataStream &operator>>(QDataStream &in, CCloudParams &dest)
>> dest.mMQTTBrokerUserName
>> dest.mMQTTTopicPrefix
>> dest.mMQTTTransmitTimeout
>> dest.mMQTTClientID;
>> dest.mMQTTClientID
>> dest.mMQTTBrokerActive
>> dest.mMQTTEnableDataLogging;
return in;
}
@@ -38,7 +42,9 @@ QDataStream &operator<<(QDataStream &out, const CCloudParams &source)
<< source.mMQTTBrokerUserName
<< source.mMQTTTopicPrefix
<< source.mMQTTTransmitTimeout
<< source.mMQTTClientID;
<< source.mMQTTClientID
<< source.mMQTTBrokerActive
<< source.mMQTTEnableDataLogging;
return out;
}
@@ -56,6 +62,8 @@ CCloudParams& CCloudParams::operator=(const CCloudParams &source)
this->mMQTTTopicPrefix = source.mMQTTTopicPrefix;
this->mMQTTTransmitTimeout = source.mMQTTTransmitTimeout;
this->mMQTTClientID = source.mMQTTClientID;
this->mMQTTBrokerActive = source.mMQTTBrokerActive;
this->mMQTTEnableDataLogging = source.mMQTTEnableDataLogging;
return *this;
}
Otarcik_CAN/Sources/CloudLogging/CloudParams.h
+2
View File
@@ -15,6 +15,8 @@ public:
quint32 mMQTTBrokerPort;
quint32 mMQTTTransmitTimeout;
QString mMQTTClientID;
bool mMQTTBrokerActive;
bool mMQTTEnableDataLogging;
CCloudParams &operator=(const CCloudParams &source);
};
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp
+94 -12
View File
@@ -73,7 +73,7 @@ int CMQTTClientWrapper::SetMQTTServerPresenceCANBit(quint64 CANBit)
int CMQTTClientWrapper::StartMQTTClient()
{
mMQTTRefreshTimer->start(mMQTTParams.mMQTTTransmitTimeout);
// mMQTTRefreshTimer->start(mMQTTParams.mMQTTTransmitTimeout);
mMessagesQueueMode = MQTT_QUEUE_MSG_MODE;
ConnectToBroker();
mCircularBufferStatusText = QString("0/%1 messages (0\%)").arg(MQTT_CLIENT_MSG_QUEUE_SIZE);
@@ -193,7 +193,7 @@ void CMQTTClientWrapper::StateChanged()
#ifdef MQTT_USE_TIMER_TO_FLUSH_QUEUE
mMQTTQueueFlushTimer->stop();
#endif
if(mDisconnectionIsVoluntary == false)
if(mDisconnectionIsVoluntary == false && mMQTTParams.mMQTTEnableDataLogging == true)
{
mMessagesQueueMode = MQTT_QUEUE_MSG_MODE; //We're disconnected, queue all the messages.
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Passage en mode buffering des messages MQTT pour %1").arg(mMQTTParams.mMQTTBrokerHostName),"CMQTTClientWrapper",true,1);
@@ -255,26 +255,26 @@ int CMQTTClientWrapper::SetCANDevicesList(QList<CCANDevice *> *List)
return RET_OK;
}
void CMQTTClientWrapper::MQTTSendTimerExpired()
int CMQTTClientWrapper::SendMQTTMessages(QList<CMQTTMessage> *MessagesList)
{
if(mMessagesQueueMode == MQTT_DROP_MSG_MODE)
{
return;
return RET_OK;
}
if(mCANDevicesList == 0)
{
return;
return RET_GENERAL_ERROR;
}
//Send the CANbus devices messsages
for(int j = 0; j < mCANDevicesList->size(); j++)
// for(int j = 0; j < mCANDevicesList->size(); j++)
{
switch(mMessagesQueueMode)
{
case MQTT_TRANSMIT_MSG_MODE:
{
CCANDevice *Device = mCANDevicesList->at(j);
QList<CMQTTMessage> *MessagesList = Device->GetMQTTMessagesList();
// CCANDevice *Device = mCANDevicesList->at(j);
// QList<CMQTTMessage> *MessagesList = Device->GetMQTTMessagesList();
#ifdef ENABLE_CHIPSET_DRIVER
if(mCPUInterface != 0)
{
@@ -287,7 +287,7 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
for(int i = 0; i < MessagesList->size(); i++)
{
qint32 res = mMQTTClient.publish(MessagesList->at(i).mMessageTopic,MessagesList->at(i).mMessagePayload.toLocal8Bit(),1,true);
QString LogMsg = QString("Envoi d'un message MQTT. Topic: %1 Payload: %2 Result: %3").arg(MessagesList->at(i).mMessageTopic).arg(MessagesList->at(i).mMessagePayload).arg(res);
QString LogMsg = QString("%4 : Envoi d'un message MQTT. Topic: %1 Payload: %2 Result: %3").arg(MessagesList->at(i).mMessageTopic).arg(MessagesList->at(i).mMessagePayload).arg(res).arg(mMQTTParams.mMQTTBrokerHostName);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(LogMsg,"CMQTTClientWrapper",true,3);
}
@@ -297,8 +297,8 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
}
case MQTT_QUEUE_MSG_MODE:
{
CCANDevice *Device = mCANDevicesList->at(j);
QList<CMQTTMessage> *MessagesList = Device->GetMQTTMessagesList();
// CCANDevice *Device = mCANDevicesList->at(j);
// QList<CMQTTMessage> *MessagesList = Device->GetMQTTMessagesList();
#ifdef ENABLE_CHIPSET_DRIVER
if(mCPUInterface != 0)
{
@@ -332,7 +332,88 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
}
}
mMQTTRefreshTimer->start(mMQTTParams.mMQTTTransmitTimeout);
// mMQTTRefreshTimer->start(mMQTTParams.mMQTTTransmitTimeout);
return RET_OK;
}
void CMQTTClientWrapper::MQTTSendTimerExpired()
{
// if(mMessagesQueueMode == MQTT_DROP_MSG_MODE)
// {
// return;
// }
// if(mCANDevicesList == 0)
// {
// return;
// }
// //Send the CANbus devices messsages
// for(int j = 0; j < mCANDevicesList->size(); j++)
// {
// switch(mMessagesQueueMode)
// {
// case MQTT_TRANSMIT_MSG_MODE:
// {
// CCANDevice *Device = mCANDevicesList->at(j);
// QList<CMQTTMessage> *MessagesList = Device->GetMQTTMessagesList();
//#ifdef ENABLE_CHIPSET_DRIVER
// if(mCPUInterface != 0)
// {
// MessagesList->append(GetSystemStatusMessage());
// }
//#endif
// if(MessagesList != 0)
// {
// for(int i = 0; i < MessagesList->size(); i++)
// {
// qint32 res = mMQTTClient.publish(MessagesList->at(i).mMessageTopic,MessagesList->at(i).mMessagePayload.toLocal8Bit(),1,true);
// QString LogMsg = QString("Envoi d'un message MQTT. Topic: %1 Payload: %2 Result: %3").arg(MessagesList->at(i).mMessageTopic).arg(MessagesList->at(i).mMessagePayload).arg(res);
// CGeneralMessagesLogDispatcher::instance()->AddLogMessage(LogMsg,"CMQTTClientWrapper",true,3);
// }
// // qDebug("Sent %d MQTT messages",MessagesList->size());
// }
// break;
// }
// case MQTT_QUEUE_MSG_MODE:
// {
// CCANDevice *Device = mCANDevicesList->at(j);
// QList<CMQTTMessage> *MessagesList = Device->GetMQTTMessagesList();
//#ifdef ENABLE_CHIPSET_DRIVER
// if(mCPUInterface != 0)
// {
// MessagesList->append(GetSystemStatusMessage());
// }
//#endif
// if(MessagesList != 0)
// {
// for(int i = 0; i < MessagesList->size(); i++)
// {
// CMQTTMessage *NewMsg = new CMQTTMessage(MessagesList->at(i).mMessageTopic,MessagesList->at(i).mMessagePayload);
// if(mMQTTMessagesQueue.size() >= MQTT_CLIENT_MSG_QUEUE_SIZE)
// {
// delete mMQTTMessagesQueue.takeFirst();
// CGeneralMessagesLogDispatcher::instance()->AddLogMessage("FIFO pleine, retrait du premier message.","CMQTTClientWrapper",true,3);
// }
// mMQTTMessagesQueue.append(NewMsg);
// QString LogMsg = QString("Ajout d'un message MQTT à la FIFO. Topic: %1 Payload: %2 FIFO size: %3").arg(MessagesList->at(i).mMessageTopic).arg(MessagesList->at(i).mMessagePayload).arg(mMQTTMessagesQueue.size());
// CGeneralMessagesLogDispatcher::instance()->AddLogMessage(LogMsg,"CMQTTClientWrapper",true,3);
// mCircularBufferStatusText = QString("%2/%1 messages (0%3\%)").arg(MQTT_CLIENT_MSG_QUEUE_SIZE).arg(mMQTTMessagesQueue.size()).arg((mMQTTMessagesQueue.size()/MQTT_CLIENT_MSG_QUEUE_SIZE)*100);
// UpdateGUIBufferingStatus();
// }
// }
// break;
// }
// case MQTT_DROP_MSG_MODE://Just to please the compiler.
// break;
// }
// }
// mMQTTRefreshTimer->start(mMQTTParams.mMQTTTransmitTimeout);
}
@@ -344,6 +425,7 @@ void CMQTTClientWrapper::MQTTReconnectTimerExpired()
return;
}
DisconnectFromBroker();
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Tentative de connexion au serveur MQTT...","CMQTTClientWrapper",true,1);
ConnectToBroker();
}
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.h
+1
View File
@@ -43,6 +43,7 @@ public:
quint64 GetMQTTServerPresenceCANMask();
bool IsMQTTClientConnected();
QString GetMQTTClientConnectionState();
int SendMQTTMessages(QList<CMQTTMessage> *MessagesList);
#ifdef ENABLE_DEVELOPMENT_DEBUG_TOOLS
int ForceMQTTClientDisconnection(bool Disconnect);