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

Fixed ISOTP Interpreter Window - It functions again.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
scriptcontainer.cpp
+6 -6
View File
@@ -276,12 +276,12 @@ void ISOTPScriptHelper::sendISOTP(QJSValue bus, QJSValue id, QJSValue length, QJ
if (!data.isArray()) qDebug() << "data isn't an array";
for (unsigned int i = 0; i < msg.len; i++)
for (int i = 0; i < msg.len; i++)
{
msg.data[i] = (uint8_t)data.property(i).toInt();
msg.data[i] = static_cast<uint8_t>(data.property(i).toInt());
}
msg.bus = (uint32_t)bus.toInt();
msg.bus = bus.toInt();
if (msg.ID > 0x7FF) msg.extended = true;
@@ -302,7 +302,7 @@ void ISOTPScriptHelper::newISOMessage(ISOTP_MESSAGE msg)
QJSValueList args;
args << msg.bus << msg.ID << msg.len;
QJSValue dataBytes = scriptEngine->newArray(msg.len);
QJSValue dataBytes = scriptEngine->newArray(static_cast<uint>(msg.len));
for (unsigned int j = 0; j < msg.len; j++) dataBytes.setProperty(j, QJSValue(msg.data[j]));
args.append(dataBytes);
@@ -341,7 +341,7 @@ void UDSScriptHelper::sendUDS(QJSValue bus, QJSValue id, QJSValue service, QJSVa
{
UDS_MESSAGE msg;
msg.extended = false;
msg.ID = id.toInt();
msg.ID = id.toUInt();
msg.len = length.toUInt();
msg.service = service.toUInt();
msg.subFuncLen = sublen.toUInt();
@@ -351,7 +351,7 @@ void UDSScriptHelper::sendUDS(QJSValue bus, QJSValue id, QJSValue service, QJSVa
for (unsigned int i = 0; i < msg.len; i++)
{
msg.data[i] = (uint8_t)data.property(i).toInt();
msg.data[i] = static_cast<uint8_t>(data.property(i).toInt());
}
msg.bus = (uint32_t)bus.toInt();