From 067292108de05faca2c689c5ebcef994a7dbda07 Mon Sep 17 00:00:00 2001
From: Collin Kidder <collink@kkmfg.com>
Date: Wed, 15 Jul 2020 21:25:28 -0400
Subject: [PATCH] Fixed several problems with Sniffer window. Incremented
 version number

---
 config.h                       | 2 +-
 re/sniffer/SnifferDelegate.cpp | 2 +-
 re/sniffer/snifferitem.cpp     | 2 +-
 re/sniffer/sniffermodel.cpp    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.h b/config.h
index 163928a..3bbbd8a 100644
--- a/config.h
+++ b/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG
 #define CONFIG
 
-#define VERSION             199
+#define VERSION             200
 
 //try to keep this in sync.
 //SavvyCAN will complain if you connect a GVRET board with a revision
diff --git a/re/sniffer/SnifferDelegate.cpp b/re/sniffer/SnifferDelegate.cpp
index f9358d6..34cdd5e 100644
--- a/re/sniffer/SnifferDelegate.cpp
+++ b/re/sniffer/SnifferDelegate.cpp
@@ -116,7 +116,7 @@ void SnifferDelegate::paint(QPainter *painter, const QStyleOptionViewItem &optio
     painter->setOpacity(1.0);
     painter->setPen(QApplication::palette().color(QPalette::Text));
     painter->setFont(mainFont);
-    painter->drawText(QRect(viewport.left(), viewport.top() + xSector + yOffset, xSpan, mainFontInfo->pixelSize()), Qt::AlignCenter, Utility::formatNumber((char)val));
+    painter->drawText(QRect(viewport.left(), viewport.top() + xSector + yOffset, xSpan, mainFontInfo->pixelSize()), Qt::AlignCenter, Utility::formatNumber((unsigned char)val));
 }
 
 QSize SnifferDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
diff --git a/re/sniffer/snifferitem.cpp b/re/sniffer/snifferitem.cpp
index 1194ee9..5ab1a50 100644
--- a/re/sniffer/snifferitem.cpp
+++ b/re/sniffer/snifferitem.cpp
@@ -9,7 +9,7 @@ SnifferItem::SnifferItem(const CANFrame& pFrame, quint32 seq):
     const unsigned char *data = reinterpret_cast<const unsigned char *>(pFrame.payload().constData());
     int dataLen = pFrame.payload().length();
 
-    for (int i = 0; i < 0; i++) {
+    for (int i = 0; i < dataLen; i++) {
         mNotch[i] = 0;
         mMarker.data[i] = 0;
         mMarker.dataTimestamp[i] = 0;
diff --git a/re/sniffer/sniffermodel.cpp b/re/sniffer/sniffermodel.cpp
index 667c791..d700d9c 100644
--- a/re/sniffer/sniffermodel.cpp
+++ b/re/sniffer/sniffermodel.cpp
@@ -70,7 +70,7 @@ QVariant SnifferModel::data(const QModelIndex &index, int role) const
                 int data = item->getData(col-tc::DATA_0);
                 if(data >= 0)
                 {
-                    return QString("%1").arg(data, 2, 16, QLatin1Char('0')).toUpper();
+                    return QString("%1").arg((uint8_t)data, 2, 16, QLatin1Char('0')).toUpper();
                 }
             }
             break;