This commit is contained in:
2025-11-15 13:50:28 +01:00
parent 7edc57784c
commit 6fa1d9639a
2 changed files with 136 additions and 136 deletions
+8 -8
View File
@@ -284,14 +284,14 @@ void SClient::checkParseMessage(unique_ptr<Message> p_SPITMessage) {
return;
}
int intActualMessageNumber = (int)(p_SPITMessage->getHeader()->getMessageNumber() & 0xFF);
int msgNum = (int)(p_SPITMessage->getHeader()->getMessageNumber() & 0xFF);
if (intActualMessageNumber == 0) {
if (msgNum == 0) {
parseMessage(std::move(p_SPITMessage));
return;
}
if (mMessageNumberReceived < 0) {
mMessageNumberReceived = intActualMessageNumber;
mMessageNumberReceived = msgNum;
parseMessage(std::move(p_SPITMessage));
return;
}
@@ -300,8 +300,8 @@ void SClient::checkParseMessage(unique_ptr<Message> p_SPITMessage) {
if (intNextMessageNumber > 255 || intNextMessageNumber < 1)
intNextMessageNumber = 1;
if (intActualMessageNumber == intNextMessageNumber) {
mMessageNumberReceived = intActualMessageNumber;
if (msgNum == intNextMessageNumber) {
mMessageNumberReceived = msgNum;
parseMessage(std::move(p_SPITMessage));
// check overtaking messages
@@ -313,10 +313,10 @@ void SClient::checkParseMessage(unique_ptr<Message> p_SPITMessage) {
intNextMessageNumber = 1;
auto &ptrOvertakingSPIT_Message = *it;
intActualMessageNumber = (int)(ptrOvertakingSPIT_Message->getHeader()->getMessageNumber() & 0xFF);
msgNum = (int)(ptrOvertakingSPIT_Message->getHeader()->getMessageNumber() & 0xFF);
if (intActualMessageNumber == intNextMessageNumber) {
mMessageNumberReceived = intActualMessageNumber;
if (msgNum == intNextMessageNumber) {
mMessageNumberReceived = msgNum;
parseMessage(move(ptrOvertakingSPIT_Message));
mOvertakingMessages.erase(it);