From 6540121086e23be4b3e6ac977532022e71e58908 Mon Sep 17 00:00:00 2001
From: Luis Carvalho <56938310+LuisMiCa@users.noreply.github.com>
Date: Fri, 28 Jan 2022 20:54:12 +0000
Subject: [PATCH] Rename debug symbols and simplify printouts

---
 src/IRsmallDDebug.h | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/IRsmallDDebug.h b/src/IRsmallDDebug.h
index f1574cf..40911d0 100644
--- a/src/IRsmallDDebug.h
+++ b/src/IRsmallDDebug.h
@@ -6,8 +6,8 @@
  *
  * Debug options:
  *   IRSMALLD_DEBUG_STATE    - Prints FSM states
- *   IRSMALLD_DEBUG_DURATION - Prints pulse/space/mark intervals' duration
- *   IRSMALLD_DEBUG_TIME     - Prints ISR execution time
+ *   IRSMALLD_DEBUG_INTERVAL - Prints interval's duration between consecutive interrupts (in µs)
+ *   IRSMALLD_DEBUG_ISRTIME  - Prints ISR execution time (in µs)
  * 
  * NOTES:
  * - The usage of debuging functionalities requires a Serial.begin in the setup;
@@ -15,8 +15,8 @@
  *   A Baud Rate of 250000 seems to work;
  * - The usage of Serial communications inside an interrupt is not recommended, but 
  *   in this case, it's just a few prints for debuging purposes.
- * - IRSMALLD_DEBUG_TIME mode uses AVR 328p Timer1 hardware specific code;
- *   Results are in micro seconds, assuming a 16MHz clock (Clk Count is divided by 16 to get µs);
+ * - IRSMALLD_DEBUG_ISRTIME mode uses AVR 328p Timer1 hardware specific code;
+ *   Results are in microseconds, assuming a 16MHz clock (Clk Count is divided by 16 to get µs);
  */
 
 
@@ -29,18 +29,22 @@
     #define DBG_PRINT_STATE(...) 	//nothing
   #endif
 
-  #ifdef IRSMALLD_DEBUG_DURATION
-    #define DBG_PRINTLN_DUR(...)  {Serial.print("d="); Serial.print(__VA_ARGS__); Serial.println("µ");}
+  #ifdef IRSMALLD_DEBUG_INTERVAL
+    #ifdef IRSMALLD_DEBUG_ISRTIME
+      #define DBG_PRINTLN_DUR(...)  {Serial.print("i"); Serial.print(__VA_ARGS__);}
+    #else
+      #define DBG_PRINTLN_DUR(...)  {Serial.print("i"); Serial.println(__VA_ARGS__);}
+    #endif
   #else
     #define DBG_PRINTLN_DUR(...) 	//nothing
   #endif
 
-  #ifdef IRSMALLD_DEBUG_TIME
-    #if defined(IRSMALLD_DEBUG_STATE) || defined(IRSMALLD_DEBUG_DURATION)
-      #warning Do not use IRSMALLD_DEBUG_TIME with IRSMALLD_DEBUG_STATE or IRSMALLD_DEBUG_DURATION if you want accurate measurements of execution time
+  #ifdef IRSMALLD_DEBUG_ISRTIME
+    #if defined(IRSMALLD_DEBUG_STATE) || defined(IRSMALLD_DEBUG_INTERVAL)
+      #warning Do not use IRSMALLD_DEBUG_ISRTIME with IRSMALLD_DEBUG_STATE or IRSMALLD_DEBUG_INTERVAL if you want accurate measurements of execution time
     #endif 
     #define DBG_RESTART_TIMER()  { TCCR1A = 0; TCCR1B = 1; TCNT1=0; } //set mode to count clock cycles and reset
-    #define DBG_PRINTLN_TIMER()  { uint16_t elapsedTime=TCNT1; Serial.print("t="); Serial.print(elapsedTime>>4); Serial.println("µ");}
+    #define DBG_PRINTLN_TIMER()  { uint16_t elapsedTime=TCNT1; Serial.print("t"); Serial.println(elapsedTime>>4);}
   #else
     #define DBG_RESTART_TIMER()  //nothing
     #define DBG_PRINTLN_TIMER()  //nothing