From eb12de90f90c26de515a7a4577fe9d58c72f43d9 Mon Sep 17 00:00:00 2001
From: Oleg Mazurov <mazurov@circuitsathome.com>
Date: Tue, 11 Jun 2013 21:46:01 -0600
Subject: [PATCH] hexdump

---
 hexdump.h  | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 printhex.h | 16 +++++++-------
 2 files changed, 72 insertions(+), 8 deletions(-)
 create mode 100644 hexdump.h

diff --git a/hexdump.h b/hexdump.h
new file mode 100644
index 00000000..2cba6fa2
--- /dev/null
+++ b/hexdump.h
@@ -0,0 +1,64 @@
+/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
+
+This software may be distributed and modified under the terms of the GNU
+General Public License version 2 (GPL2) as published by the Free Software
+Foundation and appearing in the file GPL2.TXT included in the packaging of
+this file. Please note that GPL2 Section 2[b] requires that all works based
+on this software must also be made publicly available under the terms of
+the GPL2 ("Copyleft").
+
+Contact information
+-------------------
+
+Circuits At Home, LTD
+Web      :  http://www.circuitsathome.com
+e-mail   :  support@circuitsathome.com
+ */
+#if !defined(__HEXDUMP_H__)
+#define __HEXDUMP_H__
+
+#include <inttypes.h>
+#include <avr/pgmspace.h>
+#include "printhex.h"
+#include "message.h"
+
+extern int UsbDEBUGlvl;
+
+template <class BASE_CLASS, class LEN_TYPE, class OFFSET_TYPE>
+class HexDumper : public BASE_CLASS {
+        uint8_t byteCount;
+        OFFSET_TYPE byteTotal;
+
+public:
+
+        HexDumper() : byteCount(0), byteTotal(0) {
+        };
+
+        void Initialize() {
+                byteCount = 0;
+                byteTotal = 0;
+        };
+
+        virtual void Parse(const LEN_TYPE len, const uint8_t *pbuf, const OFFSET_TYPE &offset);
+};
+
+template <class BASE_CLASS, class LEN_TYPE, class OFFSET_TYPE>
+void HexDumper<BASE_CLASS, LEN_TYPE, OFFSET_TYPE>::Parse(const LEN_TYPE len, const uint8_t *pbuf, const OFFSET_TYPE &offset) {
+        if(UsbDEBUGlvl >= 0x80) {  // Fully bypass this block of code if we do not debug.
+                for(LEN_TYPE j = 0; j < len; j++, byteCount++, byteTotal++) {
+                        if(!byteCount) {
+                                PrintHex<OFFSET_TYPE > (byteTotal, 0x80);
+                                E_Notify(PSTR(": "), 0x80);
+                        }
+                        PrintHex<uint8_t > (pbuf[j], 0x80);
+                        E_Notify(PSTR(" "), 0x80);
+
+                        if(byteCount == 15) {
+                                E_Notify(PSTR("\r\n"), 0x80);
+                                byteCount = 0xFF;
+                        }
+                }
+        }
+}
+
+#endif // __HEXDUMP_H__
\ No newline at end of file
diff --git a/printhex.h b/printhex.h
index 0c2952e1..d26b691a 100644
--- a/printhex.h
+++ b/printhex.h
@@ -27,7 +27,7 @@ void E_Notifyc(char c, int lvl);
 
 template <class T>
 void PrintHex(T val, int lvl) {
-#ifdef DEBUG_USB_HOST
+//#ifdef DEBUG_USB_HOST
         int num_nibbles = sizeof(T) * 2;
 
         do {
@@ -35,23 +35,23 @@ void PrintHex(T val, int lvl) {
                 if(v > 57) v += 7;
                 E_Notifyc(v, lvl);
         } while(--num_nibbles);
-#endif
+//#endif
 }
 
 template <class T>
 void PrintBin(T val, int lvl) {
-#ifdef DEBUG_USB_HOST
+//#ifdef DEBUG_USB_HOST
         for(T mask = (((T) 1) << ((sizeof(T) << 3) - 1)); mask; mask >>= 1)
                 if(val & mask)
                         E_Notifyc('1', lvl);
                 else
                         E_Notifyc('0', lvl);
-#endif
+//#endif
 }
 
 template <class T>
 void SerialPrintHex(T val) {
-#ifdef DEBUG_USB_HOST
+//#ifdef DEBUG_USB_HOST
         int num_nibbles = sizeof(T) * 2;
 
         do {
@@ -59,12 +59,12 @@ void SerialPrintHex(T val) {
                 if(v > 57) v += 7;
                 USB_HOST_SERIAL.print(v);
         } while(--num_nibbles);
-#endif
+//#endif
 }
 
 template <class T>
 void PrintHex2(Print *prn, T val) {
-#ifdef DEBUG_USB_HOST
+//#ifdef DEBUG_USB_HOST
         T mask = (((T) 1) << (((sizeof(T) << 1) - 1) << 2));
 
         while(mask > 1) {
@@ -74,7 +74,7 @@ void PrintHex2(Print *prn, T val) {
                 mask >>= 4;
         }
         prn->print((T) val, HEX);
-#endif
+//#endif
 }
 
 #endif // __PRINTHEX_H__