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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
bus_protocols/uds_handler.cpp
+25
View File
@@ -1,5 +1,6 @@
#include "uds_handler.h"
#include "connections/canconmanager.h"
#include "mainwindow.h"
#include <QDebug>
QVector<CODE_STRUCT> UDS_SERVICE_DESC = {
@@ -143,6 +144,18 @@ UDS_HANDLER::UDS_HANDLER()
void UDS_HANDLER::gotISOTPFrame(ISOTP_MESSAGE &msg)
{
qDebug() << "UDS handler got ISOTP frame";
UDS_MESSAGE udsMsg;
udsMsg.bus = msg.bus;
udsMsg.extended = msg.extended;
udsMsg.ID = msg.ID;
udsMsg.isReceived = msg.isReceived;
udsMsg.timestamp = msg.timestamp;
udsMsg.actualSize = msg.actualSize;
udsMsg.len = msg.len;
udsMsg.service = msg.data.at(0);
udsMsg.subFunc = msg.data.at(1);
udsMsg.data = msg.data.mid(1, -1); //don't copy data[0] which was service number
emit newUDSMessage(udsMsg);
}
void UDS_HANDLER::setReception(bool mode)
@@ -177,6 +190,18 @@ void UDS_HANDLER::sendUDSFrame(int bus, int ID, int service, QVector<unsigned ch
qDebug() << "Sent UDS service: " << getServiceShortDesc(service) << " on bus " << bus;
}
void UDS_HANDLER::sendUDSFrame(const UDS_MESSAGE &msg)
{
QVector<unsigned char> data;
if (msg.bus < 0) return;
if (msg.bus >= CANConManager::getInstance()->getNumBuses()) return;
if (msg.service < 0 || msg.service > 0xFF) return;
data.append(msg.service);
data.append(msg.data);
ISOTP_HANDLER::getInstance()->sendISOTPFrame(msg.bus, msg.ID, data);
qDebug() << "Sent UDS service: " << getServiceShortDesc(msg.service) << " on bus " << msg.bus;
}
QString UDS_HANDLER::getServiceShortDesc(int service)
{
foreach (CODE_STRUCT code, UDS_SERVICE_DESC)