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

Changement à la source de données MQTT

Browse Source 
Début codage Watchdog CAN
This commit is contained in:
jfmartel
2023-06-06 17:59:30 -04:00
parent 31c6287b5d
commit 48e9ca3f9c
36 changed files with 2061 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CANBus/CANMessage.cpp
+22 -16
View File
@@ -19,10 +19,10 @@ CCANMessage::CCANMessage(const quint32 Channel, const TPCANMsg CANMsg, const TPC
}
CCANMessage::~CCANMessage()
{
while (!mSignalsList.isEmpty())
{
delete mSignalsList.takeFirst();
}
// while (!mSignalsList.isEmpty())
// {
// delete mSignalsList.takeFirst();
// }
}
int CCANMessage::SetDataFromDriver(quint32 Channel, TPCANMsg CANMsg, TPCANTimestamp CANTimeStamp)
@@ -51,7 +51,7 @@ int CCANMessage::AddSignal(CCANSignal *NewSignal)
return RET_GENERAL_ERROR;
}
mSignalsList.append(NewSignal);
mSignalsList.append(*NewSignal);
return RET_OK;
}
@@ -90,7 +90,7 @@ int CCANMessage::UpdateValue(CCANMessage *NewDeviceMessage)
for(int i = 0; i < mSignalsList.size(); i++)
{
mSignalsList.at(i)->ComputeNewSignalValue(mCANRawDataIntel, mCANMsgLength);
mSignalsList[i].ComputeNewSignalValue(mCANRawDataIntel, mCANMsgLength);
}
return RET_OK;
@@ -125,21 +125,27 @@ QDataStream &operator>>(QDataStream &in, CCANMessage &dest)
return in;
}
CCANMessage& CCANMessage::operator=(const CCANMessage *source)
CCANMessage& CCANMessage::operator=(const CCANMessage &source)
{
if(source == this)
if(&source == this)
{
return *this;
}
this->mCANChannel = source->mCANChannel;
this->mCANMsgID = source->mCANMsgID;
this->mCANMsgType = source->mCANMsgType;
this->mCANMsgLength = source->mCANMsgLength;
this->mCANMsgData = source->mCANMsgData;
this->mCANMsgMillisecs = source->mCANMsgMillisecs;
this->mCANMsgMillisecsOverflow = source->mCANMsgMillisecsOverflow;
this->mCANMsgMicrosecs = source->mCANMsgMicrosecs;
this->mCANChannel = source.mCANChannel;
this->mCANMsgID = source.mCANMsgID;
this->mCANMsgType = source.mCANMsgType;
this->mCANMsgLength = source.mCANMsgLength;
this->mCANMsgData = source.mCANMsgData;
this->mCANMsgMillisecs = source.mCANMsgMillisecs;
this->mCANMsgMillisecsOverflow = source.mCANMsgMillisecsOverflow;
this->mCANMsgMicrosecs = source.mCANMsgMicrosecs;
this->mSignalsList.clear();
for(int i = 0; i < source.mSignalsList.size(); i++)
{
CCANSignal NewSignal = source.mSignalsList.at(i);
this->mSignalsList.append(NewSignal);
}
return *this;
}