Index: sources/applicationcontroller.cpp =================================================================== diff -u -r057d3ef4e29c63235040c5cfe8c6421ef7787d6a -r6c59703781373f33cfec27eacf1f7e4ba1374626 --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 057d3ef4e29c63235040c5cfe8c6421ef7787d6a) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 6c59703781373f33cfec27eacf1f7e4ba1374626) @@ -276,7 +276,7 @@ case 12: // Last frame with CRC dataBytesLeft = 8 - sizeof(seq) - crcBytesLen; - for (int i = 0; i < dataBytesLeft; i++) { + for (int j = 0; j < dataBytesLeft; j++) { data += (char)(0); } seq.value = txCount; @@ -286,7 +286,7 @@ default: // Middle Frames dataBytesLeft = 8 - sizeof(seq); - for (int i = 0; i < dataBytesLeft; i++) { + for (int j = 0; j < dataBytesLeft; j++) { data += (char)(0); } seq.value = txCount; @@ -331,10 +331,10 @@ seq.value = txCount; data += seq.bytes[0]; data += seq.bytes[1]; + data += seq.bytes[2]; data += seq.bytes[3]; - data += seq.bytes[4]; dataBytesLeft = 8 - sizeof(seq) - crcBytesLen; - for (int i = 0; i < dataBytesLeft; i++) { + for (int j = 0; j < dataBytesLeft; j++) { data += (char)(0); } break; @@ -344,9 +344,9 @@ seq.value = txCount; data += seq.bytes[0]; data += seq.bytes[1]; + data += seq.bytes[2]; data += seq.bytes[3]; - data += seq.bytes[4]; - for (int i = 0; i < dataBytesLeft; i++) { + for (int j = 0; j < dataBytesLeft; j++) { data += (char)(0); } break; Index: sources/canbus/frameinterface.cpp =================================================================== diff -u -r057d3ef4e29c63235040c5cfe8c6421ef7787d6a -r6c59703781373f33cfec27eacf1f7e4ba1374626 --- sources/canbus/frameinterface.cpp (.../frameinterface.cpp) (revision 057d3ef4e29c63235040c5cfe8c6421ef7787d6a) +++ sources/canbus/frameinterface.cpp (.../frameinterface.cpp) (revision 6c59703781373f33cfec27eacf1f7e4ba1374626) @@ -143,10 +143,10 @@ * and it can be one of the frames of a message * which has been chopped into frames. */ -void FrameInterface::transmitFrame(Can_Id vFrameId, const QByteArray &vData) +void FrameInterface::transmitFrame(Can_Id vCan_Id, const QByteArray &vData) { QCanBusFrame mFrame; - mFrame.setFrameId(vFrameId); + mFrame.setFrameId(vCan_Id); if (vData.length() > Can::eLenCanFrame) { LOG_ERROR(tr("Payload can't be larger than %1 bytes").arg(Can::eLenCanFrame)); return; Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r37f55056a2748c49f226d686aeb0624349357802 -r6c59703781373f33cfec27eacf1f7e4ba1374626 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 37f55056a2748c49f226d686aeb0624349357802) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 6c59703781373f33cfec27eacf1f7e4ba1374626) @@ -68,7 +68,9 @@ // Mentioned in the switch/case to be registered as a valid message. // // Note : added this line to be able to do the Fake Test - vPayload = Format::fromVariant(vData[0]); + if (vData.count()) { + vPayload = Format::fromVariant(vData[0]); + } break; case Gui::GuiActionType::Acknow: @@ -78,7 +80,9 @@ break; case Gui::GuiActionType::String: - vPayload = Format::fromVariant(vData[0]); + if (vData.count()) { + vPayload = Format::fromVariant(vData[0]); + } break; default: