Changed sending windows to use new system where there are arbitrary number of buses

This commit is contained in:
Collin Kidder
2016-12-08 20:21:42 -05:00
parent 2cfacc6519
commit ddfac100d2
9 changed files with 49 additions and 62 deletions
+3 -2
View File
@@ -5,6 +5,7 @@
#include <QFileDialog>
#include <QDebug>
#include "mainwindow.h"
#include "connections/canconmanager.h"
/*
* notes: need to ensure that you grab pointers when modifying data structures and dont
@@ -151,7 +152,7 @@ void FrameSenderWindow::processIncomingFrame(CANFrame *frame)
sendingData[sd].count++;
doModifiers(sd);
updateGridRow(sd);
sendCANFrame(&sendingData[sd]);
CANConManager::getInstance()->sendFrame(sendingData[sd]);
}
else //delayed sending frame
{
@@ -354,7 +355,7 @@ void FrameSenderWindow::handleTick()
doModifiers(i);
updateGridRow(i);
qDebug() << "About to try to send a frame";
emit sendCANFrame(&sendingData[i]);
CANConManager::getInstance()->sendFrame(sendingData[i]);
if (trigger->ID > 0) trigger->readyCount = false; //reset flag if this is a timed ID trigger
}
}