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

Désactivation du driver Axiomtek de marde

Browse Source
This commit is contained in:
jfmartel
2024-08-27 16:47:41 -04:00
parent eeb7eadaf4
commit 5c8a12d84a
24 changed files with 739 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp
+16 -2
View File
@@ -2,7 +2,9 @@
#include "OtarcikCan.h"
#include "CANDevice.h"
#include "defines.h"
#ifdef ENABLE_CHIPSET_DRIVER
#include "ComputerBoardInterface.h"
#endif
CMQTTClientWrapper::CMQTTClientWrapper()
{
@@ -27,7 +29,9 @@ CMQTTClientWrapper::CMQTTClientWrapper()
mMQTTQueueFlushTimer->stop();
mProgramPtr = 0;
#ifdef ENABLE_CHIPSET_DRIVER
mCPUInterface = 0;
#endif
mMQTTPresenceCANBit = 0;
mMessagesQueueMode = MQTT_DROP_MSG_MODE;
mDisconnectionIsVoluntary = false;
@@ -53,11 +57,13 @@ int CMQTTClientWrapper::SetMQTTParams(CCloudParams *Params)
return RET_OK;
}
#ifdef ENABLE_CHIPSET_DRIVER
int CMQTTClientWrapper::SetCPUInterface(CComputerBoardInterface *CPUIF)
{
mCPUInterface = CPUIF;
return RET_OK;
}
#endif
int CMQTTClientWrapper::SetMQTTServerPresenceCANBit(quint64 CANBit)
{
@@ -267,10 +273,12 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
{
CCANDevice *Device = mCANDevicesList->at(j);
QList<CMQTTMessage> *MessagesList = Device->GetMQTTMessagesList();
if(mCPUInterface)
#ifdef ENABLE_CHIPSET_DRIVER
if(mCPUInterface != 0)
{
MessagesList->append(GetSystemStatusMessage());
}
#endif
if(MessagesList != 0)
{
@@ -289,10 +297,12 @@ void CMQTTClientWrapper::MQTTSendTimerExpired()
{
CCANDevice *Device = mCANDevicesList->at(j);
QList<CMQTTMessage> *MessagesList = Device->GetMQTTMessagesList();
if(mCPUInterface)
#ifdef ENABLE_CHIPSET_DRIVER
if(mCPUInterface != 0)
{
MessagesList->append(GetSystemStatusMessage());
}
#endif
if(MessagesList != 0)
{
@@ -433,6 +443,7 @@ void CMQTTClientWrapper::MQTTMessageStatusChanged(qint32 id, QMqtt::MessageStatu
CMQTTMessage CMQTTClientWrapper::GetSystemStatusMessage()
{
#ifdef ENABLE_CHIPSET_DRIVER
if(mCPUInterface != 0)
{
CComputerBoardState tmp = mCPUInterface->GetComputerBoardState();
@@ -456,6 +467,9 @@ CMQTTMessage CMQTTClientWrapper::GetSystemStatusMessage()
{
return CMQTTMessage();
}
#else
return CMQTTMessage();
#endif
}
Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.h
+4
View File
@@ -29,7 +29,9 @@ public:
CMQTTClientWrapper();
~CMQTTClientWrapper();
int SetMQTTParams(CCloudParams *Params);
#ifdef ENABLE_CHIPSET_DRIVER
int SetCPUInterface(CComputerBoardInterface *CPUIF);
#endif
int SetMQTTServerPresenceCANBit(quint64 CANBit);
int ConnectToBroker();
int NewMQTTMessages(QList<CMQTTMessage> MessagesList);
@@ -59,7 +61,9 @@ private:
QList<CMQTTMessage*> mMQTTMessagesQueue;
bool mIsClientConnecting;
QString mCircularBufferStatusText, mBufferingModeText, mUploadTimeText;
#ifdef ENABLE_CHIPSET_DRIVER
CComputerBoardInterface *mCPUInterface;
#endif
CMQTTMessage GetSystemStatusMessage();
int SendNextQueueMessage();