Merge pull request #207 from AnalysIR/master

Bug fixes as per Issue #167
This commit is contained in:
Rafi Khan
2015-08-26 16:09:32 -06:00
2 changed files with 36 additions and 35 deletions

View File

@@ -10,6 +10,11 @@
#include <IRremote.h> #include <IRremote.h>
/*
* Default is Arduino pin D11.
* You can change this to another available Arduino Pin.
* Your IR receiver should be connected to the pin defined here
*/
int RECV_PIN = 11; int RECV_PIN = 11;
IRrecv irrecv(RECV_PIN); IRrecv irrecv(RECV_PIN);
@@ -22,18 +27,17 @@ void setup()
irrecv.enableIRIn(); // Start the receiver irrecv.enableIRIn(); // Start the receiver
} }
void dump(decode_results *results) {
// Dumps out the decode_results structure. // Dumps out the decode_results structure.
// Call this after IRrecv::decode() // Call this after IRrecv::decode()
// void * to work around compiler issue
//void dump(void *v) {
// decode_results *results = (decode_results *)v
void dump(decode_results *results) {
int count = results->rawlen; int count = results->rawlen;
if (results->decode_type == UNKNOWN) { if (results->decode_type == UNKNOWN) {
Serial.print("Unknown encoding: "); Serial.print("Unknown encoding: ");
} }
else if (results->decode_type == NEC) { else if (results->decode_type == NEC) {
Serial.print("Decoded NEC: "); Serial.print("Decoded NEC: ");
} }
else if (results->decode_type == SONY) { else if (results->decode_type == SONY) {
Serial.print("Decoded SONY: "); Serial.print("Decoded SONY: ");
@@ -54,7 +58,6 @@ void dump(decode_results *results) {
} }
else if (results->decode_type == JVC) { else if (results->decode_type == JVC) {
Serial.print("Decoded JVC: "); Serial.print("Decoded JVC: ");
} }
else if (results->decode_type == AIWA_RC_T501) { else if (results->decode_type == AIWA_RC_T501) {
Serial.print("Decoded AIWA RC T501: "); Serial.print("Decoded AIWA RC T501: ");
@@ -70,19 +73,19 @@ void dump(decode_results *results) {
Serial.print(count, DEC); Serial.print(count, DEC);
Serial.print("): "); Serial.print("): ");
for (int i = 0; i < count; i++) { for (int i = 1; i < count; i++) {
if ((i % 2) == 1) { if (i & 1) {
Serial.print(results->rawbuf[i]*USECPERTICK, DEC); Serial.print(results->rawbuf[i]*USECPERTICK, DEC);
} }
else { else {
Serial.print(-(int)results->rawbuf[i]*USECPERTICK, DEC); Serial.write('-');
Serial.print((unsigned long) results->rawbuf[i]*USECPERTICK, DEC);
} }
Serial.print(" "); Serial.print(" ");
} }
Serial.println(""); Serial.println();
} }
void loop() { void loop() {
if (irrecv.decode(&results)) { if (irrecv.decode(&results)) {
Serial.println(results.value, HEX); Serial.println(results.value, HEX);

View File

@@ -6,7 +6,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Tell IRremote which Arduino pin is connected to the IR Receiver (TSOP4838) // Tell IRremote which Arduino pin is connected to the IR Receiver (TSOP4838)
// //
int recvPin = 6; int recvPin = 11;
IRrecv irrecv(recvPin); IRrecv irrecv(recvPin);
//+============================================================================= //+=============================================================================
@@ -92,10 +92,9 @@ void dumpRaw (decode_results *results)
Serial.print("Timing["); Serial.print("Timing[");
Serial.print(results->rawlen, DEC); Serial.print(results->rawlen, DEC);
Serial.println("]: "); Serial.println("]: ");
Serial.print(" -");
Serial.println(results->rawbuf[0] * USECPERTICK, DEC);
for (int i = 1; i < results->rawlen; i++) { for (int i = 1; i < results->rawlen; i++) {
unsigned int x = results->rawbuf[i] * USECPERTICK; unsigned long x = results->rawbuf[i] * USECPERTICK;
if (!(i & 1)) { // even if (!(i & 1)) { // even
Serial.print("-"); Serial.print("-");
if (x < 1000) Serial.print(" ") ; if (x < 1000) Serial.print(" ") ;
@@ -126,7 +125,7 @@ void dumpCode (decode_results *results)
Serial.print("] = {"); // Start declaration Serial.print("] = {"); // Start declaration
// Dump data // Dump data
for (int i = 0; i < results->rawlen; i++) { for (int i = 1; i < results->rawlen; i++) {
Serial.print(results->rawbuf[i] * USECPERTICK, DEC); Serial.print(results->rawbuf[i] * USECPERTICK, DEC);
Serial.print(","); Serial.print(",");
if (!(i & 1)) Serial.print(" "); if (!(i & 1)) Serial.print(" ");
@@ -176,4 +175,3 @@ void loop ( )
irrecv.resume(); // Prepare for the next value irrecv.resume(); // Prepare for the next value
} }
} }