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

Pre-update de Qt

Browse Source
This commit is contained in:
jfmartel
2024-04-05 18:47:51 -04:00
parent ff6ae02ed5
commit 71215e98b7
22 changed files with 1816 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp
+99 -6
View File
@@ -8,7 +8,9 @@ CMQTTClientWrapper::CMQTTClientWrapper()
{
connect(&mMQTTClient,&QMqttClient::stateChanged,this,&CMQTTClientWrapper::StateChanged);
connect(&mMQTTClient,&QMqttClient::errorChanged,this,&CMQTTClientWrapper::MQTTClientError);
connect(&mMQTTClient,&QMqttClient::messageSent,this,&CMQTTClientWrapper::MQTTMessageSent);
//connect(&mMQTTClient,&QMqttClient::messageSent,this,&CMQTTClientWrapper::MQTTMessageSent);
connect(&mMQTTClient,SIGNAL(messageSent(qint32)),this,SLOT(MQTTMessageSent(qint32)));
connect(&mMQTTClient,&QMqttClient::messageStatusChanged,this,&CMQTTClientWrapper::MQTTMessageStatusChanged);
mMQTTRefreshTimer = new QTimer;
mMQTTRefreshTimer->setSingleShot(true);
connect(mMQTTRefreshTimer,&QTimer::timeout,this,&CMQTTClientWrapper::MQTTSendTimerExpired);
@@ -32,7 +34,8 @@ CMQTTClientWrapper::CMQTTClientWrapper()
mCircularBufferStatusText = mBufferingModeText = mUploadTimeText = "";
#ifdef MQTT_USE_TIMER_TO_FLUSH_QUEUE
#ifdef ENABLE_DEVELOPMENT_DEBUG_TOOLS
mMQTTDisconnectionForced = false;
#endif
}
@@ -58,6 +61,7 @@ int CMQTTClientWrapper::SetCPUInterface(CComputerBoardInterface *CPUIF)
int CMQTTClientWrapper::SetMQTTServerPresenceCANBit(quint64 CANBit)
{
mMQTTPresenceCANBit = CANBit;
return RET_OK;
}
int CMQTTClientWrapper::StartMQTTClient()
@@ -90,15 +94,29 @@ int CMQTTClientWrapper::ConnectToBroker()
int CMQTTClientWrapper::DisconnectFromBroker()
{
#ifndef ENABLE_DEVELOPMENT_DEBUG_TOOLS
mMQTTClient.disconnectFromHost();
mDisconnectionIsVoluntary = true;
mMessagesQueueMode = MQTT_DROP_MSG_MODE; //It's a voluntary disconnection... don't queue the CAN messages.
#else
mMQTTClient.disconnectFromHost();
if(mMQTTDisconnectionForced == true)
{
mDisconnectionIsVoluntary = false; //emulate an involuntary disconnection
}
else
{
mDisconnectionIsVoluntary = true;
mMessagesQueueMode = MQTT_DROP_MSG_MODE; //It's a voluntary disconnection... don't queue the CAN messages.
}
#endif
return RET_OK;
}
int CMQTTClientWrapper::NewMQTTMessages(QList<CMQTTMessage> MessagesList)
{
Q_UNUSED(MessagesList)
// if(mMQTTClient.state() != QMqttClient::Connected)
// {
// return RET_GENERAL_ERROR;
@@ -156,7 +174,14 @@ void CMQTTClientWrapper::StateChanged()
{
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Client MQTT déconnecté.","CMQTTClientWrapper",true,1);
mProgramPtr->SetMQTTConnectionSatusRequest(false);
#ifndef ENABLE_DEVELOPMENT_DEBUG_TOOLS
mMQTTReconnectTimer->start(MQTT_CLIENT_RECONNECT_TIMEOUT);
#else
if(mMQTTDisconnectionForced == false)
{
mMQTTReconnectTimer->start(MQTT_CLIENT_RECONNECT_TIMEOUT);
}
#endif
#ifdef MQTT_USE_TIMER_TO_FLUSH_QUEUE
mMQTTQueueFlushTimer->stop();
#endif
@@ -243,7 +268,7 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
QList<CMQTTMessage> *MessagesList = Device->GetMQTTMessagesList();
if(mCPUInterface)
{
CComputerBoardState tmp =mCPUInterface->GetComputerBoardState();
MessagesList->append(GetSystemStatusMessage());
}
if(MessagesList != 0)
@@ -265,7 +290,7 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
QList<CMQTTMessage> *MessagesList = Device->GetMQTTMessagesList();
if(mCPUInterface)
{
CComputerBoardState tmp =mCPUInterface->GetComputerBoardState();
MessagesList->append(GetSystemStatusMessage());
}
if(MessagesList != 0)
@@ -289,6 +314,8 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
}
break;
}
case MQTT_DROP_MSG_MODE://Just to please the compiler.
break;
}
}
@@ -327,8 +354,16 @@ void CMQTTClientWrapper::MQTTQueueFlushTimerExipred()
int CMQTTClientWrapper::SendNextQueueMessage()
{
if(mMQTTMessagesQueue.size() == 0)
{
//Should not happen, this is a logical problem with the program
mMessagesQueueMode = MQTT_TRANSMIT_MSG_MODE;
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Erreur de logique dans SendNextQueueMessage(). MessageQueue vide!","CMQTTClientWrapper",true,2);
return RET_GENERAL_ERROR;
}
CMQTTMessage *Msg = mMQTTMessagesQueue.takeFirst();
qint32 res = mMQTTClient.publish(Msg->mMessageTopic,Msg->mMessagePayload.toLocal8Bit(),0,true);
mMQTTClient.publish(Msg->mMessageTopic,Msg->mMessagePayload.toLocal8Bit(),0,true);
QString LogMsg = QString("Envoi d'un message MQTT provenant du buffer. Topic: %1 Payload: %2 FIFO Size: %3").arg(Msg->mMessageTopic).arg(Msg->mMessagePayload).arg(mMQTTMessagesQueue.size());
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(LogMsg,"CMQTTClientWrapper",true,3);
@@ -349,6 +384,7 @@ int CMQTTClientWrapper::SendNextQueueMessage()
int CMQTTClientWrapper::UpdateGUIBufferingStatus()
{
//mProgramPtr->UpdateMQTTBufferingStatusRequest(mBufferingModeText,mCircularBufferStatusText,mRemainingBufferingTimeText);
return RET_OK;
}
void CMQTTClientWrapper::MQTTClientError(QMqttClient::ClientError error)
@@ -359,6 +395,8 @@ void CMQTTClientWrapper::MQTTClientError(QMqttClient::ClientError error)
//This function is used only when flushing the msg queue
void CMQTTClientWrapper::MQTTMessageSent(qint32 MsgID)
{
Q_UNUSED(MsgID)
qDebug("MQTT msg ID %d sent",MsgID);
#ifndef MQTT_USE_TIMER_TO_FLUSH_QUEUE
if(mMessagesQueueMode != MQTT_QUEUE_MSG_MODE)
{
@@ -370,8 +408,63 @@ void CMQTTClientWrapper::MQTTMessageSent(qint32 MsgID)
mMessagesQueueMode = MQTT_TRANSMIT_MSG_MODE;
return;
}
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Message MQTT de la FIFO transmis, transmission du prochain...","CMQTTClientWrapper",true,1);
SendNextQueueMessage();
#endif
}
void CMQTTClientWrapper::MQTTMessageStatusChanged(qint32 id, QMqtt::MessageStatus s, const QMqttMessageStatusProperties &properties)
{
qDebug("Mqtt %d message status changed",id);
}
CMQTTMessage CMQTTClientWrapper::GetSystemStatusMessage()
{
if(mCPUInterface != 0)
{
CComputerBoardState tmp = mCPUInterface->GetComputerBoardState();
QString MsgPayload = "{";
QString MsgTopic = "GeneralPCStatus";
//Millisecs to EPOCH timestamp format
qint64 TimeStamp = QDateTime::currentDateTime().toMSecsSinceEpoch();
MsgPayload.append(QString("\"timestamp\":%1,").arg(TimeStamp));
MsgPayload.append(QString("\"CPU Temperature\":%1").arg(tmp.mSystemTemperature));
MsgPayload.append(QString("\"Board 12V\":%1").arg(tmp.mSystem12V));
MsgPayload.append(QString("\"IO Port\":%1,").arg(tmp.mIOPortState));
MsgPayload.append("}");
// qDebug("%s",qPrintable(MsgPayload));
CMQTTMessage NewMessage(MsgTopic, MsgPayload);
return NewMessage;
}
else
{
return CMQTTMessage();
}
}
#ifdef ENABLE_DEVELOPMENT_DEBUG_TOOLS
int CMQTTClientWrapper::ForceMQTTClientDisconnection(bool Disconnect)
{
if(Disconnect == true)
{
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Forcing MQTT client disconnection for debug tests...","CMQTTClientWrapper",true,3);
mMQTTDisconnectionForced = true;
DisconnectFromBroker();
}
else
{
mMQTTDisconnectionForced = false;
if(mMessagesQueueMode != MQTT_TRANSMIT_MSG_MODE)
{
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Reconnecting MQTT client after being forced OFF...","CMQTTClientWrapper",true,3);
ConnectToBroker();
}
}
}
#endif
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.h
+6
View File
@@ -40,6 +40,10 @@ public:
int StopMQTTClient();
quint64 GetMQTTServerPresenceCANMask();
#ifdef ENABLE_DEVELOPMENT_DEBUG_TOOLS
int ForceMQTTClientDisconnection(bool Disconnect);
bool mMQTTDisconnectionForced;
#endif
COtarcikCan *mProgramPtr;
@@ -56,6 +60,7 @@ private:
bool mIsClientConnecting;
QString mCircularBufferStatusText, mBufferingModeText, mUploadTimeText;
CComputerBoardInterface *mCPUInterface;
CMQTTMessage GetSystemStatusMessage();
int SendNextQueueMessage();
quint64 mMQTTPresenceCANBit;
@@ -70,6 +75,7 @@ public slots:
void MQTTQueueFlushTimerExipred();
void MQTTClientError(QMqttClient::ClientError error);
void MQTTMessageSent(qint32 MsgID);
void MQTTMessageStatusChanged(qint32 id, QMqtt::MessageStatus s, const QMqttMessageStatusProperties &properties);
};