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);
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.cpp
+19
View File
@@ -18,6 +18,8 @@ CLoggingSettingsPage::CLoggingSettingsPage(QWidget *parent) :
ui->mCloudMQTTTopicPrefixEdit->setEnabled(false);
ui->mCloudMQTTUserNameEdit->setEnabled(false);
ui->mCloudMQTTRefreshRateSpinBx->setEnabled(false);
ui->mCloudMQTTActivateBrokerChkBx->setEnabled(false);
ui->mCloudMQTTActivateBufferingChkBx->setEnabled(false);
ui->mCloudMQTTClientID->setEnabled(false);
ui->mDevicePresCancelBtn->hide();
@@ -199,6 +201,8 @@ void CLoggingSettingsPage::ModifyParamsBtnPressed()
ui->mCloudMQTTRefreshRateSpinBx->setEnabled(true);
ui->mCloudMQTTClientID->setEnabled(true);
ui->mChangeParamsBtn->setText("Appliquer");
ui->mCloudMQTTActivateBufferingChkBx->setEnabled(true);
ui->mCloudMQTTActivateBrokerChkBx->setEnabled(true);
ui->mMQTTBrokersList->setEnabled(false);
}
else
@@ -213,6 +217,8 @@ void CLoggingSettingsPage::ModifyParamsBtnPressed()
ui->mCloudMQTTUserNameEdit->setEnabled(false);
ui->mCloudMQTTRefreshRateSpinBx->setEnabled(false);
ui->mCloudMQTTClientID->setEnabled(false);
ui->mCloudMQTTActivateBufferingChkBx->setEnabled(false);
ui->mCloudMQTTActivateBrokerChkBx->setEnabled(false);
ui->mMQTTBrokersList->setEnabled(true);
@@ -242,8 +248,15 @@ void CLoggingSettingsPage::ModifyParamsBtnPressed()
BrokerParams->mMQTTBrokerUserName = ui->mCloudMQTTUserNameEdit->text();
BrokerParams->mMQTTTransmitTimeout = (quint32)ui->mCloudMQTTRefreshRateSpinBx->value();
BrokerParams->mMQTTClientID = ui->mCloudMQTTClientID->text();
BrokerParams->mMQTTBrokerActive = ui->mCloudMQTTActivateBrokerChkBx->isChecked();
BrokerParams->mMQTTEnableDataLogging = ui->mCloudMQTTActivateBufferingChkBx->isChecked();
ui->mMQTTBrokersList->item(index)->setText(BrokerParams->mMQTTBrokerHostName);
for(int i = 0; i < mCloudParams.size(); i++)
{
mCloudParams.at(i)->mMQTTTransmitTimeout = ui->mCloudMQTTRefreshRateSpinBx->value();
}
mProgramHandle->SaveCloudLoggingConfigRequest(&mCloudParams);
@@ -254,6 +267,7 @@ void CLoggingSettingsPage::ModifyParamsBtnPressed()
void CLoggingSettingsPage::CancelBtnPressed()
{
EditMode = false;
ui->mChangeParamsBtn->setText("Modifier");
ui->mCancelBtn->hide();
ui->mCloudMQTTHostNameEdit->setEnabled(false);
ui->mCloudMQTTPasswordEdit->setEnabled(false);
@@ -263,6 +277,8 @@ void CLoggingSettingsPage::CancelBtnPressed()
ui->mCloudMQTTRefreshRateSpinBx->setEnabled(false);
ui->mCloudMQTTClientID->setEnabled(false);
ui->mMQTTBrokersList->setEnabled(true);
ui->mCloudMQTTActivateBrokerChkBx->setEnabled(false);
ui->mCloudMQTTActivateBufferingChkBx->setEnabled(false);
UpdateCloudConfig();
}
@@ -283,6 +299,8 @@ int CLoggingSettingsPage::UpdateCloudConfig()
ui->mCloudMQTTUserNameEdit->setText(BrokerParams->mMQTTBrokerUserName);
ui->mCloudMQTTRefreshRateSpinBx->setValue(BrokerParams->mMQTTTransmitTimeout);
ui->mCloudMQTTClientID->setText(BrokerParams->mMQTTClientID);
ui->mCloudMQTTActivateBrokerChkBx->setChecked(BrokerParams->mMQTTBrokerActive);
ui->mCloudMQTTActivateBufferingChkBx->setChecked(BrokerParams->mMQTTEnableDataLogging);
return RET_OK;
}
@@ -671,6 +689,7 @@ void CLoggingSettingsPage::DeleteMQTTBrokerBtnPressed()
else
{
ui->mMQTTBrokersList->setCurrentRow(0);
mProgramHandle->SaveCloudLoggingConfigRequest(&mCloudParams);
}
}
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.ui
+56 -30
View File
@@ -37,7 +37,7 @@
<x>220</x>
<y>100</y>
<width>351</width>
<height>271</height>
<height>261</height>
</rect>
</property>
<property name="title">
@@ -235,44 +235,30 @@
</rect>
</property>
</widget>
<widget class="QLabel" name="mCloudMQTTRefreshRateLbl">
<widget class="QCheckBox" name="mCloudMQTTActivateBufferingChkBx">
<property name="geometry">
<rect>
<x>10</x>
<y>220</y>
<width>181</width>
<x>180</x>
<y>230</y>
<width>101</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Taux de rafraichissement (ms):</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<string>Activer buffering</string>
</property>
</widget>
<widget class="QSpinBox" name="mCloudMQTTRefreshRateSpinBx">
<widget class="QCheckBox" name="mCloudMQTTActivateBrokerChkBx">
<property name="geometry">
<rect>
<x>200</x>
<y>220</y>
<x>50</x>
<y>230</y>
<width>101</width>
<height>22</height>
<height>20</height>
</rect>
</property>
<property name="minimum">
<number>1000</number>
</property>
<property name="maximum">
<number>500000</number>
</property>
<property name="singleStep">
<number>1</number>
<property name="text">
<string>Broker actif</string>
</property>
</widget>
</widget>
@@ -297,8 +283,8 @@
<widget class="QPushButton" name="mChangeParamsBtn">
<property name="geometry">
<rect>
<x>430</x>
<y>380</y>
<x>410</x>
<y>370</y>
<width>80</width>
<height>22</height>
</rect>
@@ -310,8 +296,8 @@
<widget class="QPushButton" name="mCancelBtn">
<property name="geometry">
<rect>
<x>320</x>
<y>380</y>
<x>300</x>
<y>370</y>
<width>80</width>
<height>22</height>
</rect>
@@ -1104,6 +1090,46 @@ et l'heure</string>
<string>Ajouter</string>
</property>
</widget>
<widget class="QLabel" name="mCloudMQTTRefreshRateLbl">
<property name="geometry">
<rect>
<x>20</x>
<y>60</y>
<width>181</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Taux de rafraichissement (ms):</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QSpinBox" name="mCloudMQTTRefreshRateSpinBx">
<property name="geometry">
<rect>
<x>210</x>
<y>60</y>
<width>101</width>
<height>22</height>
</rect>
</property>
<property name="minimum">
<number>1000</number>
</property>
<property name="maximum">
<number>500000</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
</widget>
</widget>
<resources/>
<connections/>
Otarcik_CAN/Sources/OtarcikCan.cpp
+41 -20
View File
@@ -28,6 +28,11 @@ COtarcikCan::COtarcikCan(QObject *parent) : QObject(parent)
connect(mWatchdogTimer,&QTimer::timeout,this,&COtarcikCan::WatchdogUpdateTimerExpired);
mWatchdogTimer->setSingleShot(false);
mWatchdogTimer->setInterval(1000);
mMQTTDataTransmitTimer = new QTimer;
connect(mMQTTDataTransmitTimer,&QTimer::timeout,this,&COtarcikCan::MQTTDataTransmitTimerExpired);
mMQTTDataTransmitTimer->setInterval(10000);
mMQTTDataTransmitTimer->setSingleShot(false);
}
COtarcikCan::~COtarcikCan()
@@ -93,19 +98,20 @@ int COtarcikCan::Start()
mMainWindow.mDataLoggingSettingsPage->SetCloudParams(mCloudLoggingParamsList);
for(int i = 0; i < mCloudLoggingParamsList->size(); i++)
{
CMQTTClientWrapper *NewMQTTWrapper = new CMQTTClientWrapper;
NewMQTTWrapper->mProgramPtr = this;
NewMQTTWrapper->SetMQTTParams(mCloudLoggingParamsList->at(i));
NewMQTTWrapper->SetCANDevicesList(&mCANDevicesList);
if(mCloudLoggingParamsList->at(i)->mMQTTBrokerActive == true)
{
CMQTTClientWrapper *NewMQTTWrapper = new CMQTTClientWrapper;
NewMQTTWrapper->mProgramPtr = this;
NewMQTTWrapper->SetMQTTParams(mCloudLoggingParamsList->at(i));
NewMQTTWrapper->SetCANDevicesList(&mCANDevicesList);
#ifdef ENABLE_CHIPSET_DRIVER
NewMQTTWrapper->SetCPUInterface(&mCPUInterface);
NewMQTTWrapper->SetCPUInterface(&mCPUInterface);
#endif
NewMQTTWrapper->SetMQTTServerPresenceCANBit(mSystemConfig.GetDeviceDetectionConfig()->mMQTTDetectionCANStatusBit);
mCANBusMQTTClientList.append(NewMQTTWrapper);
NewMQTTWrapper->SetMQTTServerPresenceCANBit(mSystemConfig.GetDeviceDetectionConfig()->mMQTTDetectionCANStatusBit);
mCANBusMQTTClientList.append(NewMQTTWrapper);
}
}
// mCANBusMQTTClient.SetMQTTParams(mCloudLoggingParamsList->at(0)); //TODO: Fix that
// mCANBusMQTTClient.SetCANDevicesList(&mCANDevicesList);
mMQTTDataTransmitTimer->setInterval(mCloudLoggingParamsList->at(0)->mMQTTTransmitTimeout); //Use the first
mGeneralSystemParams = *mSystemConfig.GetGeneralSystemSettings();
mMainWindow.mDataLoggingSettingsPage->SetGeneralSettingsParams(&mGeneralSystemParams);
@@ -156,12 +162,11 @@ int COtarcikCan::Start()
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Démarrage du logiciel OtarcikCAN"),"CPCANInterface");
// mCANBusMQTTClient.ConnectToBroker();
//mCANBusMQTTClient.StartMQTTClient();
for(int i = 0; i < mCANBusMQTTClientList.size(); i++)
{
mCANBusMQTTClientList.at(i)->StartMQTTClient();
}
mMQTTDataTransmitTimer->start();
mMainWindow.mCANbusSettingsPage->SetDevicesList(&mCANDevicesList);
connect(&mInternetMonitor,&CInternetMonitor::InternetStateChanged,mMainWindow.mGeneralStatusPage,&CGeneralStatusPage::InternetStatusChanged);
@@ -256,17 +261,20 @@ int COtarcikCan::SaveCloudLoggingConfigRequest(QList<CCloudParams *> *CloudParam
}
for(int i = 0; i < CloudParams->size(); i++)
{
CMQTTClientWrapper *NewMQTTWrapper = new CMQTTClientWrapper;
NewMQTTWrapper->mProgramPtr = this;
NewMQTTWrapper->SetMQTTParams(CloudParams->at(i));
NewMQTTWrapper->SetCANDevicesList(&mCANDevicesList);
if(mCloudLoggingParamsList->at(i)->mMQTTBrokerActive == true)
{
CMQTTClientWrapper *NewMQTTWrapper = new CMQTTClientWrapper;
NewMQTTWrapper->mProgramPtr = this;
NewMQTTWrapper->SetMQTTParams(CloudParams->at(i));
NewMQTTWrapper->SetCANDevicesList(&mCANDevicesList);
#ifdef ENABLE_CHIPSET_DRIVER
NewMQTTWrapper->SetCPUInterface(&mCPUInterface);
NewMQTTWrapper->SetCPUInterface(&mCPUInterface);
#endif
NewMQTTWrapper->SetMQTTServerPresenceCANBit(mSystemConfig.GetDeviceDetectionConfig()->mMQTTDetectionCANStatusBit);
mCANBusMQTTClientList.append(NewMQTTWrapper);
NewMQTTWrapper->SetMQTTServerPresenceCANBit(mSystemConfig.GetDeviceDetectionConfig()->mMQTTDetectionCANStatusBit);
mCANBusMQTTClientList.append(NewMQTTWrapper);
NewMQTTWrapper->StartMQTTClient();
NewMQTTWrapper->StartMQTTClient();
}
}
mSystemConfig.mDeviceDetectionParams.SetCANPresenceMonitors(mCANBusMQTTClientList.at(0),&mLANDevicesPresenceMonitor,&mInternetMonitor);
//mCANBusMQTTClient.SetMQTTParams(mCloudLoggingParamsList->at(0)); //TODO: Fix
@@ -383,6 +391,19 @@ int COtarcikCan::SaveCANWatchdogSettingsRequest(CCANWatchdogConfig *CANWatchdogC
return mSystemConfig.SaveConfig();
}
void COtarcikCan::MQTTDataTransmitTimerExpired()
{
QList<CMQTTMessage> *MQTTMsgList;
for(int i = 0; i< mCANDevicesList.size(); i++)
{
MQTTMsgList = mCANDevicesList.at(i)->GetMQTTMessagesList();
for(int i = 0; i < mCANBusMQTTClientList.size(); i++)
{
mCANBusMQTTClientList.at(i)->SendMQTTMessages(MQTTMsgList);
}
}
}
void COtarcikCan::WatchdogUpdateTimerExpired() //Time to kick the CPU watchdog
{
#ifdef ENABLE_CHIPSET_DRIVER
Otarcik_CAN/Sources/OtarcikCan.h
+2
View File
@@ -28,6 +28,7 @@ public:
/// CMQTTClientWrapper mCANBusMQTTClient;
QList<CMQTTClientWrapper*> mCANBusMQTTClientList;
QTimer *mGPTimer;
QTimer *mMQTTDataTransmitTimer;
#ifdef ENABLE_CHIPSET_DRIVER
CComputerBoardInterface mCPUInterface;
#endif
@@ -77,6 +78,7 @@ signals:
public slots:
void GPTimerExpired();
void WatchdogUpdateTimerExpired();
void MQTTDataTransmitTimerExpired();
};
#endif // OTARCIKCAN_H
Otarcik_CAN/Sources/defines.h
+2 -2
View File
@@ -2,12 +2,12 @@
#define DEFINES_H
#define SOFTWARE_VERSION "1.07-DBG"
#define SOFTWARE_VERSION "1.08"
#define GENERAL_MESSAGES_MAX_LOG_LINES 5000 //The number of lines of general status log we keep in the general status window (avoids fucking up because you know.... RAM)
#define GENERAL_MESSAGES_SEND_TO_STDOUT //Comment this line to avoid printing log messages using qDebug.
#define MQTT_CLIENT_RECONNECT_TIMEOUT 5000 //Time in ms between reconnect attemps to MQTT broker when connection is lost
#define MQTT_CLIENT_RECONNECT_TIMEOUT 10000 //Time in ms between reconnect attemps to MQTT broker when connection is lost
#define MQTT_CLIENT_MSG_QUEUE_FLUSH_TIMEOUT 50 //The delay in ms between the TX messages when flushing the msg queue after a server reconnection
#define MQTT_CLIENT_MSG_QUEUE_SIZE 5000 //The maximum number of messages to be queued. Older messages are lost when adding a new one in a full queue
#define MQTT_TIMESTAMP_IN_PAYLOAD //Defining this adds the local timestamp to each MQTT payloads.