Another fix for a graphing crash, added some prelim. stuff for UDS
This commit is contained in:
+2
-1
@@ -45,7 +45,8 @@ SOURCES += main.cpp\
|
|||||||
dbc_classes.cpp \
|
dbc_classes.cpp \
|
||||||
dbcloadsavewindow.cpp \
|
dbcloadsavewindow.cpp \
|
||||||
fuzzingwindow.cpp \
|
fuzzingwindow.cpp \
|
||||||
udsscanwindow.cpp
|
udsscanwindow.cpp \
|
||||||
|
can_structs.cpp
|
||||||
|
|
||||||
HEADERS += mainwindow.h \
|
HEADERS += mainwindow.h \
|
||||||
can_structs.h \
|
can_structs.h \
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
#include "can_structs.h"
|
||||||
|
|
||||||
+16
-1
@@ -1,9 +1,10 @@
|
|||||||
#ifndef CAN_STRUCTS_H
|
#ifndef CAN_STRUCTS_H
|
||||||
#define CAN_STRUCTS_H
|
#define CAN_STRUCTS_H
|
||||||
|
|
||||||
|
#include <QVector>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
struct CANFrame
|
class CANFrame
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
int ID;
|
int ID;
|
||||||
@@ -26,5 +27,19 @@ public:
|
|||||||
int priority;
|
int priority;
|
||||||
bool isBroadcast;
|
bool isBroadcast;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
//the same as the CANFrame struct but with arbitrary data size.
|
||||||
|
struct ISOTP_FRAME
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
int ID;
|
||||||
|
int bus;
|
||||||
|
bool extended;
|
||||||
|
bool isReceived;
|
||||||
|
int len;
|
||||||
|
QVector<unsigned char> data;
|
||||||
|
uint64_t timestamp;
|
||||||
|
};
|
||||||
|
|
||||||
#endif // CAN_STRUCTS_H
|
#endif // CAN_STRUCTS_H
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#ifndef CONFIG
|
#ifndef CONFIG
|
||||||
#define CONFIG
|
#define CONFIG
|
||||||
|
|
||||||
#define VERSION 150
|
#define VERSION 151
|
||||||
|
|
||||||
//try to keep this in sync.
|
//try to keep this in sync.
|
||||||
//SavvyCAN will complain if you connect a GVRET board with a revision
|
//SavvyCAN will complain if you connect a GVRET board with a revision
|
||||||
|
|||||||
@@ -734,6 +734,9 @@ void GraphingWindow::loadDefinitions()
|
|||||||
QStringList filters;
|
QStringList filters;
|
||||||
filters.append(QString(tr("Graph definition (*.gdf)")));
|
filters.append(QString(tr("Graph definition (*.gdf)")));
|
||||||
|
|
||||||
|
if (dbcHandler == NULL) return;
|
||||||
|
if (dbcHandler->getFileCount() == 0) dbcHandler->createBlankFile();
|
||||||
|
|
||||||
dialog.setFileMode(QFileDialog::ExistingFile);
|
dialog.setFileMode(QFileDialog::ExistingFile);
|
||||||
dialog.setNameFilters(filters);
|
dialog.setNameFilters(filters);
|
||||||
dialog.setViewMode(QFileDialog::Detail);
|
dialog.setViewMode(QFileDialog::Detail);
|
||||||
|
|||||||
Reference in New Issue
Block a user