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

Major refactoring of ISOTP and UDS code to be more generic and have

Browse Source 
better functionality.
This commit is contained in:
Collin Kidder
2017-05-15 22:38:59 -04:00
parent d766d442b9
commit 1ccb9bac2e
15 changed files with 494 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
re/frameinfowindow.h
+1
View File
@@ -6,6 +6,7 @@
#include <QListWidget>
#include <QTreeWidget>
#include "can_structs.h"
#include "bus_protocols/j1939_handler.h"
namespace Ui {
class FrameInfoWindow;
re/isotp_interpreterwindow.cpp
+1 -1
View File
@@ -9,7 +9,7 @@ ISOTP_InterpreterWindow::ISOTP_InterpreterWindow(const QVector<CANFrame> *frames
ui->setupUi(this);
modelFrames = frames;
decoder = new ISOTP_HANDLER(modelFrames);
decoder = ISOTP_HANDLER::getInstance();
connect(MainWindow::getReference(), &MainWindow::framesUpdated, this, &ISOTP_InterpreterWindow::updatedFrames);
connect(MainWindow::getReference(), &MainWindow::framesUpdated, decoder, &ISOTP_HANDLER::updatedFrames);
re/isotp_interpreterwindow.h
+4 -2
View File
@@ -2,8 +2,10 @@
#define ISOTP_INTERPRETERWINDOW_H
#include <QDialog>
#include "can_structs.h"
#include "isotp_handler.h"
#include "bus_protocols/isotp_handler.h"
class ISOTP_MESSAGE;
class ISOTP_HANDLER;
namespace Ui {
class ISOTP_InterpreterWindow;
re/udsscanwindow.cpp
+40 -48
View File
@@ -2,6 +2,7 @@
#include "ui_udsscanwindow.h"
#include "mainwindow.h"
#include "connections/canconmanager.h"
#include "bus_protocols/uds_handler.h"
UDSScanWindow::UDSScanWindow(const QVector<CANFrame> *frames, QWidget *parent) :
QDialog(parent),
@@ -72,19 +73,20 @@ void UDSScanWindow::saveResults()
}
}
void UDSScanWindow::sendOnBuses(CANFrame &frame, int buses)
void UDSScanWindow::sendOnBuses(UDS_TESTS test, int buses)
{
if (buses < ui->cbBuses->count()- 1)
int busList = buses;
if (busList < ui->cbBuses->count() - 1)
{
frame.bus = buses;
sendingFrames.append(frame);
test.bus = buses;
sendingFrames.append(test);
}
else
{
for (int c = 0; c < ui->cbBuses->count() - 1; c++)
{
frame.bus = c;
sendingFrames.append(frame);
test.bus = c;
sendingFrames.append(test);
}
}
}
@@ -105,7 +107,7 @@ void UDSScanWindow::scanUDS()
ui->listResults->clear();
sendingFrames.clear();
CANFrame frame;
UDS_TESTS test;
int typ, id;
int startID, endID;
startID = Utility::ParseStringToNum(ui->txtStartID->text());
@@ -115,48 +117,34 @@ void UDSScanWindow::scanUDS()
for (id = startID; id <= endID; id++)
{
frame.ID = id;
frame.len = 8;
frame.extended = false;
test.ID = id;
if (ui->ckTester->isChecked())
{
frame.data[0] = 2;
frame.data[1] = 0x3E; //tester present
frame.data[2] = 0;
frame.data[3] = 0;frame.data[4] = 0;frame.data[5] = 0;
frame.data[6] = 0;frame.data[7] = 0;
sendOnBuses(frame, buses);
test.service = UDS_SERVICES::TESTER_PRESENT;
test.subFunc = 0;
sendOnBuses(test, buses);
}
if (ui->ckSession->isChecked())
{
for (typ = 1; typ < 4; typ++) //try each type of session access
{
frame.data[0] = 2;
frame.data[1] = 0x10;
frame.data[2] = typ;
frame.data[3] = 0;frame.data[4] = 0;frame.data[5] = 0;
frame.data[6] = 0;frame.data[7] = 0;
sendOnBuses(frame, buses);
test.service = UDS_SERVICES::DIAG_CONTROL;
test.subFunc = typ;
sendOnBuses(test, buses);
}
}
if (ui->ckReset->isChecked()) //try to command a reset of the ECU. You're likely to know if it works. ;)
{
frame.data[0] = 2;
frame.data[1] = 0x11; //Reset
frame.data[2] = 1; //hard reset. 2 = key off/on 3 = soft reset
frame.data[3] = 0;frame.data[4] = 0;frame.data[5] = 0;
frame.data[6] = 0;frame.data[7] = 0;
sendOnBuses(frame, buses);
test.service = UDS_SERVICES::ECU_RESET;
test.subFunc = 1;
sendOnBuses(test, buses);
}
if (ui->ckSecurity->isChecked()) //try to enter security mode - very likely to get a response if an ECU exists.
{
frame.data[0] = 2;
frame.data[1] = 0x27; //request security mode
frame.data[2] = 1; //request seed from ECU
frame.data[3] = 0;frame.data[4] = 0;frame.data[5] = 0;
frame.data[6] = 0;frame.data[7] = 0;
sendOnBuses(frame, buses);
test.service = UDS_SERVICES::SECURITY_ACCESS;
test.subFunc = 1;
sendOnBuses(test, buses);
}
}
@@ -188,7 +176,7 @@ void UDSScanWindow::rapidFrames(const CANConnection* conn, const QVector<CANFram
QString result;
uint32_t id;
int offset = ui->spinReplyOffset->value();
CANFrame sentFrame;
UDS_TESTS sentFrame;
bool gotReply = false;
if (pFrames.length() <= 0) return;
@@ -205,27 +193,27 @@ void UDSScanWindow::rapidFrames(const CANConnection* conn, const QVector<CANFram
if ((id == (uint32_t)(sentFrame.ID + offset)) || ui->cbAllowAdaptiveOffset->isChecked())
{
int temp = thisFrame.data[0] >> 4;
if (temp == 0) //single frame reply (maybe)
{
if (thisFrame.data[1] == 0x40 + sendingFrames[currIdx].data[1])
//int temp = thisFrame.data[0] >> 4;
//if (temp == 0) //single frame reply (maybe)
//{
if (thisFrame.data[1] == 0x40 + sendingFrames[currIdx].service)
{
result = "Request on bus " + QString::number(sentFrame.bus) + " ID: " + QString::number(sentFrame.ID, 16) + " got response to mode "
+ QString::number(sentFrame.data[1], 16)
+ " " + QString::number(sentFrame.data[2], 16) + " with affirmation from ID " + QString::number(id, 16)
+ QString::number(sentFrame.service, 16)
+ " " + QString::number(sentFrame.subFunc, 16) + " with affirmation from ID " + QString::number(id, 16)
+ " on bus " + QString::number(thisFrame.bus) + ".";
gotReply = true;
}
else if ( thisFrame.data[1] == 0x7F)
{
result = "Request on bus " + QString::number(sentFrame.bus) + " ID: " + QString::number(sentFrame.ID, 16) + " got response to mode "
+ QString::number(sentFrame.data[1], 16)
+ " " + QString::number(sentFrame.data[2], 16) + " with an error from ID " + QString::number(id, 16)
+ QString::number(sentFrame.service, 16)
+ " " + QString::number(sentFrame.subFunc, 16) + " with an error from ID " + QString::number(id, 16)
+ " on bus " + QString::number(thisFrame.bus) + ".";
gotReply = true;
}
}
//}
/*
if (temp == 1) //start of a multiframe reply
{
if (thisFrame.data[2] == 0x40 + sendingFrames[currIdx].data[1])
@@ -237,7 +225,7 @@ void UDSScanWindow::rapidFrames(const CANConnection* conn, const QVector<CANFram
gotReply = true;
}
//error replies are never multiframe so the check doesn't have to be done here.
}
} */
}
}
if (gotReply)
@@ -251,7 +239,7 @@ void UDSScanWindow::timeOut()
{
QString result;
result = "Request on bus " + QString::number(sendingFrames[currIdx].bus) + " ID: " + QString::number(sendingFrames[currIdx].ID, 16) + " got no response to mode "
+ QString::number(sendingFrames[currIdx].data[1], 16) + " " + QString::number(sendingFrames[currIdx].data[2], 16);
+ QString::number(sendingFrames[currIdx].service, 16) + " " + QString::number(sendingFrames[currIdx].subFunc, 16);
ui->listResults->addItem(result);
sendNextMsg();
@@ -259,10 +247,14 @@ void UDSScanWindow::timeOut()
void UDSScanWindow::sendNextMsg()
{
QVector<unsigned char> data;
currIdx++;
if (currIdx < sendingFrames.count())
{
CANConManager::getInstance()->sendFrame(sendingFrames[currIdx]);
data.clear();
data.append(sendingFrames[currIdx].subFunc);
UDS_HANDLER::getInstance()->sendUDSFrame(sendingFrames[currIdx].bus, sendingFrames[currIdx].ID, sendingFrames[currIdx].service, data);
waitTimer->start();
}
else
re/udsscanwindow.h
+10 -2
View File
@@ -10,6 +10,14 @@ namespace Ui {
class UDSScanWindow;
}
struct UDS_TESTS
{
int ID;
int bus;
int service;
int subFunc;
};
class UDSScanWindow : public QDialog
{
Q_OBJECT
@@ -29,12 +37,12 @@ private:
Ui::UDSScanWindow *ui;
const QVector<CANFrame> *modelFrames;
QTimer *waitTimer;
QList<CANFrame> sendingFrames;
QList<UDS_TESTS> sendingFrames;
int currIdx = 0;
bool currentlyRunning;
void sendNextMsg();
void sendOnBuses(CANFrame &frame, int buses);
void sendOnBuses(UDS_TESTS frame, int buses);
};
#endif // UDSSCANWINDOW_H