Theaninova/Arduino-IRremote
1
0
Fork 0
mirror of https://github.com/Theaninova/Arduino-IRremote.git synced 2026-01-08 06:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-1' of git://github.com/ElectricRCAircraftGuy/Arduino-IRremote into ElectricRCAircraftGuy-patch-1

Browse Source 
merging #258
This commit is contained in:
Rafi Khan
2016-02-20 23:40:50 -06:00
parent 86e20db36c e4933e809e
commit 9697752f4e
1 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
IRremote.cpp
View File

@@ -41,14 +41,19 @@
// //
int MATCH (int measured, int desired) int MATCH (int measured, int desired)
{ {
DBG_PRINT("Testing: "); DBG_PRINT(F("Testing: "));
DBG_PRINT(TICKS_LOW(desired), DEC); DBG_PRINT(TICKS_LOW(desired), DEC);
DBG_PRINT(" <= "); DBG_PRINT(F(" <= "));
DBG_PRINT(measured, DEC); DBG_PRINT(measured, DEC);
DBG_PRINT(" <= "); DBG_PRINT(F(" <= "));
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(F("?; passed"));
else
DBG_PRINTLN(F("?; FAILED"));
return passed;
} }
//+======================================================== //+========================================================
@@ -56,19 +61,25 @@ int MATCH (int measured, int desired)
// //
int MATCH_MARK (int measured_ticks, int desired_us) 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(measured_ticks * USECPERTICK, DEC);
DBG_PRINT(" vs "); DBG_PRINT(F("us vs "));
DBG_PRINT(desired_us, DEC); DBG_PRINT(desired_us, DEC);
DBG_PRINT("us");
DBG_PRINT(": "); DBG_PRINT(": ");
DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS), DEC); DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS) * USECPERTICK, DEC);
DBG_PRINT(" <= "); DBG_PRINT(F(" <= "));
DBG_PRINT(measured_ticks, DEC); DBG_PRINT(measured_ticks * USECPERTICK, DEC);
DBG_PRINT(" <= "); DBG_PRINT(F(" <= "));
DBG_PRINTLN(TICKS_HIGH(desired_us + MARK_EXCESS), DEC); DBG_PRINT(TICKS_HIGH(desired_us + MARK_EXCESS) * USECPERTICK, DEC);
return ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS)) bool passed = ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS))
&& (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS))); && (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS)));
if (passed)
DBG_PRINTLN(F("?; passed"));
else
DBG_PRINTLN(F("?; FAILED"));
return passed;
} }
//+======================================================== //+========================================================
@@ -76,19 +87,25 @@ int MATCH_MARK (int measured_ticks, int desired_us)
// //
int MATCH_SPACE (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(measured_ticks * USECPERTICK, DEC);
DBG_PRINT(" vs "); DBG_PRINT(F("us vs "));
DBG_PRINT(desired_us, DEC); DBG_PRINT(desired_us, DEC);
DBG_PRINT("us");
DBG_PRINT(": "); DBG_PRINT(": ");
DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS), DEC); DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS) * USECPERTICK, DEC);
DBG_PRINT(" <= "); DBG_PRINT(F(" <= "));
DBG_PRINT(measured_ticks, DEC); DBG_PRINT(measured_ticks * USECPERTICK, DEC);
DBG_PRINT(" <= "); DBG_PRINT(F(" <= "));
DBG_PRINTLN(TICKS_HIGH(desired_us - MARK_EXCESS), DEC); DBG_PRINT(TICKS_HIGH(desired_us - MARK_EXCESS) * USECPERTICK, DEC);
return ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS)) bool passed = ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS))
&& (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS))); && (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS)));
if (passed)
DBG_PRINTLN(F("?; passed"));
else
DBG_PRINTLN(F("?; FAILED"));
return passed;
} }
//+============================================================================= //+=============================================================================