Fixed ISOTP Interpreter Window - It functions again.

Also added UDS decoding to the ISOTP window. An attempt is made to see
if a frame looks like UDS and then it is decoded.

Also, some code clean up to remove some compiler warnings. There's a
LONG way to go still.
This commit is contained in:
Collin Kidder
2017-10-09 20:59:25 -04:00
parent fdc9da0983
commit 0f9584eaea
13 changed files with 85 additions and 67 deletions
+2 -2
View File
@@ -339,7 +339,7 @@ void ISOTP_HANDLER::setProcessAll(bool state)
processAll = state;
}
void ISOTP_HANDLER::addFilter(int pBusId, uint32_t ID, uint32_t mask)
void ISOTP_HANDLER::addFilter(uint32_t pBusId, uint32_t ID, uint32_t mask)
{
CANFilter filt;
filt.ID = ID;
@@ -349,7 +349,7 @@ void ISOTP_HANDLER::addFilter(int pBusId, uint32_t ID, uint32_t mask)
filters.append(filt);
}
void ISOTP_HANDLER::removeFilter(int pBusId, uint32_t ID, uint32_t mask)
void ISOTP_HANDLER::removeFilter(uint32_t pBusId, uint32_t ID, uint32_t mask)
{
for (int i = 0; i < filters.count(); i++)
{
+2 -2
View File
@@ -23,8 +23,8 @@ public:
void sendISOTPFrame(int bus, int ID, QVector<unsigned char> data);
void setProcessAll(bool state);
void setFlowCtrl(bool state);
void addFilter(int pBusId, uint32_t ID, uint32_t mask);
void removeFilter(int pBusId, uint32_t ID, uint32_t mask);
void addFilter(uint32_t pBusId, uint32_t ID, uint32_t mask);
void removeFilter(uint32_t pBusId, uint32_t ID, uint32_t mask);
void clearAllFilters();
public slots:
+2 -2
View File
@@ -9,8 +9,8 @@ public:
int bus;
bool extended;
bool isReceived;
int len; //# of bytes this message should have (as reported)
int actualSize; //# we actually got
uint32_t len; //# of bytes this message should have (as reported)
uint32_t actualSize; //# we actually got
QVector<unsigned char> data;
uint64_t timestamp;
};
+2 -2
View File
@@ -272,12 +272,12 @@ void UDS_HANDLER::setProcessAllIDs(bool state)
isoHandler->setProcessAll(state);
}
void UDS_HANDLER::addFilter(int pBusId, uint32_t ID, uint32_t mask)
void UDS_HANDLER::addFilter(uint32_t pBusId, uint32_t ID, uint32_t mask)
{
isoHandler->addFilter(pBusId, ID, mask);
}
void UDS_HANDLER::removeFilter(int pBusId, uint32_t ID, uint32_t mask)
void UDS_HANDLER::removeFilter(uint32_t pBusId, uint32_t ID, uint32_t mask)
{
isoHandler->removeFilter(pBusId, ID, mask);
}
+6 -6
View File
@@ -65,7 +65,7 @@ namespace UDS_SERVICES
struct CODE_STRUCT
{
int code;
unsigned int code;
QString shortDesc;
QString longDesc;
};
@@ -73,9 +73,9 @@ struct CODE_STRUCT
class UDS_MESSAGE: public ISOTP_MESSAGE
{
public:
int service;
int subFunc;
int subFuncLen;
unsigned int service;
unsigned int subFunc;
unsigned int subFuncLen;
bool isErrorReply;
UDS_MESSAGE();
@@ -94,8 +94,8 @@ public:
void sendUDSFrame(const UDS_MESSAGE &msg);
void setProcessAllIDs(bool state);
void setFlowCtrl(bool state);
void addFilter(int pBusId, uint32_t ID, uint32_t mask);
void removeFilter(int pBusId, uint32_t ID, uint32_t mask);
void addFilter(uint32_t pBusId, uint32_t ID, uint32_t mask);
void removeFilter(uint32_t pBusId, uint32_t ID, uint32_t mask);
void clearAllFilters();
QString getServiceShortDesc(int service);