Merge pull request #628 from Pacerino/master

Add Extended CAN Bus Frame to SLCAN/LAWICEL
2023-06-13 18:29:22 -04:00
parent 971312486e 165f8a8c6b
commit 6d62c2e9c8
1 changed files with 26 additions and 0 deletions
@@ -475,6 +475,32 @@ void LAWICELSerial::readSerialData()
                }
                break;
            case 'T': //extended frame
+                //TIIIIIIIILDD.
+                buildFrame.setFrameId(mBuildLine.mid(1, 8).toInt(nullptr, 16));
+                buildFrame.isReceived = true;
+                buildFrame.setFrameType(QCanBusFrame::FrameType::DataFrame);
+                buildFrame.setExtendedFrameFormat(true);
+                buildData.resize(mBuildLine.mid(9, 1).toInt());
+                for (int c = 0; c < buildData.size(); c++)
+                {
+                    buildData[c] = mBuildLine.mid(10 + (c*2), 2).toInt(nullptr, 16);
+                }
+                buildFrame.setPayload(buildData);
+                if (!isCapSuspended())
+                {
+                    /* get frame from queue */
+                    CANFrame* frame_p = getQueue().get();
+                    if(frame_p) {
+                        //qDebug() << "Lawicel got frame on bus " << frame_p->bus;
+                        /* copy frame */
+                        *frame_p = buildFrame;
+                        checkTargettedFrame(buildFrame);
+                        /* enqueue frame */
+                        getQueue().queue();
+                    }
+                    else
+                        qDebug() << "can't get a frame, ERROR";
+                }
                break;
            }
            mBuildLine.clear();