Quick test implementation of UDS scanner
This commit is contained in:
+2
-1
@@ -934,7 +934,8 @@ void MainWindow::showUDSScanWindow()
|
||||
{
|
||||
if (!udsScanWindow)
|
||||
{
|
||||
udsScanWindow = new UDSScanWindow;
|
||||
udsScanWindow = new UDSScanWindow(model->getListReference());
|
||||
connect(udsScanWindow, SIGNAL(sendCANFrame(const CANFrame*,int)), worker, SLOT(sendFrame(const CANFrame*,int)));
|
||||
}
|
||||
udsScanWindow->show();
|
||||
}
|
||||
|
||||
+88
-1
@@ -1,14 +1,101 @@
|
||||
#include "udsscanwindow.h"
|
||||
#include "ui_udsscanwindow.h"
|
||||
#include "mainwindow.h"
|
||||
|
||||
UDSScanWindow::UDSScanWindow(QWidget *parent) :
|
||||
UDSScanWindow::UDSScanWindow(const QVector<CANFrame> *frames, QWidget *parent) :
|
||||
QDialog(parent),
|
||||
ui(new Ui::UDSScanWindow)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
modelFrames = frames;
|
||||
|
||||
connect(MainWindow::getReference(), SIGNAL(framesUpdated(int)), this, SLOT(updatedFrames(int)));
|
||||
connect(ui->btnScan, &QPushButton::clicked, this, &UDSScanWindow::scanUDS);
|
||||
|
||||
ui->cbBuses->addItem("0");
|
||||
ui->cbBuses->addItem("1");
|
||||
ui->cbBuses->addItem("Both");
|
||||
|
||||
}
|
||||
|
||||
UDSScanWindow::~UDSScanWindow()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void UDSScanWindow::scanUDS()
|
||||
{
|
||||
ui->listResults->clear();
|
||||
|
||||
CANFrame *frame;
|
||||
|
||||
int buses = ui->cbBuses->currentIndex();
|
||||
buses++;
|
||||
if (buses < 1) buses = 1;
|
||||
for (int id = 0x7E0; id < 0x7E8; id++)
|
||||
{
|
||||
if (buses & 1)
|
||||
{
|
||||
frame = new CANFrame;
|
||||
frame->ID = id;
|
||||
frame->len = 8;
|
||||
frame->extended = false;
|
||||
frame->data[0] = 2;
|
||||
frame->data[1] = 0x10;
|
||||
frame->data[2] = 1;
|
||||
frame->data[3] = 0;frame->data[4] = 0;frame->data[5] = 0;
|
||||
frame->data[6] = 0;frame->data[7] = 0;
|
||||
frame->bus = 0;
|
||||
emit sendCANFrame(frame, 0);
|
||||
}
|
||||
if (buses & 2)
|
||||
{
|
||||
frame = new CANFrame;
|
||||
frame->ID = id;
|
||||
frame->len = 8;
|
||||
frame->extended = false;
|
||||
frame->data[0] = 2;
|
||||
frame->data[1] = 0x10;
|
||||
frame->data[2] = 1;
|
||||
frame->data[3] = 0;frame->data[4] = 0;frame->data[5] = 0;
|
||||
frame->data[6] = 0;frame->data[7] = 0;
|
||||
frame->bus = 1;
|
||||
emit sendCANFrame(frame, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void UDSScanWindow::updatedFrames(int numFrames)
|
||||
{
|
||||
CANFrame thisFrame;
|
||||
QString result;
|
||||
int id;
|
||||
if (numFrames == -1) //all frames deleted. We don't care
|
||||
{
|
||||
}
|
||||
else if (numFrames == -2) //all new set of frames. Don't care.
|
||||
{
|
||||
}
|
||||
else //just got some new frames. See if they are relevant.
|
||||
{
|
||||
for (int i = modelFrames->count() - numFrames; i < modelFrames->count(); i++)
|
||||
{
|
||||
thisFrame = modelFrames->at(i);
|
||||
id = thisFrame.ID;
|
||||
if (id >= 0x7E8 && id <= 0x7EF)
|
||||
{
|
||||
if (thisFrame.data[1] == 0x50)
|
||||
{
|
||||
result = "ECU at 0x" + QString::number(id, 16) + " bus " + QString::number(thisFrame.bus) + " accepts UDS standard diag";
|
||||
ui->listResults->addItem(result);
|
||||
}
|
||||
if (thisFrame.data[i] == 0x7f)
|
||||
{
|
||||
result = "ECU at 0x" + QString::number(id, 16) + " bus " + QString::number(thisFrame.bus) + " rejects UDS standard diag";
|
||||
ui->listResults->addItem(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+11
-1
@@ -1,6 +1,8 @@
|
||||
#ifndef UDSSCANWINDOW_H
|
||||
#define UDSSCANWINDOW_H
|
||||
|
||||
#include "can_structs.h"
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
namespace Ui {
|
||||
@@ -12,11 +14,19 @@ class UDSScanWindow : public QDialog
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit UDSScanWindow(QWidget *parent = 0);
|
||||
explicit UDSScanWindow(const QVector<CANFrame> *frames, QWidget *parent = 0);
|
||||
~UDSScanWindow();
|
||||
|
||||
signals:
|
||||
void sendCANFrame(const CANFrame *, int);
|
||||
|
||||
private slots:
|
||||
void updatedFrames(int numFrames);
|
||||
void scanUDS();
|
||||
|
||||
private:
|
||||
Ui::UDSScanWindow *ui;
|
||||
const QVector<CANFrame> *modelFrames;
|
||||
};
|
||||
|
||||
#endif // UDSSCANWINDOW_H
|
||||
|
||||
+33
-3
@@ -1,17 +1,47 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>UDSScanWindow</class>
|
||||
<widget name="UDSScanWindow" class="QDialog">
|
||||
<widget class="QDialog" name="UDSScanWindow">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>300</height>
|
||||
<width>742</width>
|
||||
<height>527</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Results</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QListWidget" name="listResults"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Buses to scan</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="cbBuses"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnScan">
|
||||
<property name="text">
|
||||
<string>Start Scan</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
|
||||
Reference in New Issue
Block a user