From 3e66d765117b23908dfb1872cbd2286a55764cbb Mon Sep 17 00:00:00 2001 From: Gabriel Staples Date: Sat, 23 Jan 2016 20:18:25 -0500 Subject: [PATCH 1/3] Update IRremote.cpp to improve debugging This is a small change, and definitely an improvement. I simply improved the debugging by stating whether a check passed or failed, for easier identification in debug mode. --- IRremote.cpp | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index 466a4fb80..5885d2697 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -46,9 +46,14 @@ int MATCH (int measured, int desired) DBG_PRINT(" <= "); DBG_PRINT(measured, DEC); DBG_PRINT(" <= "); - DBG_PRINTLN(TICKS_HIGH(desired), DEC); + DBG_PRINT(TICKS_HIGH(desired), DEC); - return ((measured >= TICKS_LOW(desired)) && (measured <= TICKS_HIGH(desired))); + bool passed = ((measured >= TICKS_LOW(desired)) && (measured <= TICKS_HIGH(desired))); + if (passed) + DBG_PRINTLN("; passed"); + else + DBG_PRINTLN("; FAILED"); + return passed; } //+======================================================== @@ -65,10 +70,15 @@ int MATCH_MARK (int measured_ticks, int desired_us) DBG_PRINT(" <= "); DBG_PRINT(measured_ticks, DEC); DBG_PRINT(" <= "); - DBG_PRINTLN(TICKS_HIGH(desired_us + MARK_EXCESS), DEC); + DBG_PRINT(TICKS_HIGH(desired_us + MARK_EXCESS), DEC); - return ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS)) - && (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS))); + bool passed = ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS)) + && (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS))); + if (passed) + DBG_PRINTLN("; passed"); + else + DBG_PRINTLN("; FAILED"); + return passed; } //+======================================================== @@ -85,10 +95,15 @@ int MATCH_SPACE (int measured_ticks, int desired_us) DBG_PRINT(" <= "); DBG_PRINT(measured_ticks, DEC); DBG_PRINT(" <= "); - DBG_PRINTLN(TICKS_HIGH(desired_us - MARK_EXCESS), DEC); + DBG_PRINT(TICKS_HIGH(desired_us - MARK_EXCESS), DEC); - return ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS)) - && (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS))); + bool passed = ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS)) + && (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS))); + if (passed) + DBG_PRINTLN("; passed"); + else + DBG_PRINTLN("; FAILED"); + return passed; } //+============================================================================= From b226283882eb3d34ea84319220ffe37fbcff1766 Mon Sep 17 00:00:00 2001 From: Gabriel Staples Date: Sat, 23 Jan 2016 21:06:41 -0500 Subject: [PATCH 2/3] Update IRremote.cpp Further improved debug formatting, & added F macro to reduce RAM usage during prints. --- IRremote.cpp | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index 5885d2697..a5513d60f 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -41,18 +41,18 @@ // int MATCH (int measured, int desired) { - DBG_PRINT("Testing: "); + DBG_PRINT(F("Testing: ")); DBG_PRINT(TICKS_LOW(desired), DEC); - DBG_PRINT(" <= "); + DBG_PRINT(F(" <= ")); DBG_PRINT(measured, DEC); - DBG_PRINT(" <= "); + DBG_PRINT(F(" <= ")); DBG_PRINT(TICKS_HIGH(desired), DEC); bool passed = ((measured >= TICKS_LOW(desired)) && (measured <= TICKS_HIGH(desired))); if (passed) - DBG_PRINTLN("; passed"); + DBG_PRINTLN(F("; passed")); else - DBG_PRINTLN("; FAILED"); + DBG_PRINTLN(F("; FAILED")); return passed; } @@ -61,23 +61,24 @@ int MATCH (int measured, int desired) // int MATCH_MARK (int measured_ticks, int desired_us) { - DBG_PRINT("Testing mark "); + DBG_PRINT(F("Testing mark (actual vs desired): ")); DBG_PRINT(measured_ticks * USECPERTICK, DEC); - DBG_PRINT(" vs "); + DBG_PRINT(F("us vs ")); DBG_PRINT(desired_us, DEC); + DBG_PRINT("us"); DBG_PRINT(": "); - DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS), DEC); - DBG_PRINT(" <= "); - DBG_PRINT(measured_ticks, DEC); - DBG_PRINT(" <= "); - DBG_PRINT(TICKS_HIGH(desired_us + MARK_EXCESS), DEC); + DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS) * USECPERTICK, DEC); + DBG_PRINT(F(" <= ")); + DBG_PRINT(measured_ticks * USECPERTICK, DEC); + DBG_PRINT(F(" <= ")); + DBG_PRINT(TICKS_HIGH(desired_us + MARK_EXCESS) * USECPERTICK, DEC); bool passed = ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS)) && (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS))); if (passed) - DBG_PRINTLN("; passed"); + DBG_PRINTLN(F("; passed")); else - DBG_PRINTLN("; FAILED"); + DBG_PRINTLN(F("; FAILED")); return passed; } @@ -86,23 +87,24 @@ int MATCH_MARK (int measured_ticks, int desired_us) // int MATCH_SPACE (int measured_ticks, int desired_us) { - DBG_PRINT("Testing space "); + DBG_PRINT(F("Testing space (actual vs desired): ")); DBG_PRINT(measured_ticks * USECPERTICK, DEC); - DBG_PRINT(" vs "); + DBG_PRINT(F("us vs ")); DBG_PRINT(desired_us, DEC); + DBG_PRINT("us"); DBG_PRINT(": "); - DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS), DEC); - DBG_PRINT(" <= "); - DBG_PRINT(measured_ticks, DEC); - DBG_PRINT(" <= "); - DBG_PRINT(TICKS_HIGH(desired_us - MARK_EXCESS), DEC); + DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS) * USECPERTICK, DEC); + DBG_PRINT(F(" <= ")); + DBG_PRINT(measured_ticks * USECPERTICK, DEC); + DBG_PRINT(F(" <= ")); + DBG_PRINT(TICKS_HIGH(desired_us - MARK_EXCESS) * USECPERTICK, DEC); bool passed = ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS)) && (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS))); if (passed) - DBG_PRINTLN("; passed"); + DBG_PRINTLN(F("; passed")); else - DBG_PRINTLN("; FAILED"); + DBG_PRINTLN(F("; FAILED")); return passed; } From a4b6db26f407ab82c2f364409905f73dd25576a4 Mon Sep 17 00:00:00 2001 From: Gabriel Staples Date: Sat, 23 Jan 2016 21:12:34 -0500 Subject: [PATCH 3/3] Update IRremote.cpp very minor changes --- IRremote.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index a5513d60f..c9907ebe7 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -50,9 +50,9 @@ int MATCH (int measured, int desired) bool passed = ((measured >= TICKS_LOW(desired)) && (measured <= TICKS_HIGH(desired))); if (passed) - DBG_PRINTLN(F("; passed")); + DBG_PRINTLN(F("?; passed")); else - DBG_PRINTLN(F("; FAILED")); + DBG_PRINTLN(F("?; FAILED")); return passed; } @@ -65,7 +65,7 @@ int MATCH_MARK (int measured_ticks, int desired_us) DBG_PRINT(measured_ticks * USECPERTICK, DEC); DBG_PRINT(F("us vs ")); DBG_PRINT(desired_us, DEC); - DBG_PRINT("us"); + DBG_PRINT("us"); DBG_PRINT(": "); DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS) * USECPERTICK, DEC); DBG_PRINT(F(" <= ")); @@ -76,9 +76,9 @@ int MATCH_MARK (int measured_ticks, int desired_us) bool passed = ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS)) && (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS))); if (passed) - DBG_PRINTLN(F("; passed")); + DBG_PRINTLN(F("?; passed")); else - DBG_PRINTLN(F("; FAILED")); + DBG_PRINTLN(F("?; FAILED")); return passed; } @@ -91,7 +91,7 @@ int MATCH_SPACE (int measured_ticks, int desired_us) DBG_PRINT(measured_ticks * USECPERTICK, DEC); DBG_PRINT(F("us vs ")); DBG_PRINT(desired_us, DEC); - DBG_PRINT("us"); + DBG_PRINT("us"); DBG_PRINT(": "); DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS) * USECPERTICK, DEC); DBG_PRINT(F(" <= ")); @@ -102,9 +102,9 @@ int MATCH_SPACE (int measured_ticks, int desired_us) bool passed = ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS)) && (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS))); if (passed) - DBG_PRINTLN(F("; passed")); + DBG_PRINTLN(F("?; passed")); else - DBG_PRINTLN(F("; FAILED")); + DBG_PRINTLN(F("?; FAILED")); return passed; }