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

Added flow control and other functionality to UDS / ISO_TP code.

Browse Source
This commit is contained in:
Collin Kidder
2017-08-13 17:03:11 -04:00
parent 83399ed0a7
commit c05bd2c043
10 changed files with 147 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bus_protocols/uds_handler.cpp
+25 -3
View File
@@ -150,7 +150,7 @@ UDS_HANDLER::UDS_HANDLER()
useExtendedAddressing = false;
}
void UDS_HANDLER::gotISOTPFrame(ISOTP_MESSAGE &msg)
void UDS_HANDLER::gotISOTPFrame(ISOTP_MESSAGE msg)
{
qDebug() << "UDS handler got ISOTP frame";
UDS_MESSAGE udsMsg;
@@ -195,13 +195,13 @@ void UDS_HANDLER::setReception(bool mode)
if (isReceiving)
{
connect(ISOTP_HANDLER::getInstance(), SIGNAL(newISOMessage(ISOTP_MESSAGE&)), this, SLOT(gotISOTPFrame(ISOTP_MESSAGE&)));
connect(ISOTP_HANDLER::getInstance(), SIGNAL(newISOMessage(ISOTP_MESSAGE)), this, SLOT(gotISOTPFrame(ISOTP_MESSAGE)));
ISOTP_HANDLER::getInstance()->setReception(true); //must enable ISOTP reception too.
qDebug() << "Enabling reception of ISO-TP frames in UDS handler";
}
else
{
disconnect(ISOTP_HANDLER::getInstance(), SIGNAL(newISOMessage(ISOTP_MESSAGE&)), this, SLOT(gotISOTPFrame(ISOTP_MESSAGE&)));
disconnect(ISOTP_HANDLER::getInstance(), SIGNAL(newISOMessage(ISOTP_MESSAGE)), this, SLOT(gotISOTPFrame(ISOTP_MESSAGE)));
//can't disable ISOTP reception because something else might be using it.
qDebug() << "Disabling reception of ISOTP frames in UDS handler";
}
@@ -264,3 +264,25 @@ QString UDS_HANDLER::getNegativeResponseLong(int respCode)
return QString();
}
//Little shim functions that drop straight through to the ISO_TP handler
void UDS_HANDLER::setProcessAllIDs(bool state)
{
ISOTP_HANDLER::getInstance()->setProcessAll(state);
}
void UDS_HANDLER::addID(uint32_t id)
{
ISOTP_HANDLER::getInstance()->addID(id);
}
void UDS_HANDLER::removeID(uint32_t id)
{
ISOTP_HANDLER::getInstance()->removeID(id);
}
void UDS_HANDLER::clearAllIDs()
{
ISOTP_HANDLER::getInstance()->clearAllIDs();
}