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

V1.03 déployée sur site (station Laval)

Browse Source
This commit is contained in:
jfmartel
2023-09-07 14:55:23 -04:00
parent 2919a2cfe7
commit a8037acadc
84 changed files with 4833 additions and 1315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CANBus/CANDataLogger.cpp
+5 -1
View File
@@ -143,7 +143,11 @@ CMQTTMessage CCANDataLogger::GetMQTTMessage(CCANMessage *Msg, bool Format )
#ifdef MQTT_TIMESTAMP_IN_PAYLOAD
QString TimeStamp = QDateTime::currentDateTime().toString(Qt::ISODate);
MsgPayload.append(QString("\"timestamp\":%1,").arg(TimeStamp));
MsgPayload.append(QString("\"timestamp\":\"%1\",").arg(TimeStamp));
if(Format == true)
{
MsgPayload.append("\n");
}
#endif
//For each signal with new data, insert an entry in the JSon payload string
Otarcik_CAN/Sources/CANBus/CANWatchdog.cpp
+5 -2
View File
@@ -33,7 +33,7 @@ int CCANWatchdog::Init(CPCANInterface *CANDriverIF, TPCANHandle CANDeviceHandle,
mWatchdogTimer->setSingleShot(false);
mWDTCANMsg.mCANMsgID = CANMsgID;
mWDTCANMsg.mCANMsgLength = 1;
mWDTCANMsg.mCANMsgLength = 8;
mWDTCANMsg.mCANMsgData.clear();
mWDTCANMsg.mCANMsgData.append(8,(char)0x00);
mWDTCANMsg.mCANMsgName = "Watchdog";
@@ -49,7 +49,10 @@ void CCANWatchdog::WatchdogTimeoutTimerExpired()
data ^= (char)0x01;
mWDTCANMsg.mCANMsgData[0] = data;
mCANDriverIF->SendCANMessage(mCANDeviceHandle,mWDTCANMsg);
// qDebug("Sending 0x%X to CAN",data);
qDebug("Sending 0x%X to CAN",data);
//QString LogMsg = QString("Écriture du watchdog. CAN ID %1 Payload: 0x%2 0x%3 0x%4 0x%5 0x%6 0x%7 0x%8 0x%9").arg(mWDTCANMsg.mCANMsgID,0,16).arg(mWDTCANMsg.mCANMsgData.at(7),0,16).arg(mWDTCANMsg.mCANMsgData.at(6),0,16).arg(mWDTCANMsg.mCANMsgData.at(5),0,16).arg(mWDTCANMsg.mCANMsgData.at(4),0,16).arg(mWDTCANMsg.mCANMsgData.at(3),0,16).arg(mWDTCANMsg.mCANMsgData.at(2),0,16).arg(mWDTCANMsg.mCANMsgData.at(1),0,16).arg(mWDTCANMsg.mCANMsgData[0],0,16);
QString LogMsg = QString("Écriture du watchdog. CAN ID 0x%1").arg(mWDTCANMsg.mCANMsgID,0,16);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(LogMsg,true,3);
}
int CCANWatchdog::StartWDT()
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.cpp
+6 -3
View File
@@ -94,10 +94,13 @@ void CLoggingSettingsPage::ModifyParamsBtnPressed()
mCloudParams.mMQTTBrokerPassword = ui->mCloudMQTTPasswordEdit->text();
mCloudParams.mMQTTBrokerPort = (quint32)ui->mCloudMQTTPortSpinBx->value();
mCloudParams.mMQTTTopicPrefix = ui->mCloudMQTTTopicPrefixEdit->text();
if(mCloudParams.mMQTTTopicPrefix.endsWith("/") == false)
if(mCloudParams.mMQTTTopicPrefix.isEmpty() == false)
{
mCloudParams.mMQTTTopicPrefix.append("/");
ui->mCloudMQTTTopicPrefixEdit->setText(mCloudParams.mMQTTTopicPrefix);
if(mCloudParams.mMQTTTopicPrefix.endsWith("/") == false)
{
mCloudParams.mMQTTTopicPrefix.append("/");
ui->mCloudMQTTTopicPrefixEdit->setText(mCloudParams.mMQTTTopicPrefix);
}
}
mCloudParams.mMQTTBrokerUserName = ui->mCloudMQTTUserNameEdit->text();
mCloudParams.mMQTTTransmitTimeout = (quint32)ui->mCloudMQTTRefreshRateSpinBx->value();
Otarcik_CAN/Sources/MainWindow.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ CMainWindow::CMainWindow(QWidget *parent) :
ui(new Ui::CMainWindow)
{
ui->setupUi(this);
QMainWindow::statusBar()->showMessage("V1.02");
QMainWindow::statusBar()->showMessage("V1.03");
mGeneralStatusPage = new CGeneralStatusPage(this);
mMainWindowWidget = new QTabWidget(this);
Otarcik_CAN/Sources/defines.h
+1 -1
View File
@@ -12,7 +12,7 @@
#define MQTT_TIMESTAMP_IN_PAYLOAD //Defining this adds the local timestamp to each MQTT payloads.
//#define USE_TOPIC_PREFIX
#define USE_TOPIC_PREFIX
#define FORCE_FLOAT_REPRESENTATION
enum eOtarcikGeneralReturns