Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r439894cb0508e69af3ece09ae57a62feac09e3f2
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 439894cb0508e69af3ece09ae57a62feac09e3f2)
@@ -139,6 +139,12 @@
         }
         else // buffer too full to add this much data
         {
+#ifdef DEBUG_ENABLED
+            char debugStr[50];
+            sprintf( debugStr, "Buffer Overflow: #%3d, %3d bytes, %02X %02X %02X %02X %02X %02X %02X %02X \n", buffer, len, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7] );
+            sendDebugData( (U08*)debugStr, strlen(debugStr) );
+            sendDebugDataToUI( (U08*)debugStr );
+#endif
             bufferFull = TRUE;
             clearBuffer( buffer );
         }
@@ -161,14 +167,6 @@
             {
                 firstBufferOverflowTimeStamp = getMSTimerCount();
             }
-#ifdef DEBUG_ENABLED
-            {
-                // TODO - temporary debug code - remove later
-                char debugStr[ 256 ];
-                sprintf( debugStr, "Comm Buffer Overflow:%5d \n", (U32)buffer );
-                sendDebugData( (U08*)debugStr, strlen(debugStr) );
-            }
-#endif
         }
         else
         {   // if good for persistence time period, reset persistence check