From 028a10816940a4265852b652e25af98d0d7db107 Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Sun, 4 Feb 2018 18:10:37 -0500 Subject: [PATCH] Added ability to decode MARK frames from the CAN stream. These are used just to mark where you've done something. M2RET devices currently support this, more support to come later on. --- canframemodel.cpp | 6 ++++++ config.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/canframemodel.cpp b/canframemodel.cpp index d467a71..021f681 100644 --- a/canframemodel.cpp +++ b/canframemodel.cpp @@ -284,6 +284,12 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const case Column::Length: return QString::number(thisFrame.len); case Column::ASCII: + if (thisFrame.ID >= 0x7FFFFFF0ull) + { + tempString.append("MARK "); + tempString.append(QString::number(thisFrame.ID & 0x7)); + return tempString; + } dLen = thisFrame.len; if (dLen < 0) dLen = 0; if (dLen > 8) dLen = 8; diff --git a/config.h b/config.h index c4884fb..789c649 100644 --- a/config.h +++ b/config.h @@ -1,7 +1,7 @@ #ifndef CONFIG #define CONFIG -#define VERSION 183 +#define VERSION 184 //try to keep this in sync. //SavvyCAN will complain if you connect a GVRET board with a revision