Skip to content

Commit 92092df

Browse files
Update IRremote.cpp
Further improved debug formatting, & added F macro to reduce RAM usage during prints.
1 parent ed1a2a2 commit 92092df

File tree

1 file changed

+25
-23
lines changed

1 file changed

+25
-23
lines changed

IRremote.cpp

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@
4141
//
4242
int MATCH (int measured, int desired)
4343
{
44-
DBG_PRINT("Testing: ");
44+
DBG_PRINT(F("Testing: "));
4545
DBG_PRINT(TICKS_LOW(desired), DEC);
46-
DBG_PRINT(" <= ");
46+
DBG_PRINT(F(" <= "));
4747
DBG_PRINT(measured, DEC);
48-
DBG_PRINT(" <= ");
48+
DBG_PRINT(F(" <= "));
4949
DBG_PRINT(TICKS_HIGH(desired), DEC);
5050

5151
bool passed = ((measured >= TICKS_LOW(desired)) && (measured <= TICKS_HIGH(desired)));
5252
if (passed)
53-
DBG_PRINTLN("; passed");
53+
DBG_PRINTLN(F("; passed"));
5454
else
55-
DBG_PRINTLN("; FAILED");
55+
DBG_PRINTLN(F("; FAILED"));
5656
return passed;
5757
}
5858

@@ -61,23 +61,24 @@ int MATCH (int measured, int desired)
6161
//
6262
int MATCH_MARK (int measured_ticks, int desired_us)
6363
{
64-
DBG_PRINT("Testing mark ");
64+
DBG_PRINT(F("Testing mark (actual vs desired): "));
6565
DBG_PRINT(measured_ticks * USECPERTICK, DEC);
66-
DBG_PRINT(" vs ");
66+
DBG_PRINT(F("us vs "));
6767
DBG_PRINT(desired_us, DEC);
68+
DBG_PRINT("us");
6869
DBG_PRINT(": ");
69-
DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS), DEC);
70-
DBG_PRINT(" <= ");
71-
DBG_PRINT(measured_ticks, DEC);
72-
DBG_PRINT(" <= ");
73-
DBG_PRINT(TICKS_HIGH(desired_us + MARK_EXCESS), DEC);
70+
DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS) * USECPERTICK, DEC);
71+
DBG_PRINT(F(" <= "));
72+
DBG_PRINT(measured_ticks * USECPERTICK, DEC);
73+
DBG_PRINT(F(" <= "));
74+
DBG_PRINT(TICKS_HIGH(desired_us + MARK_EXCESS) * USECPERTICK, DEC);
7475

7576
bool passed = ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS))
7677
&& (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS)));
7778
if (passed)
78-
DBG_PRINTLN("; passed");
79+
DBG_PRINTLN(F("; passed"));
7980
else
80-
DBG_PRINTLN("; FAILED");
81+
DBG_PRINTLN(F("; FAILED"));
8182
return passed;
8283
}
8384

@@ -86,23 +87,24 @@ int MATCH_MARK (int measured_ticks, int desired_us)
8687
//
8788
int MATCH_SPACE (int measured_ticks, int desired_us)
8889
{
89-
DBG_PRINT("Testing space ");
90+
DBG_PRINT(F("Testing space (actual vs desired): "));
9091
DBG_PRINT(measured_ticks * USECPERTICK, DEC);
91-
DBG_PRINT(" vs ");
92+
DBG_PRINT(F("us vs "));
9293
DBG_PRINT(desired_us, DEC);
94+
DBG_PRINT("us");
9395
DBG_PRINT(": ");
94-
DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS), DEC);
95-
DBG_PRINT(" <= ");
96-
DBG_PRINT(measured_ticks, DEC);
97-
DBG_PRINT(" <= ");
98-
DBG_PRINT(TICKS_HIGH(desired_us - MARK_EXCESS), DEC);
96+
DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS) * USECPERTICK, DEC);
97+
DBG_PRINT(F(" <= "));
98+
DBG_PRINT(measured_ticks * USECPERTICK, DEC);
99+
DBG_PRINT(F(" <= "));
100+
DBG_PRINT(TICKS_HIGH(desired_us - MARK_EXCESS) * USECPERTICK, DEC);
99101

100102
bool passed = ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS))
101103
&& (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS)));
102104
if (passed)
103-
DBG_PRINTLN("; passed");
105+
DBG_PRINTLN(F("; passed"));
104106
else
105-
DBG_PRINTLN("; FAILED");
107+
DBG_PRINTLN(F("; FAILED"));
106108
return passed;
107109
}
108110

0 commit comments

Comments
 (0)