diff --git a/bus_protocols/j1939_handler.h b/bus_protocols/j1939_handler.h index 53ff315..b9416fc 100644 --- a/bus_protocols/j1939_handler.h +++ b/bus_protocols/j1939_handler.h @@ -12,6 +12,8 @@ public: int src; int dest; int pgn; + int edp; + int dp; int pf; int ps; int priority; diff --git a/re/frameinfowindow.cpp b/re/frameinfowindow.cpp index d47faf9..5b8407c 100644 --- a/re/frameinfowindow.cpp +++ b/re/frameinfowindow.cpp @@ -431,6 +431,8 @@ void FrameInfoWindow::updateDetailsWindow(QString newID) J1939ID jid; jid.src = targettedID & 0xFF; jid.priority = targettedID >> 26; + jid.edp = (targettedID >> 25) & 1; + jid.dp = (targettedID >> 24) & 1; jid.pgn = (targettedID >> 8) & 0x3FFFF; //18 bits jid.pf = (targettedID >> 16) & 0xFF; jid.ps = (targettedID >> 8) & 0xFF; @@ -450,14 +452,31 @@ void FrameInfoWindow::updateDetailsWindow(QString newID) else { jid.dest = jid.ps; + jid.pgn &= 0xFFFF00; //targetted messages use PGN with 00 in low nibbles tempItem = new QTreeWidgetItem(); - tempItem->setText(0, tr(" Destination ID: ") + Utility::formatNumber(static_cast(jid.dest))); + if (jid.dest < 0xFF) + tempItem->setText(0, tr(" Destination ID: ") + Utility::formatNumber(static_cast(jid.dest))); + else + tempItem->setText(0, tr(" Destination ID: Global (ALL)")); baseNode->addChild(tempItem); } + + tempItem = new QTreeWidgetItem(); + tempItem->setText(0, tr(" Priority: ") + QString::number(jid.priority) + " (0-7)") ; + baseNode->addChild(tempItem); + tempItem = new QTreeWidgetItem(); tempItem->setText(0, tr(" SRC: ") + Utility::formatNumber(static_cast(jid.src))); baseNode->addChild(tempItem); + tempItem = new QTreeWidgetItem(); + tempItem->setText(0, tr(" EDP: ") + QString::number(jid.edp)); + baseNode->addChild(tempItem); + + tempItem = new QTreeWidgetItem(); + tempItem->setText(0, tr(" DP: ") + QString::number(jid.dp)); + baseNode->addChild(tempItem); + tempItem = new QTreeWidgetItem(); tempItem->setText(0, tr(" PGN: ") + Utility::formatNumber(static_cast(jid.pgn)) + "(" + QString::number(jid.pgn) + ")"); baseNode->addChild(tempItem);