Changed UDS window to work more quickly and use the new rapid frame
system.
This commit is contained in:
+17
-10
@@ -13,9 +13,10 @@ UDSScanWindow::UDSScanWindow(const QVector<CANFrame> *frames, QWidget *parent) :
|
|||||||
currentlyRunning = false;
|
currentlyRunning = false;
|
||||||
|
|
||||||
waitTimer = new QTimer;
|
waitTimer = new QTimer;
|
||||||
waitTimer->setInterval(300);
|
waitTimer->setInterval(100);
|
||||||
|
|
||||||
connect(MainWindow::getReference(), SIGNAL(framesUpdated(int)), this, SLOT(updatedFrames(int)));
|
connect(MainWindow::getReference(), SIGNAL(framesUpdated(int)), this, SLOT(updatedFrames(int)));
|
||||||
|
connect(MainWindow::getReference(), SIGNAL(frameUpdateRapid(int)), this, SLOT(rapidFrames(int)));
|
||||||
connect(ui->btnScan, &QPushButton::clicked, this, &UDSScanWindow::scanUDS);
|
connect(ui->btnScan, &QPushButton::clicked, this, &UDSScanWindow::scanUDS);
|
||||||
connect(waitTimer, &QTimer::timeout, this, &UDSScanWindow::timeOut);
|
connect(waitTimer, &QTimer::timeout, this, &UDSScanWindow::timeOut);
|
||||||
|
|
||||||
@@ -56,7 +57,7 @@ void UDSScanWindow::scanUDS()
|
|||||||
if (buses < 1) buses = 1;
|
if (buses < 1) buses = 1;
|
||||||
|
|
||||||
//start out by sending tester present to every address to see if anyone replies
|
//start out by sending tester present to every address to see if anyone replies
|
||||||
for (id = startID; id < endID; id++)
|
for (id = startID; id <= endID; id++)
|
||||||
{
|
{
|
||||||
frame.ID = id;
|
frame.ID = id;
|
||||||
frame.len = 8;
|
frame.len = 8;
|
||||||
@@ -113,15 +114,9 @@ void UDSScanWindow::scanUDS()
|
|||||||
sendNextMsg();
|
sendNextMsg();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Updates here are sent about every 1/4 second. That's fine for most windows but not this one.
|
||||||
void UDSScanWindow::updatedFrames(int numFrames)
|
void UDSScanWindow::updatedFrames(int numFrames)
|
||||||
{
|
{
|
||||||
CANFrame thisFrame;
|
|
||||||
QString result;
|
|
||||||
int id;
|
|
||||||
int offset = ui->spinReplyOffset->value();
|
|
||||||
CANFrame sentFrame;
|
|
||||||
bool gotReply = false;
|
|
||||||
|
|
||||||
if (numFrames == -1) //all frames deleted. We don't care
|
if (numFrames == -1) //all frames deleted. We don't care
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -130,6 +125,19 @@ void UDSScanWindow::updatedFrames(int numFrames)
|
|||||||
}
|
}
|
||||||
else //just got some new frames. See if they are relevant.
|
else //just got some new frames. See if they are relevant.
|
||||||
{
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Updates here are nearly once per millisecond if there is heavy traffic. That's more like it!
|
||||||
|
void UDSScanWindow::rapidFrames(int numFrames)
|
||||||
|
{
|
||||||
|
CANFrame thisFrame;
|
||||||
|
QString result;
|
||||||
|
int id;
|
||||||
|
int offset = ui->spinReplyOffset->value();
|
||||||
|
CANFrame sentFrame;
|
||||||
|
bool gotReply = false;
|
||||||
|
|
||||||
if (numFrames > modelFrames->count()) return;
|
if (numFrames > modelFrames->count()) return;
|
||||||
|
|
||||||
int numSending = sendingFrames.length();
|
int numSending = sendingFrames.length();
|
||||||
@@ -185,7 +193,6 @@ void UDSScanWindow::updatedFrames(int numFrames)
|
|||||||
ui->listResults->addItem(result);
|
ui->listResults->addItem(result);
|
||||||
sendNextMsg();
|
sendNextMsg();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void UDSScanWindow::timeOut()
|
void UDSScanWindow::timeOut()
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ signals:
|
|||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void updatedFrames(int numFrames);
|
void updatedFrames(int numFrames);
|
||||||
|
void rapidFrames(int numFrames);
|
||||||
void scanUDS();
|
void scanUDS();
|
||||||
void timeOut();
|
void timeOut();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user