Additional work on UDS - now UDS scan window can get results from UDS

handler instead of trying to do it all itself.
This commit is contained in:
Collin Kidder
2017-05-16 21:50:54 -04:00
parent 1ccb9bac2e
commit 2af1204cdd
8 changed files with 91 additions and 64 deletions
+4 -11
View File
@@ -3,6 +3,7 @@
#include "can_structs.h"
#include "connections/canconnection.h"
#include "bus_protocols/uds_handler.h"
#include <QDialog>
@@ -10,14 +11,6 @@ namespace Ui {
class UDSScanWindow;
}
struct UDS_TESTS
{
int ID;
int bus;
int service;
int subFunc;
};
class UDSScanWindow : public QDialog
{
Q_OBJECT
@@ -28,7 +21,7 @@ public:
private slots:
void updatedFrames(int numFrames);
void rapidFrames(const CANConnection* conn, const QVector<CANFrame>& pFrames);
void gotUDSReply(UDS_MESSAGE &msg);
void scanUDS();
void saveResults();
void timeOut();
@@ -37,12 +30,12 @@ private:
Ui::UDSScanWindow *ui;
const QVector<CANFrame> *modelFrames;
QTimer *waitTimer;
QList<UDS_TESTS> sendingFrames;
QList<UDS_MESSAGE> sendingFrames;
int currIdx = 0;
bool currentlyRunning;
void sendNextMsg();
void sendOnBuses(UDS_TESTS frame, int buses);
void sendOnBuses(UDS_MESSAGE frame, int buses);
};
#endif // UDSSCANWINDOW_H