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

Intégration sur site

Browse Source
This commit is contained in:
jfmartel
2023-06-16 07:20:10 -04:00
parent c93fcf989b
commit 2d6edd0769
25 changed files with 1253 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CANBus/CANDataLogger.cpp
+79 -32
View File
@@ -65,6 +65,7 @@ int CCANDataLogger::SetMQTTTopicDevice(QString DeviceString)
int CCANDataLogger::SetMQTTClient(CMQTTClientWrapper *MQTTClient)
{
mMQTTCLient = MQTTClient;
return RET_OK;
}
QList<CMQTTMessage> *CCANDataLogger::GetMQTTMessagesList()
@@ -81,43 +82,44 @@ QList<CMQTTMessage> *CCANDataLogger::GetMQTTMessagesList()
{
// if(mCANMsgList.size() != 0)
{
const CCANMessage Msg = mCANMsgList.at(i);
QString MsgPayload = "{";
QString MsgTopic = mTopicDeviceString;
MsgTopic.append(Msg.mCANMsgName);
// MsgTopic.append("/");
CCANMessage Msg = mCANMsgList[i];
// QString MsgPayload = "{";
// QString MsgTopic = mTopicDeviceString;
// MsgTopic.append(Msg.mCANMsgName);
// // MsgTopic.append("/");
//For each signal with new data, insert an entry in the JSon payload string
for(int signal = 0; signal < Msg.mSignalsList.size(); signal++)
{
QString SignalData;
CCANSignal Signal = Msg.mSignalsList.at(signal);
if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_UNSIGNED_INT)
{
SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg((quint64)Signal.mPhysicalValue);
}
else if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_SIGNED_INT)
{
SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg((qint64)Signal.mPhysicalValue);
}
else if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_32_BIT_FLOAT ||
Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_64_BIT_DOUBLE)
{
SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg(Signal.mPhysicalValue,0,'f',1);
}
MsgPayload.append(SignalData);
// //For each signal with new data, insert an entry in the JSon payload string
// for(int signal = 0; signal < Msg.mSignalsList.size(); signal++)
// {
// QString SignalData;
// CCANSignal Signal = Msg.mSignalsList.at(signal);
// if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_UNSIGNED_INT)
// {
// SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg((quint64)Signal.mPhysicalValue);
// }
// else if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_SIGNED_INT)
// {
// SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg((qint64)Signal.mPhysicalValue);
// }
// else if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_32_BIT_FLOAT ||
// Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_64_BIT_DOUBLE)
// {
// SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg(Signal.mPhysicalValue,0,'f',1);
// }
// MsgPayload.append(SignalData);
if(signal < Msg.mSignalsList.size()-1)
{
MsgPayload.append(",");
}
}
MsgPayload.append("}");
// if(signal < Msg.mSignalsList.size()-1)
// {
// MsgPayload.append(",");
// }
// }
// MsgPayload.append("}");
// qDebug("%s",qPrintable(MsgPayload));
CMQTTMessage NewMessage(MsgTopic, MsgPayload);
mMQTTMsgList.append(NewMessage);
// CMQTTMessage NewMessage(MsgTopic, MsgPayload);
mMQTTMsgList.append(GetMQTTMessage(&Msg));
} //if(MsgList->at(i)->mPendingData == true)
}
@@ -130,3 +132,48 @@ QList<CMQTTMessage> *CCANDataLogger::GetMQTTMessagesList()
// }
return &mMQTTMsgList;
}
CMQTTMessage CCANDataLogger::GetMQTTMessage(CCANMessage *Msg, bool Format )
{
QString MsgPayload = "{";
QString MsgTopic = mTopicDeviceString;
MsgTopic.append(Msg->mCANMsgName);
// MsgTopic.append("/");
//For each signal with new data, insert an entry in the JSon payload string
for(int signal = 0; signal < Msg->mSignalsList.size(); signal++)
{
QString SignalData;
CCANSignal Signal = Msg->mSignalsList.at(signal);
if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_UNSIGNED_INT)
{
SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg((quint64)Signal.mPhysicalValue);
}
else if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_SIGNED_INT)
{
SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg((qint64)Signal.mPhysicalValue);
}
else if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_32_BIT_FLOAT ||
Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_64_BIT_DOUBLE)
{
SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg(Signal.mPhysicalValue,0,'f',1);
}
MsgPayload.append(SignalData);
if(signal < Msg->mSignalsList.size()-1)
{
MsgPayload.append(",");
if(Format == true)
{
MsgPayload.append("\n");
}
}
}
MsgPayload.append("}");
// qDebug("%s",qPrintable(MsgPayload));
CMQTTMessage NewMessage(MsgTopic, MsgPayload);
return NewMessage;
}