t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:collin80/SavvyCAN into WIP

Browse Source
This commit is contained in:
Collin Kidder
2021-02-01 22:15:49 -05:00
parent 9c14920ffc e6fc48e9e4
commit 91610202ce
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framefileio.cpp
+1 -1
View File
@@ -1400,7 +1400,7 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector<CANFrame>* frames)
if (line.at(41) == 'R') { if (line.at(41) == 'R') {
thisFrame.setFrameType(QCanBusFrame::RemoteRequestFrame); thisFrame.setFrameType(QCanBusFrame::RemoteRequestFrame);
} else { } else {
QList<QByteArray> tokens = line.mid(41, thisFrame.payload().length() * 3).split(' '); QList<QByteArray> tokens = line.mid(41, numBytes * 3).split(' ');
thisFrame.setFrameType(QCanBusFrame::DataFrame); thisFrame.setFrameType(QCanBusFrame::DataFrame);
for (int d = 0; d < numBytes; d++) for (int d = 0; d < numBytes; d++)
{ {
framesenderwindow.cpp
+1 -1
View File
@@ -694,7 +694,7 @@ void FrameSenderWindow::processTriggerText(int line)
QString tok = trigToks.at(x); QString tok = trigToks.at(x);
if (tok.left(2) == "ID") if (tok.left(2) == "ID")
{ {
thisTrigger.ID = Utility::ParseStringToNum(tok.right(tok.length() - 3)); thisTrigger.ID = Utility::ParseStringToNum(tok.right(tok.length() - 2));
if (thisTrigger.maxCount == -1) thisTrigger.maxCount = 10000000; if (thisTrigger.maxCount == -1) thisTrigger.maxCount = 10000000;
if (thisTrigger.milliseconds == -1) thisTrigger.milliseconds = 0; //by default don't count, just send it upon trigger if (thisTrigger.milliseconds == -1) thisTrigger.milliseconds = 0; //by default don't count, just send it upon trigger