From 942dcf40511c9ec642d3d932a6d1d2046f3fd255 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Wed, 17 Jun 2015 21:59:04 +0100 Subject: [PATCH 01/31] Clearly mark the start of every function to aid is source navigation & code maintainability --- IRremote.cpp | 221 +++++++++++++++++++++++++++++---------------------- 1 file changed, 128 insertions(+), 93 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index 9389267..bbcac02 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -5,7 +5,7 @@ * For details, see http://arcfn.com/2009/08/multi-protocol-infrared-remote-library.html * * Modified by Paul Stoffregen to support other boards and timers - * Modified by Mitra Ardron + * Modified by Mitra Ardron * Added Sanyo and Mitsubishi controllers * Modified Sony to spot the repeat codes that some Sony's send * @@ -74,6 +74,7 @@ int MATCH_SPACE(int measured_ticks, int desired_us) {return MATCH(measured_ticks // Debugging versions are in IRremote.cpp #endif +//+============================================================================= #ifdef SEND_NEC void IRsend::sendNEC(unsigned long data, int nbits) { @@ -84,7 +85,7 @@ void IRsend::sendNEC(unsigned long data, int nbits) if (data & TOPBIT) { mark(NEC_BIT_MARK); space(NEC_ONE_SPACE); - } + } else { mark(NEC_BIT_MARK); space(NEC_ZERO_SPACE); @@ -96,6 +97,7 @@ void IRsend::sendNEC(unsigned long data, int nbits) } #endif +//+============================================================================= #ifdef SEND_WHYNTER void IRsend::sendWhynter(unsigned long data, int nbits) { enableIROut(38); @@ -107,7 +109,7 @@ void IRsend::sendWhynter(unsigned long data, int nbits) { if (data & TOPBIT) { mark(WHYNTER_ONE_MARK); space(WHYNTER_ONE_SPACE); - } + } else { mark(WHYNTER_ZERO_MARK); space(WHYNTER_ZERO_SPACE); @@ -119,6 +121,7 @@ void IRsend::sendWhynter(unsigned long data, int nbits) { } #endif +//+============================================================================= #ifdef SEND_SONY void IRsend::sendSony(unsigned long data, int nbits) { enableIROut(40); @@ -129,7 +132,7 @@ void IRsend::sendSony(unsigned long data, int nbits) { if (data & TOPBIT) { mark(SONY_ONE_MARK); space(SONY_HDR_SPACE); - } + } else { mark(SONY_ZERO_MARK); space(SONY_HDR_SPACE); @@ -139,13 +142,14 @@ void IRsend::sendSony(unsigned long data, int nbits) { } #endif +//+============================================================================= void IRsend::sendRaw(unsigned int buf[], int len, int hz) { enableIROut(hz); for (int i = 0; i < len; i++) { if (i & 1) { space(buf[i]); - } + } else { mark(buf[i]); } @@ -153,6 +157,7 @@ void IRsend::sendRaw(unsigned int buf[], int len, int hz) space(0); // Just to be sure } +//+============================================================================= #ifdef SEND_RC5 // Note: first bit must be a one (start bit) void IRsend::sendRC5(unsigned long data, int nbits) @@ -166,7 +171,7 @@ void IRsend::sendRC5(unsigned long data, int nbits) if (data & TOPBIT) { space(RC5_T1); // 1 is space, then mark mark(RC5_T1); - } + } else { mark(RC5_T1); space(RC5_T1); @@ -177,6 +182,7 @@ void IRsend::sendRC5(unsigned long data, int nbits) } #endif +//+============================================================================= #ifdef SEND_RC6 // Caller needs to take care of flipping the toggle bit void IRsend::sendRC6(unsigned long data, int nbits) @@ -192,14 +198,14 @@ void IRsend::sendRC6(unsigned long data, int nbits) if (i == 3) { // double-wide trailer bit t = 2 * RC6_T1; - } + } else { t = RC6_T1; } if (data & TOPBIT) { mark(t); space(t); - } + } else { space(t); mark(t); @@ -211,12 +217,13 @@ void IRsend::sendRC6(unsigned long data, int nbits) } #endif +//+============================================================================= #ifdef SEND_PANASONIC void IRsend::sendPanasonic(unsigned int address, unsigned long data) { enableIROut(35); mark(PANASONIC_HDR_MARK); space(PANASONIC_HDR_SPACE); - + for(int i=0;i<16;i++) { mark(PANASONIC_BIT_MARK); @@ -225,8 +232,8 @@ void IRsend::sendPanasonic(unsigned int address, unsigned long data) { } else { space(PANASONIC_ZERO_SPACE); } - address <<= 1; - } + address <<= 1; + } for (int i=0; i < 32; i++) { mark(PANASONIC_BIT_MARK); if (data & TOPBIT) { @@ -241,6 +248,7 @@ void IRsend::sendPanasonic(unsigned int address, unsigned long data) { } #endif +//+============================================================================= #ifdef SEND_JVC void IRsend::sendJVC(unsigned long data, int nbits, int repeat) { @@ -248,16 +256,16 @@ void IRsend::sendJVC(unsigned long data, int nbits, int repeat) data = data << (32 - nbits); if (!repeat){ mark(JVC_HDR_MARK); - space(JVC_HDR_SPACE); + space(JVC_HDR_SPACE); } for (int i = 0; i < nbits; i++) { if (data & TOPBIT) { mark(JVC_BIT_MARK); - space(JVC_ONE_SPACE); - } + space(JVC_ONE_SPACE); + } else { mark(JVC_BIT_MARK); - space(JVC_ZERO_SPACE); + space(JVC_ZERO_SPACE); } data <<= 1; } @@ -266,6 +274,7 @@ void IRsend::sendJVC(unsigned long data, int nbits, int repeat) } #endif +//+============================================================================= #ifdef SEND_SAMSUNG void IRsend::sendSAMSUNG(unsigned long data, int nbits) { @@ -276,7 +285,7 @@ void IRsend::sendSAMSUNG(unsigned long data, int nbits) if (data & TOPBIT) { mark(SAMSUNG_BIT_MARK); space(SAMSUNG_ONE_SPACE); - } + } else { mark(SAMSUNG_BIT_MARK); space(SAMSUNG_ZERO_SPACE); @@ -288,6 +297,7 @@ void IRsend::sendSAMSUNG(unsigned long data, int nbits) } #endif +//+============================================================================= void IRsend::mark(int time) { // Sends an IR mark for the specified number of microseconds. // The mark output is modulated at the PWM frequency. @@ -295,6 +305,7 @@ void IRsend::mark(int time) { if (time > 0) delayMicroseconds(time); } +//+============================================================================= /* Leave pin off for time (given in microseconds) */ void IRsend::space(int time) { // Sends an IR space for the specified number of microseconds. @@ -303,6 +314,7 @@ void IRsend::space(int time) { if (time > 0) delayMicroseconds(time); } +//+============================================================================= void IRsend::enableIROut(int khz) { // Enables IR output. The khz value controls the modulation frequency in kilohertz. // The IR output will be on pin 3 (OC2B). @@ -315,13 +327,13 @@ void IRsend::enableIROut(int khz) { // A few hours staring at the ATmega documentation and this will all make sense. // See my Secrets of Arduino PWM at http://arcfn.com/2009/07/secrets-of-arduino-pwm.html for details. - + // Disable the Timer2 Interrupt (which is used for receiving IR) TIMER_DISABLE_INTR; //Timer2 Overflow Interrupt - + pinMode(TIMER_PWM_PIN, OUTPUT); digitalWrite(TIMER_PWM_PIN, LOW); // When not sending PWM, we want it low - + // COM2A = 00: disconnect OC2A // COM2B = 00: disconnect OC2B; to send signal set to 10: OC2B non-inverted // WGM2 = 101: phase-correct PWM with OCRA as top @@ -330,12 +342,14 @@ void IRsend::enableIROut(int khz) { TIMER_CONFIG_KHZ(khz); } +//+============================================================================= IRrecv::IRrecv(int recvpin) { irparams.recvpin = recvpin; irparams.blinkflag = 0; } +//+============================================================================= // initialization void IRrecv::enableIRIn() { cli(); @@ -360,6 +374,7 @@ void IRrecv::enableIRIn() { pinMode(irparams.recvpin, INPUT); } +//+============================================================================= // enable/disable blinking of pin 13 on IR processing void IRrecv::blink13(int blinkflag) { @@ -368,6 +383,7 @@ void IRrecv::blink13(int blinkflag) pinMode(BLINKLED, OUTPUT); } +//+============================================================================= // TIMER2 interrupt code to collect raw data. // Widths of alternating SPACE, MARK are recorded in rawbuf. // Recorded in ticks of 50 microseconds. @@ -392,7 +408,7 @@ ISR(TIMER_INTR_NAME) if (irparams.timer < GAP_TICKS) { // Not big enough to be a gap. irparams.timer = 0; - } + } else { // gap just ended, record duration and start recording transmission irparams.rawlen = 0; @@ -414,7 +430,7 @@ ISR(TIMER_INTR_NAME) irparams.rawbuf[irparams.rawlen++] = irparams.timer; irparams.timer = 0; irparams.rcvstate = STATE_MARK; - } + } else { // SPACE if (irparams.timer > GAP_TICKS) { // big SPACE, indicates gap between codes @@ -422,7 +438,7 @@ ISR(TIMER_INTR_NAME) // Switch to STOP // Don't reset timer; keep counting space width irparams.rcvstate = STATE_STOP; - } + } } break; case STATE_STOP: // waiting, measuring gap @@ -435,20 +451,20 @@ ISR(TIMER_INTR_NAME) if (irparams.blinkflag) { if (irdata == MARK) { BLINKLED_ON(); // turn pin 13 LED on - } + } else { BLINKLED_OFF(); // turn pin 13 LED off } } } +//+============================================================================= void IRrecv::resume() { irparams.rcvstate = STATE_IDLE; irparams.rawlen = 0; } - - +//+============================================================================= // Decodes the received IR message // Returns 0 if no data ready, 1 if data ready. // Results of decoding are stored in results @@ -497,7 +513,7 @@ int IRrecv::decode(decode_results *results) { #ifdef DECODE_RC5 #ifdef DEBUG Serial.println("Attempting RC5 decode"); -#endif +#endif if (decodeRC5(results)) { return DECODED; } @@ -506,7 +522,7 @@ int IRrecv::decode(decode_results *results) { #ifdef DECODE_RC6 #ifdef DEBUG Serial.println("Attempting RC6 decode"); -#endif +#endif if (decodeRC6(results)) { return DECODED; } @@ -515,7 +531,7 @@ int IRrecv::decode(decode_results *results) { #ifdef DECODE_PANASONIC #ifdef DEBUG Serial.println("Attempting Panasonic decode"); -#endif +#endif if (decodePanasonic(results)) { return DECODED; } @@ -524,7 +540,7 @@ int IRrecv::decode(decode_results *results) { #ifdef DECODE_LG #ifdef DEBUG Serial.println("Attempting LG decode"); -#endif +#endif if (decodeLG(results)) { return DECODED; } @@ -533,7 +549,7 @@ int IRrecv::decode(decode_results *results) { #ifdef DECODE_JVC #ifdef DEBUG Serial.println("Attempting JVC decode"); -#endif +#endif if (decodeJVC(results)) { return DECODED; } @@ -560,7 +576,7 @@ int IRrecv::decode(decode_results *results) { #ifdef AIWA_RC_T501 #ifdef DEBUG Serial.println("Attempting Aiwa RC-T501 decode"); -#endif +#endif if (decodeAiwaRCT501(results)) { return DECODED; } @@ -577,6 +593,7 @@ int IRrecv::decode(decode_results *results) { return ERR; } +//+============================================================================= #ifdef DECODE_NEC // NECs have a repeat only 4 items long long IRrecv::decodeNEC(decode_results *results) { @@ -599,7 +616,7 @@ long IRrecv::decodeNEC(decode_results *results) { if (irparams.rawlen < 2 * NEC_BITS + 4) { return ERR; } - // Initial space + // Initial space if (!MATCH_SPACE(results->rawbuf[offset], NEC_HDR_SPACE)) { return ERR; } @@ -611,10 +628,10 @@ long IRrecv::decodeNEC(decode_results *results) { offset++; if (MATCH_SPACE(results->rawbuf[offset], NEC_ONE_SPACE)) { data = (data << 1) | 1; - } + } else if (MATCH_SPACE(results->rawbuf[offset], NEC_ZERO_SPACE)) { data <<= 1; - } + } else { return ERR; } @@ -628,6 +645,7 @@ long IRrecv::decodeNEC(decode_results *results) { } #endif +//+============================================================================= #ifdef DECODE_SONY long IRrecv::decodeSony(decode_results *results) { long data = 0; @@ -664,10 +682,10 @@ long IRrecv::decodeSony(decode_results *results) { offset++; if (MATCH_MARK(results->rawbuf[offset], SONY_ONE_MARK)) { data = (data << 1) | 1; - } + } else if (MATCH_MARK(results->rawbuf[offset], SONY_ZERO_MARK)) { data <<= 1; - } + } else { return ERR; } @@ -686,14 +704,15 @@ long IRrecv::decodeSony(decode_results *results) { } #endif +//+============================================================================= #ifdef DECODE_WHYNTER long IRrecv::decodeWhynter(decode_results *results) { long data = 0; - + if (irparams.rawlen < 2 * WHYNTER_BITS + 6) { return ERR; } - + int offset = 1; // skip initial space // sequence begins with a bit mark and a zero space @@ -724,16 +743,16 @@ long IRrecv::decodeWhynter(decode_results *results) { offset++; if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE)) { data = (data << 1) | 1; - } + } else if (MATCH_SPACE(results->rawbuf[offset],WHYNTER_ZERO_SPACE)) { data <<= 1; - } + } else { return ERR; } offset++; } - + // trailing mark if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) { return ERR; @@ -746,6 +765,7 @@ long IRrecv::decodeWhynter(decode_results *results) { } #endif +//+============================================================================= #ifdef DECODE_SANYO // I think this is a Sanyo decoder - serial = SA 8650B // Looks like Sony except for timings, 48 chars of data and time/space different @@ -755,7 +775,7 @@ long IRrecv::decodeSanyo(decode_results *results) { return ERR; } int offset = 0; // Skip first space - // Initial space + // Initial space /* Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay Serial.print("IR Gap: "); Serial.println( results->rawbuf[offset]); @@ -790,10 +810,10 @@ long IRrecv::decodeSanyo(decode_results *results) { offset++; if (MATCH_MARK(results->rawbuf[offset], SANYO_ONE_MARK)) { data = (data << 1) | 1; - } + } else if (MATCH_MARK(results->rawbuf[offset], SANYO_ZERO_MARK)) { data <<= 1; - } + } else { return ERR; } @@ -812,6 +832,7 @@ long IRrecv::decodeSanyo(decode_results *results) { } #endif +//+============================================================================= #ifdef DECODE_MITSUBISHI // Looks like Sony except for timings, 48 chars of data and time/space different long IRrecv::decodeMitsubishi(decode_results *results) { @@ -821,7 +842,7 @@ long IRrecv::decodeMitsubishi(decode_results *results) { return ERR; } int offset = 0; // Skip first space - // Initial space + // Initial space /* Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay Serial.print("IR Gap: "); Serial.println( results->rawbuf[offset]); @@ -840,7 +861,7 @@ long IRrecv::decodeMitsubishi(decode_results *results) { offset++; // Typical - // 14200 7 41 7 42 7 42 7 17 7 17 7 18 7 41 7 18 7 17 7 17 7 18 7 41 8 17 7 17 7 18 7 17 7 + // 14200 7 41 7 42 7 42 7 17 7 17 7 18 7 41 7 18 7 17 7 17 7 18 7 41 8 17 7 17 7 18 7 17 7 // Initial Space if (!MATCH_MARK(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) { @@ -850,10 +871,10 @@ long IRrecv::decodeMitsubishi(decode_results *results) { while (offset + 1 < irparams.rawlen) { if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ONE_MARK)) { data = (data << 1) | 1; - } + } else if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ZERO_MARK)) { data <<= 1; - } + } else { // Serial.println("A"); Serial.println(offset); Serial.println(results->rawbuf[offset]); return ERR; @@ -878,6 +899,7 @@ long IRrecv::decodeMitsubishi(decode_results *results) { } #endif +//+============================================================================= // Gets one undecoded level at a time from the raw buffer. // The RC5/6 decoding is easier if the data is broken into time intervals. // E.g. if the buffer has MARK for 2 time intervals and SPACE for 1, @@ -897,13 +919,13 @@ int IRrecv::getRClevel(decode_results *results, int *offset, int *used, int t1) int avail; if (MATCH(width, t1 + correction)) { avail = 1; - } + } else if (MATCH(width, 2*t1 + correction)) { avail = 2; - } + } else if (MATCH(width, 3*t1 + correction)) { avail = 3; - } + } else { return -1; } @@ -916,14 +938,15 @@ int IRrecv::getRClevel(decode_results *results, int *offset, int *used, int t1) #ifdef DEBUG if (val == MARK) { Serial.println("MARK"); - } + } else { Serial.println("SPACE"); } #endif - return val; + return val; } +//+============================================================================= #ifdef DECODE_RC5 long IRrecv::decodeRC5(decode_results *results) { if (irparams.rawlen < MIN_RC5_SAMPLES + 2) { @@ -938,19 +961,19 @@ long IRrecv::decodeRC5(decode_results *results) { if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return ERR; int nbits; for (nbits = 0; offset < irparams.rawlen; nbits++) { - int levelA = getRClevel(results, &offset, &used, RC5_T1); + int levelA = getRClevel(results, &offset, &used, RC5_T1); int levelB = getRClevel(results, &offset, &used, RC5_T1); if (levelA == SPACE && levelB == MARK) { // 1 bit data = (data << 1) | 1; - } + } else if (levelA == MARK && levelB == SPACE) { // zero bit data <<= 1; - } + } else { return ERR; - } + } } // Success @@ -961,6 +984,7 @@ long IRrecv::decodeRC5(decode_results *results) { } #endif +//+============================================================================= #ifdef DECODE_RC6 long IRrecv::decodeRC6(decode_results *results) { if (results->rawlen < MIN_RC6_SAMPLES) { @@ -984,27 +1008,27 @@ long IRrecv::decodeRC6(decode_results *results) { int nbits; for (nbits = 0; offset < results->rawlen; nbits++) { int levelA, levelB; // Next two levels - levelA = getRClevel(results, &offset, &used, RC6_T1); + levelA = getRClevel(results, &offset, &used, RC6_T1); if (nbits == 3) { // T bit is double wide; make sure second half matches if (levelA != getRClevel(results, &offset, &used, RC6_T1)) return ERR; - } + } levelB = getRClevel(results, &offset, &used, RC6_T1); if (nbits == 3) { // T bit is double wide; make sure second half matches if (levelB != getRClevel(results, &offset, &used, RC6_T1)) return ERR; - } + } if (levelA == MARK && levelB == SPACE) { // reversed compared to RC5 // 1 bit data = (data << 1) | 1; - } + } else if (levelA == SPACE && levelB == MARK) { // zero bit data <<= 1; - } + } else { return ERR; // Error - } + } } // Success results->bits = nbits; @@ -1012,13 +1036,14 @@ long IRrecv::decodeRC6(decode_results *results) { results->decode_type = RC6; return DECODED; } -#endif +#endif +//+============================================================================= #ifdef DECODE_PANASONIC long IRrecv::decodePanasonic(decode_results *results) { unsigned long long data = 0; int offset = 1; - + if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) { return ERR; } @@ -1027,7 +1052,7 @@ long IRrecv::decodePanasonic(decode_results *results) { return ERR; } offset++; - + // decode address for (int i = 0; i < PANASONIC_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_BIT_MARK)) { @@ -1050,20 +1075,21 @@ long IRrecv::decodePanasonic(decode_results *results) { } #endif +//+============================================================================= #ifdef DECODE_LG long IRrecv::decodeLG(decode_results *results) { long data = 0; int offset = 1; // Skip first space - + // Initial mark if (!MATCH_MARK(results->rawbuf[offset], LG_HDR_MARK)) { return ERR; } - offset++; + offset++; if (irparams.rawlen < 2 * LG_BITS + 1 ) { return ERR; } - // Initial space + // Initial space if (!MATCH_SPACE(results->rawbuf[offset], LG_HDR_SPACE)) { return ERR; } @@ -1075,10 +1101,10 @@ long IRrecv::decodeLG(decode_results *results) { offset++; if (MATCH_SPACE(results->rawbuf[offset], LG_ONE_SPACE)) { data = (data << 1) | 1; - } + } else if (MATCH_SPACE(results->rawbuf[offset], LG_ZERO_SPACE)) { data <<= 1; - } + } else { return ERR; } @@ -1098,6 +1124,7 @@ long IRrecv::decodeLG(decode_results *results) { #endif +//+============================================================================= #ifdef DECODE_JVC long IRrecv::decodeJVC(decode_results *results) { long data = 0; @@ -1110,16 +1137,16 @@ long IRrecv::decodeJVC(decode_results *results) { results->value = REPEAT; results->decode_type = JVC; return DECODED; - } + } // Initial mark if (!MATCH_MARK(results->rawbuf[offset], JVC_HDR_MARK)) { return ERR; } - offset++; + offset++; if (irparams.rawlen < 2 * JVC_BITS + 1 ) { return ERR; } - // Initial space + // Initial space if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) { return ERR; } @@ -1131,10 +1158,10 @@ long IRrecv::decodeJVC(decode_results *results) { offset++; if (MATCH_SPACE(results->rawbuf[offset], JVC_ONE_SPACE)) { data = (data << 1) | 1; - } + } else if (MATCH_SPACE(results->rawbuf[offset], JVC_ZERO_SPACE)) { data <<= 1; - } + } else { return ERR; } @@ -1152,6 +1179,7 @@ long IRrecv::decodeJVC(decode_results *results) { } #endif +//+============================================================================= #ifdef DECODE_SAMSUNG // SAMSUNGs have a repeat only 4 items long long IRrecv::decodeSAMSUNG(decode_results *results) { @@ -1174,7 +1202,7 @@ long IRrecv::decodeSAMSUNG(decode_results *results) { if (irparams.rawlen < 2 * SAMSUNG_BITS + 4) { return ERR; } - // Initial space + // Initial space if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) { return ERR; } @@ -1186,10 +1214,10 @@ long IRrecv::decodeSAMSUNG(decode_results *results) { offset++; if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ONE_SPACE)) { data = (data << 1) | 1; - } + } else if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ZERO_SPACE)) { data <<= 1; - } + } else { return ERR; } @@ -1203,10 +1231,11 @@ long IRrecv::decodeSAMSUNG(decode_results *results) { } #endif +//+============================================================================= /** * Aiwa system * Remote control RC-T501 - * Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 + * Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 * */ #ifdef DECODE_AIWA_RC_T501 @@ -1218,7 +1247,7 @@ long IRrecv::decodeAiwaRCT501(decode_results *results) { if(irparams.rawlen < 2 * (AIWA_RC_T501_SUM_BITS) + 4) { return ERR; } - + // Check HDR if(!MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_HDR_MARK)) { return ERR; @@ -1235,25 +1264,25 @@ long IRrecv::decodeAiwaRCT501(decode_results *results) { while(offset < irparams.rawlen - 4) { if(MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_BIT_MARK)) { offset++; - } + } else { return ERR; } - + // ONE & ZERO if(MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ONE_SPACE)) { data = (data << 1) | 1; - } + } else if(MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ZERO_SPACE)) { data <<= 1; - } + } else { // End of one & zero detected break; } offset++; } - + results->bits = (offset - 1) / 2; if(results->bits < 42) { return ERR; @@ -1265,6 +1294,7 @@ long IRrecv::decodeAiwaRCT501(decode_results *results) { #endif +//+============================================================================= /* ----------------------------------------------------------------------- * hashdecode - decode an arbitrary IR code. * Instead of decoding using a standard encoding scheme @@ -1285,15 +1315,16 @@ long IRrecv::decodeAiwaRCT501(decode_results *results) { int IRrecv::compare(unsigned int oldval, unsigned int newval) { if (newval < oldval * .8) { return 0; - } + } else if (oldval < newval * .8) { return 2; - } + } else { return 1; } } +//+============================================================================= // Use FNV hash algorithm: http://isthe.com/chongo/tech/comp/fnv/#FNV-param #define FNV_PRIME_32 16777619 #define FNV_BASIS_32 2166136261 @@ -1319,6 +1350,7 @@ long IRrecv::decodeHash(decode_results *results) { return DECODED; } +//+============================================================================= /* Sharp and DISH support by Todd Treece ( http://unionbridge.org/design/ircommand ) The Dish send function needs to be repeated 4 times, and the Sharp function @@ -1359,7 +1391,7 @@ void IRsend::sendSharp(unsigned long data, int nbits) { space(SHARP_ZERO_SPACE); } } - + mark(SHARP_BIT_MARK); space(SHARP_ZERO_SPACE); delay(40); @@ -1368,6 +1400,7 @@ void IRsend::sendSharp(unsigned long data, int nbits) { } } +//+============================================================================= // Sharp send compatible with data obtained through decodeSharp void IRsend::sendSharp(unsigned int address, unsigned int command) { sendSharpRaw((address << 10) | (command << 2) | 2, 15); @@ -1375,6 +1408,7 @@ void IRsend::sendSharp(unsigned int address, unsigned int command) { #endif +//+============================================================================= #ifdef SEND_DISH void IRsend::sendDISH(unsigned long data, int nbits) { @@ -1394,21 +1428,22 @@ void IRsend::sendDISH(unsigned long data, int nbits) } } #endif + +//+============================================================================= /** * Aiwa system * Remote control RC-T501 - * Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 + * Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 * */ - #ifdef SEND_AIWA_RC_T501 void IRsend::sendAiwaRCT501(int code) { // PRE-DATA, 26 bits, 0x227EEC0 long int pre = 0x227EEC0; int i; - + enableIROut(AIWA_RC_T501_HZ); - + // HDR mark + HDR space mark(AIWA_RC_T501_HDR_MARK); space(AIWA_RC_T501_HDR_SPACE); From 64698fd24b6e4ea891547ed588d2ba89d23d603e Mon Sep 17 00:00:00 2001 From: Bluechip Date: Wed, 17 Jun 2015 22:16:43 +0100 Subject: [PATCH 02/31] Standardise commenting as C++ style throughout --- IRremote.cpp | 213 +++++++++++++++++++++++++++------------------------ 1 file changed, 113 insertions(+), 100 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index bbcac02..a7b34cf 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -1,22 +1,22 @@ -/* - * IRremote - * Version 0.11 August, 2009 - * Copyright 2009 Ken Shirriff - * For details, see http://arcfn.com/2009/08/multi-protocol-infrared-remote-library.html - * - * Modified by Paul Stoffregen to support other boards and timers - * Modified by Mitra Ardron - * Added Sanyo and Mitsubishi controllers - * Modified Sony to spot the repeat codes that some Sony's send - * - * Interrupt code based on NECIRrcv by Joe Knapp - * http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1210243556 - * Also influenced by http://zovirl.com/2008/11/12/building-a-universal-remote-with-an-arduino/ - * - * JVC and Panasonic protocol added by Kristian Lauszus (Thanks to zenwheel and other people at the original blog post) - * LG added by Darryl Smith (based on the JVC protocol) - * Whynter A/C ARC-110WD added by Francesco Meschia - */ +//****************************************************************************** +// IRremote +// Version 0.11 August, 2009 +// Copyright 2009 Ken Shirriff +// For details, see http://arcfn.com/2009/08/multi-protocol-infrared-remote-library.html +// +// Modified by Paul Stoffregen to support other boards and timers +// Modified by Mitra Ardron +// Added Sanyo and Mitsubishi controllers +// Modified Sony to spot the repeat codes that some Sony's send +// +// Interrupt code based on NECIRrcv by Joe Knapp +// http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1210243556 +// Also influenced by http://zovirl.com/2008/11/12/building-a-universal-remote-with-an-arduino/ +// +// JVC and Panasonic protocol added by Kristian Lauszus (Thanks to zenwheel and other people at the original blog post) +// LG added by Darryl Smith (based on the JVC protocol) +// Whynter A/C ARC-110WD added by Francesco Meschia +//****************************************************************************** #include "IRremote.h" #include "IRremoteInt.h" @@ -158,8 +158,9 @@ void IRsend::sendRaw(unsigned int buf[], int len, int hz) } //+============================================================================= -#ifdef SEND_RC5 // Note: first bit must be a one (start bit) +// +#ifdef SEND_RC5 void IRsend::sendRC5(unsigned long data, int nbits) { enableIROut(36); @@ -183,8 +184,9 @@ void IRsend::sendRC5(unsigned long data, int nbits) #endif //+============================================================================= -#ifdef SEND_RC6 // Caller needs to take care of flipping the toggle bit +// +#ifdef SEND_RC6 void IRsend::sendRC6(unsigned long data, int nbits) { enableIROut(36); @@ -298,36 +300,37 @@ void IRsend::sendSAMSUNG(unsigned long data, int nbits) #endif //+============================================================================= +// Sends an IR mark for the specified number of microseconds. +// The mark output is modulated at the PWM frequency. +// void IRsend::mark(int time) { - // Sends an IR mark for the specified number of microseconds. - // The mark output is modulated at the PWM frequency. TIMER_ENABLE_PWM; // Enable pin 3 PWM output if (time > 0) delayMicroseconds(time); } //+============================================================================= -/* Leave pin off for time (given in microseconds) */ +// Leave pin off for time (given in microseconds) +// Sends an IR space for the specified number of microseconds. +// A space is no output, so the PWM output is disabled. +// void IRsend::space(int time) { - // Sends an IR space for the specified number of microseconds. - // A space is no output, so the PWM output is disabled. TIMER_DISABLE_PWM; // Disable pin 3 PWM output if (time > 0) delayMicroseconds(time); } //+============================================================================= +// Enables IR output. The khz value controls the modulation frequency in kilohertz. +// The IR output will be on pin 3 (OC2B). +// This routine is designed for 36-40KHz; if you use it for other values, it's up to you +// to make sure it gives reasonable results. (Watch out for overflow / underflow / rounding.) +// TIMER2 is used in phase-correct PWM mode, with OCR2A controlling the frequency and OCR2B +// controlling the duty cycle. +// There is no prescaling, so the output frequency is 16MHz / (2 * OCR2A) +// To turn the output on and off, we leave the PWM running, but connect and disconnect the output pin. +// A few hours staring at the ATmega documentation and this will all make sense. +// See my Secrets of Arduino PWM at http://arcfn.com/2009/07/secrets-of-arduino-pwm.html for details. +// void IRsend::enableIROut(int khz) { - // Enables IR output. The khz value controls the modulation frequency in kilohertz. - // The IR output will be on pin 3 (OC2B). - // This routine is designed for 36-40KHz; if you use it for other values, it's up to you - // to make sure it gives reasonable results. (Watch out for overflow / underflow / rounding.) - // TIMER2 is used in phase-correct PWM mode, with OCR2A controlling the frequency and OCR2B - // controlling the duty cycle. - // There is no prescaling, so the output frequency is 16MHz / (2 * OCR2A) - // To turn the output on and off, we leave the PWM running, but connect and disconnect the output pin. - // A few hours staring at the ATmega documentation and this will all make sense. - // See my Secrets of Arduino PWM at http://arcfn.com/2009/07/secrets-of-arduino-pwm.html for details. - - // Disable the Timer2 Interrupt (which is used for receiving IR) TIMER_DISABLE_INTR; //Timer2 Overflow Interrupt @@ -351,6 +354,7 @@ IRrecv::IRrecv(int recvpin) //+============================================================================= // initialization +// void IRrecv::enableIRIn() { cli(); // setup pulse clock timer interrupt @@ -376,6 +380,7 @@ void IRrecv::enableIRIn() { //+============================================================================= // enable/disable blinking of pin 13 on IR processing +// void IRrecv::blink13(int blinkflag) { irparams.blinkflag = blinkflag; @@ -391,6 +396,7 @@ void IRrecv::blink13(int blinkflag) // First entry is the SPACE between transmissions. // As soon as a SPACE gets long, ready is set, state switches to IDLE, timing of SPACE continues. // As soon as first MARK arrives, gap width is recorded, ready is cleared, and new logging starts +// ISR(TIMER_INTR_NAME) { TIMER_RESET; @@ -766,9 +772,10 @@ long IRrecv::decodeWhynter(decode_results *results) { #endif //+============================================================================= -#ifdef DECODE_SANYO // I think this is a Sanyo decoder - serial = SA 8650B // Looks like Sony except for timings, 48 chars of data and time/space different +// +#ifdef DECODE_SANYO long IRrecv::decodeSanyo(decode_results *results) { long data = 0; if (irparams.rawlen < 2 * SANYO_BITS + 2) { @@ -776,12 +783,15 @@ long IRrecv::decodeSanyo(decode_results *results) { } int offset = 0; // Skip first space // Initial space - /* Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay + +#if 0 + // Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay Serial.print("IR Gap: "); Serial.println( results->rawbuf[offset]); Serial.println( "test against:"); Serial.println(results->rawbuf[offset]); - */ +#endif + if (results->rawbuf[offset] < SANYO_DOUBLE_SPACE_USECS) { // Serial.print("IR Gap found: "); results->bits = 0; @@ -833,8 +843,9 @@ long IRrecv::decodeSanyo(decode_results *results) { #endif //+============================================================================= -#ifdef DECODE_MITSUBISHI // Looks like Sony except for timings, 48 chars of data and time/space different +// +#ifdef DECODE_MITSUBISHI long IRrecv::decodeMitsubishi(decode_results *results) { // Serial.print("?!? decoding Mitsubishi:");Serial.print(irparams.rawlen); Serial.print(" want "); Serial.println( 2 * MITSUBISHI_BITS + 2); long data = 0; @@ -843,13 +854,17 @@ long IRrecv::decodeMitsubishi(decode_results *results) { } int offset = 0; // Skip first space // Initial space - /* Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay + +#if 0 + // Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay Serial.print("IR Gap: "); Serial.println( results->rawbuf[offset]); Serial.println( "test against:"); Serial.println(results->rawbuf[offset]); - */ - /* Not seeing double keys from Mitsubishi +#endif + +#if 0 + // Not seeing double keys from Mitsubishi if (results->rawbuf[offset] < MITSUBISHI_DOUBLE_SPACE_USECS) { // Serial.print("IR Gap found: "); results->bits = 0; @@ -857,7 +872,9 @@ long IRrecv::decodeMitsubishi(decode_results *results) { results->decode_type = MITSUBISHI; return DECODED; } - */ +#endif + + offset++; // Typical @@ -907,6 +924,7 @@ long IRrecv::decodeMitsubishi(decode_results *results) { // offset and used are updated to keep track of the current position. // t1 is the time interval for a single bit in microseconds. // Returns -1 for error (measured time interval is not a multiple of t1). +// int IRrecv::getRClevel(decode_results *results, int *offset, int *used, int t1) { if (*offset >= results->rawlen) { // After end of recorded buffer, assume SPACE. @@ -1232,13 +1250,11 @@ long IRrecv::decodeSAMSUNG(decode_results *results) { #endif //+============================================================================= -/** - * Aiwa system - * Remote control RC-T501 - * Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 - * - */ - #ifdef DECODE_AIWA_RC_T501 +// Aiwa system +// Remote control RC-T501 +// Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 +// +#ifdef DECODE_AIWA_RC_T501 long IRrecv::decodeAiwaRCT501(decode_results *results) { int data = 0; int offset = 1; // skip first garbage read @@ -1295,23 +1311,22 @@ long IRrecv::decodeAiwaRCT501(decode_results *results) { #endif //+============================================================================= -/* ----------------------------------------------------------------------- - * hashdecode - decode an arbitrary IR code. - * Instead of decoding using a standard encoding scheme - * (e.g. Sony, NEC, RC5), the code is hashed to a 32-bit value. - * - * The algorithm: look at the sequence of MARK signals, and see if each one - * is shorter (0), the same length (1), or longer (2) than the previous. - * Do the same with the SPACE signals. Hszh the resulting sequence of 0's, - * 1's, and 2's to a 32-bit value. This will give a unique value for each - * different code (probably), for most code systems. - * - * http://arcfn.com/2010/01/using-arbitrary-remotes-with-arduino.html - */ - +// hashdecode - decode an arbitrary IR code. +// Instead of decoding using a standard encoding scheme +// (e.g. Sony, NEC, RC5), the code is hashed to a 32-bit value. +// +// The algorithm: look at the sequence of MARK signals, and see if each one +// is shorter (0), the same length (1), or longer (2) than the previous. +// Do the same with the SPACE signals. Hszh the resulting sequence of 0's, +// 1's, and 2's to a 32-bit value. This will give a unique value for each +// different code (probably), for most code systems. +// +// http://arcfn.com/2010/01/using-arbitrary-remotes-with-arduino.html +// // Compare two tick values, returning 0 if newval is shorter, // 1 if newval is equal, and 2 if newval is longer // Use a tolerance of 20% +// int IRrecv::compare(unsigned int oldval, unsigned int newval) { if (newval < oldval * .8) { return 0; @@ -1326,13 +1341,13 @@ int IRrecv::compare(unsigned int oldval, unsigned int newval) { //+============================================================================= // Use FNV hash algorithm: http://isthe.com/chongo/tech/comp/fnv/#FNV-param +// Converts the raw code values into a 32-bit hash code. +// Hopefully this code is unique for each button. +// This isn't a "real" decoding, just an arbitrary value. +// #define FNV_PRIME_32 16777619 #define FNV_BASIS_32 2166136261 -/* Converts the raw code values into a 32-bit hash code. - * Hopefully this code is unique for each button. - * This isn't a "real" decoding, just an arbitrary value. - */ long IRrecv::decodeHash(decode_results *results) { // Require at least 6 samples to prevent triggering on noise if (results->rawlen < 6) { @@ -1351,28 +1366,27 @@ long IRrecv::decodeHash(decode_results *results) { } //+============================================================================= -/* Sharp and DISH support by Todd Treece ( http://unionbridge.org/design/ircommand ) - -The Dish send function needs to be repeated 4 times, and the Sharp function -has the necessary repeat built in because of the need to invert the signal. - -Sharp protocol documentation: -http://www.sbprojects.com/knowledge/ir/sharp.htm - -Here are the LIRC files that I found that seem to match the remote codes -from the oscilloscope: - -Sharp LCD TV: -http://lirc.sourceforge.net/remotes/sharp/GA538WJSA - -DISH NETWORK (echostar 301): -http://lirc.sourceforge.net/remotes/echostar/301_501_3100_5100_58xx_59xx - -For the DISH codes, only send the last for characters of the hex. -i.e. use 0x1C10 instead of 0x0000000000001C10 which is listed in the -linked LIRC file. -*/ - +// Sharp and DISH support by Todd Treece ( http://unionbridge.org/design/ircommand ) +// +// The Dish send function needs to be repeated 4 times, and the Sharp function +// has the necessary repeat built in because of the need to invert the signal. +// +// Sharp protocol documentation: +// http://www.sbprojects.com/knowledge/ir/sharp.htm +// +// Here are the LIRC files that I found that seem to match the remote codes +// from the oscilloscope: +// +// Sharp LCD TV: +// http://lirc.sourceforge.net/remotes/sharp/GA538WJSA +// +// DISH NETWORK (echostar 301): +// http://lirc.sourceforge.net/remotes/echostar/301_501_3100_5100_58xx_59xx +// +// For the DISH codes, only send the last for characters of the hex. +// i.e. use 0x1C10 instead of 0x0000000000001C10 which is listed in the +// linked LIRC file. +// #ifdef SEND_SHARP void IRsend::sendSharp(unsigned long data, int nbits) { unsigned long invertdata = data ^ SHARP_TOGGLE_MASK; @@ -1402,6 +1416,7 @@ void IRsend::sendSharp(unsigned long data, int nbits) { //+============================================================================= // Sharp send compatible with data obtained through decodeSharp +// void IRsend::sendSharp(unsigned int address, unsigned int command) { sendSharpRaw((address << 10) | (command << 2) | 2, 15); } @@ -1430,13 +1445,11 @@ void IRsend::sendDISH(unsigned long data, int nbits) #endif //+============================================================================= -/** - * Aiwa system - * Remote control RC-T501 - * Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 - * - */ - #ifdef SEND_AIWA_RC_T501 +// Aiwa system +// Remote control RC-T501 +// Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 +// +#ifdef SEND_AIWA_RC_T501 void IRsend::sendAiwaRCT501(int code) { // PRE-DATA, 26 bits, 0x227EEC0 long int pre = 0x227EEC0; From c45b84f65cb1fa61b1a23bd9a550e4cfabdca1cd Mon Sep 17 00:00:00 2001 From: Bluechip Date: Wed, 17 Jun 2015 22:25:34 +0100 Subject: [PATCH 03/31] Standardise function headers for consistent coding style --- IRremote.cpp | 133 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 89 insertions(+), 44 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index a7b34cf..3a807d7 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -30,7 +30,8 @@ volatile irparams_t irparams; // To use them, set DEBUG in IRremoteInt.h // Normally macros are used for efficiency #ifdef DEBUG -int MATCH(int measured, int desired) { +int MATCH (int measured, int desired) +{ Serial.print("Testing: "); Serial.print(TICKS_LOW(desired), DEC); Serial.print(" <= "); @@ -40,7 +41,8 @@ int MATCH(int measured, int desired) { return measured >= TICKS_LOW(desired) && measured <= TICKS_HIGH(desired); } -int MATCH_MARK(int measured_ticks, int desired_us) { +int MATCH_MARK (int measured_ticks, int desired_us) +{ Serial.print("Testing mark "); Serial.print(measured_ticks * USECPERTICK, DEC); Serial.print(" vs "); @@ -54,7 +56,8 @@ int MATCH_MARK(int measured_ticks, int desired_us) { return measured_ticks >= TICKS_LOW(desired_us + MARK_EXCESS) && measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS); } -int MATCH_SPACE(int measured_ticks, int desired_us) { +int MATCH_SPACE (int measured_ticks, int desired_us) +{ Serial.print("Testing space "); Serial.print(measured_ticks * USECPERTICK, DEC); Serial.print(" vs "); @@ -67,16 +70,30 @@ int MATCH_SPACE(int measured_ticks, int desired_us) { Serial.println(TICKS_HIGH(desired_us - MARK_EXCESS), DEC); return measured_ticks >= TICKS_LOW(desired_us - MARK_EXCESS) && measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS); } + #else -int MATCH(int measured, int desired) {return measured >= TICKS_LOW(desired) && measured <= TICKS_HIGH(desired);} -int MATCH_MARK(int measured_ticks, int desired_us) {return MATCH(measured_ticks, (desired_us + MARK_EXCESS));} -int MATCH_SPACE(int measured_ticks, int desired_us) {return MATCH(measured_ticks, (desired_us - MARK_EXCESS));} + +int MATCH (int measured, int desired) +{ + return measured >= TICKS_LOW(desired) && measured <= TICKS_HIGH(desired); +} + +int MATCH_MARK (int measured_ticks, int desired_us) +{ + return MATCH(measured_ticks, (desired_us + MARK_EXCESS)); +} + +int MATCH_SPACE (int measured_ticks, int desired_us) +{ + return MATCH(measured_ticks, (desired_us - MARK_EXCESS)); +} // Debugging versions are in IRremote.cpp + #endif //+============================================================================= #ifdef SEND_NEC -void IRsend::sendNEC(unsigned long data, int nbits) +void IRsend::sendNEC (unsigned long data, int nbits) { enableIROut(38); mark(NEC_HDR_MARK); @@ -99,7 +116,8 @@ void IRsend::sendNEC(unsigned long data, int nbits) //+============================================================================= #ifdef SEND_WHYNTER -void IRsend::sendWhynter(unsigned long data, int nbits) { +void IRsend::sendWhynter (unsigned long data, int nbits) +{ enableIROut(38); mark(WHYNTER_ZERO_MARK); space(WHYNTER_ZERO_SPACE); @@ -123,7 +141,8 @@ void IRsend::sendWhynter(unsigned long data, int nbits) { //+============================================================================= #ifdef SEND_SONY -void IRsend::sendSony(unsigned long data, int nbits) { +void IRsend::sendSony (unsigned long data, int nbits) +{ enableIROut(40); mark(SONY_HDR_MARK); space(SONY_HDR_SPACE); @@ -143,7 +162,7 @@ void IRsend::sendSony(unsigned long data, int nbits) { #endif //+============================================================================= -void IRsend::sendRaw(unsigned int buf[], int len, int hz) +void IRsend::sendRaw (unsigned int buf[], int len, int hz) { enableIROut(hz); for (int i = 0; i < len; i++) { @@ -161,7 +180,7 @@ void IRsend::sendRaw(unsigned int buf[], int len, int hz) // Note: first bit must be a one (start bit) // #ifdef SEND_RC5 -void IRsend::sendRC5(unsigned long data, int nbits) +void IRsend::sendRC5 (unsigned long data, int nbits) { enableIROut(36); data = data << (32 - nbits); @@ -187,7 +206,7 @@ void IRsend::sendRC5(unsigned long data, int nbits) // Caller needs to take care of flipping the toggle bit // #ifdef SEND_RC6 -void IRsend::sendRC6(unsigned long data, int nbits) +void IRsend::sendRC6 (unsigned long data, int nbits) { enableIROut(36); data = data << (32 - nbits); @@ -221,7 +240,8 @@ void IRsend::sendRC6(unsigned long data, int nbits) //+============================================================================= #ifdef SEND_PANASONIC -void IRsend::sendPanasonic(unsigned int address, unsigned long data) { +void IRsend::sendPanasonic (unsigned int address, unsigned long data) +{ enableIROut(35); mark(PANASONIC_HDR_MARK); space(PANASONIC_HDR_SPACE); @@ -252,7 +272,7 @@ void IRsend::sendPanasonic(unsigned int address, unsigned long data) { //+============================================================================= #ifdef SEND_JVC -void IRsend::sendJVC(unsigned long data, int nbits, int repeat) +void IRsend::sendJVC (unsigned long data, int nbits, int repeat) { enableIROut(38); data = data << (32 - nbits); @@ -278,7 +298,7 @@ void IRsend::sendJVC(unsigned long data, int nbits, int repeat) //+============================================================================= #ifdef SEND_SAMSUNG -void IRsend::sendSAMSUNG(unsigned long data, int nbits) +void IRsend::sendSAMSUNG (unsigned long data, int nbits) { enableIROut(38); mark(SAMSUNG_HDR_MARK); @@ -303,7 +323,8 @@ void IRsend::sendSAMSUNG(unsigned long data, int nbits) // Sends an IR mark for the specified number of microseconds. // The mark output is modulated at the PWM frequency. // -void IRsend::mark(int time) { +void IRsend::mark (int time) +{ TIMER_ENABLE_PWM; // Enable pin 3 PWM output if (time > 0) delayMicroseconds(time); } @@ -313,7 +334,8 @@ void IRsend::mark(int time) { // Sends an IR space for the specified number of microseconds. // A space is no output, so the PWM output is disabled. // -void IRsend::space(int time) { +void IRsend::space (int time) +{ TIMER_DISABLE_PWM; // Disable pin 3 PWM output if (time > 0) delayMicroseconds(time); } @@ -330,7 +352,8 @@ void IRsend::space(int time) { // A few hours staring at the ATmega documentation and this will all make sense. // See my Secrets of Arduino PWM at http://arcfn.com/2009/07/secrets-of-arduino-pwm.html for details. // -void IRsend::enableIROut(int khz) { +void IRsend::enableIROut (int khz) +{ // Disable the Timer2 Interrupt (which is used for receiving IR) TIMER_DISABLE_INTR; //Timer2 Overflow Interrupt @@ -346,7 +369,7 @@ void IRsend::enableIROut(int khz) { } //+============================================================================= -IRrecv::IRrecv(int recvpin) +IRrecv::IRrecv (int recvpin) { irparams.recvpin = recvpin; irparams.blinkflag = 0; @@ -355,7 +378,8 @@ IRrecv::IRrecv(int recvpin) //+============================================================================= // initialization // -void IRrecv::enableIRIn() { +void IRrecv::enableIRIn ( ) +{ cli(); // setup pulse clock timer interrupt //Prescale /8 (16M/8 = 0.5 microseconds per tick) @@ -381,7 +405,7 @@ void IRrecv::enableIRIn() { //+============================================================================= // enable/disable blinking of pin 13 on IR processing // -void IRrecv::blink13(int blinkflag) +void IRrecv::blink13 (int blinkflag) { irparams.blinkflag = blinkflag; if (blinkflag) @@ -397,7 +421,7 @@ void IRrecv::blink13(int blinkflag) // As soon as a SPACE gets long, ready is set, state switches to IDLE, timing of SPACE continues. // As soon as first MARK arrives, gap width is recorded, ready is cleared, and new logging starts // -ISR(TIMER_INTR_NAME) +ISR (TIMER_INTR_NAME) { TIMER_RESET; @@ -465,7 +489,8 @@ ISR(TIMER_INTR_NAME) } //+============================================================================= -void IRrecv::resume() { +void IRrecv::resume ( ) +{ irparams.rcvstate = STATE_IDLE; irparams.rawlen = 0; } @@ -474,7 +499,8 @@ void IRrecv::resume() { // Decodes the received IR message // Returns 0 if no data ready, 1 if data ready. // Results of decoding are stored in results -int IRrecv::decode(decode_results *results) { +int IRrecv::decode (decode_results *results) +{ results->rawbuf = irparams.rawbuf; results->rawlen = irparams.rawlen; if (irparams.rcvstate != STATE_STOP) { @@ -602,7 +628,8 @@ int IRrecv::decode(decode_results *results) { //+============================================================================= #ifdef DECODE_NEC // NECs have a repeat only 4 items long -long IRrecv::decodeNEC(decode_results *results) { +long IRrecv::decodeNEC (decode_results *results) +{ long data = 0; int offset = 1; // Skip first space // Initial mark @@ -653,7 +680,8 @@ long IRrecv::decodeNEC(decode_results *results) { //+============================================================================= #ifdef DECODE_SONY -long IRrecv::decodeSony(decode_results *results) { +long IRrecv::decodeSony (decode_results *results) +{ long data = 0; if (irparams.rawlen < 2 * SONY_BITS + 2) { return ERR; @@ -712,7 +740,8 @@ long IRrecv::decodeSony(decode_results *results) { //+============================================================================= #ifdef DECODE_WHYNTER -long IRrecv::decodeWhynter(decode_results *results) { +long IRrecv::decodeWhynter (decode_results *results) +{ long data = 0; if (irparams.rawlen < 2 * WHYNTER_BITS + 6) { @@ -776,7 +805,8 @@ long IRrecv::decodeWhynter(decode_results *results) { // Looks like Sony except for timings, 48 chars of data and time/space different // #ifdef DECODE_SANYO -long IRrecv::decodeSanyo(decode_results *results) { +long IRrecv::decodeSanyo (decode_results *results) +{ long data = 0; if (irparams.rawlen < 2 * SANYO_BITS + 2) { return ERR; @@ -846,7 +876,8 @@ long IRrecv::decodeSanyo(decode_results *results) { // Looks like Sony except for timings, 48 chars of data and time/space different // #ifdef DECODE_MITSUBISHI -long IRrecv::decodeMitsubishi(decode_results *results) { +long IRrecv::decodeMitsubishi (decode_results *results) +{ // Serial.print("?!? decoding Mitsubishi:");Serial.print(irparams.rawlen); Serial.print(" want "); Serial.println( 2 * MITSUBISHI_BITS + 2); long data = 0; if (irparams.rawlen < 2 * MITSUBISHI_BITS + 2) { @@ -925,7 +956,8 @@ long IRrecv::decodeMitsubishi(decode_results *results) { // t1 is the time interval for a single bit in microseconds. // Returns -1 for error (measured time interval is not a multiple of t1). // -int IRrecv::getRClevel(decode_results *results, int *offset, int *used, int t1) { +int IRrecv::getRClevel (decode_results *results, int *offset, int *used, int t1) +{ if (*offset >= results->rawlen) { // After end of recorded buffer, assume SPACE. return SPACE; @@ -966,7 +998,8 @@ int IRrecv::getRClevel(decode_results *results, int *offset, int *used, int t1) //+============================================================================= #ifdef DECODE_RC5 -long IRrecv::decodeRC5(decode_results *results) { +long IRrecv::decodeRC5 (decode_results *results) +{ if (irparams.rawlen < MIN_RC5_SAMPLES + 2) { return ERR; } @@ -1004,7 +1037,8 @@ long IRrecv::decodeRC5(decode_results *results) { //+============================================================================= #ifdef DECODE_RC6 -long IRrecv::decodeRC6(decode_results *results) { +long IRrecv::decodeRC6 (decode_results *results) +{ if (results->rawlen < MIN_RC6_SAMPLES) { return ERR; } @@ -1058,7 +1092,8 @@ long IRrecv::decodeRC6(decode_results *results) { //+============================================================================= #ifdef DECODE_PANASONIC -long IRrecv::decodePanasonic(decode_results *results) { +long IRrecv::decodePanasonic (decode_results *results) +{ unsigned long long data = 0; int offset = 1; @@ -1095,7 +1130,8 @@ long IRrecv::decodePanasonic(decode_results *results) { //+============================================================================= #ifdef DECODE_LG -long IRrecv::decodeLG(decode_results *results) { +long IRrecv::decodeLG (decode_results *results) +{ long data = 0; int offset = 1; // Skip first space @@ -1144,7 +1180,8 @@ long IRrecv::decodeLG(decode_results *results) { //+============================================================================= #ifdef DECODE_JVC -long IRrecv::decodeJVC(decode_results *results) { +long IRrecv::decodeJVC (decode_results *results) +{ long data = 0; int offset = 1; // Skip first space // Check for repeat @@ -1198,9 +1235,11 @@ long IRrecv::decodeJVC(decode_results *results) { #endif //+============================================================================= -#ifdef DECODE_SAMSUNG // SAMSUNGs have a repeat only 4 items long -long IRrecv::decodeSAMSUNG(decode_results *results) { +// +#ifdef DECODE_SAMSUNG +long IRrecv::decodeSAMSUNG (decode_results *results) +{ long data = 0; int offset = 1; // Skip first space // Initial mark @@ -1255,7 +1294,8 @@ long IRrecv::decodeSAMSUNG(decode_results *results) { // Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 // #ifdef DECODE_AIWA_RC_T501 -long IRrecv::decodeAiwaRCT501(decode_results *results) { +long IRrecv::decodeAiwaRCT501 (decode_results *results) +{ int data = 0; int offset = 1; // skip first garbage read @@ -1327,7 +1367,8 @@ long IRrecv::decodeAiwaRCT501(decode_results *results) { // 1 if newval is equal, and 2 if newval is longer // Use a tolerance of 20% // -int IRrecv::compare(unsigned int oldval, unsigned int newval) { +int IRrecv::compare (unsigned int oldval, unsigned int newval) +{ if (newval < oldval * .8) { return 0; } @@ -1348,7 +1389,8 @@ int IRrecv::compare(unsigned int oldval, unsigned int newval) { #define FNV_PRIME_32 16777619 #define FNV_BASIS_32 2166136261 -long IRrecv::decodeHash(decode_results *results) { +long IRrecv::decodeHash (decode_results *results) +{ // Require at least 6 samples to prevent triggering on noise if (results->rawlen < 6) { return ERR; @@ -1388,7 +1430,8 @@ long IRrecv::decodeHash(decode_results *results) { // linked LIRC file. // #ifdef SEND_SHARP -void IRsend::sendSharp(unsigned long data, int nbits) { +void IRsend::sendSharp (unsigned long data, int nbits) +{ unsigned long invertdata = data ^ SHARP_TOGGLE_MASK; enableIROut(38); @@ -1417,7 +1460,8 @@ void IRsend::sendSharp(unsigned long data, int nbits) { //+============================================================================= // Sharp send compatible with data obtained through decodeSharp // -void IRsend::sendSharp(unsigned int address, unsigned int command) { +void IRsend::sendSharp (unsigned int address, unsigned int command) +{ sendSharpRaw((address << 10) | (command << 2) | 2, 15); } @@ -1425,7 +1469,7 @@ void IRsend::sendSharp(unsigned int address, unsigned int command) { //+============================================================================= #ifdef SEND_DISH -void IRsend::sendDISH(unsigned long data, int nbits) +void IRsend::sendDISH (unsigned long data, int nbits) { enableIROut(56); mark(DISH_HDR_MARK); @@ -1450,7 +1494,8 @@ void IRsend::sendDISH(unsigned long data, int nbits) // Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 // #ifdef SEND_AIWA_RC_T501 -void IRsend::sendAiwaRCT501(int code) { +void IRsend::sendAiwaRCT501 (int code) +{ // PRE-DATA, 26 bits, 0x227EEC0 long int pre = 0x227EEC0; int i; From 7f1387278fdb50a3fd22b9a5f90b4eeb2a07d4ed Mon Sep 17 00:00:00 2001 From: Bluechip Date: Wed, 17 Jun 2015 22:54:43 +0100 Subject: [PATCH 04/31] Reduce one-line-if's down to one line --- IRremote.cpp | 508 +++++++++++++-------------------------------------- 1 file changed, 129 insertions(+), 379 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index 3a807d7..e5d44e0 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -166,12 +166,8 @@ void IRsend::sendRaw (unsigned int buf[], int len, int hz) { enableIROut(hz); for (int i = 0; i < len; i++) { - if (i & 1) { - space(buf[i]); - } - else { - mark(buf[i]); - } + if (i & 1) space(buf[i]) ; + else mark (buf[i]) ; } space(0); // Just to be sure } @@ -216,13 +212,8 @@ void IRsend::sendRC6 (unsigned long data, int nbits) space(RC6_T1); int t; for (int i = 0; i < nbits; i++) { - if (i == 3) { - // double-wide trailer bit - t = 2 * RC6_T1; - } - else { - t = RC6_T1; - } + if (i == 3) t = RC6_T1 * 2 ; // double-wide trailer bit + else t = RC6_T1 ; if (data & TOPBIT) { mark(t); space(t); @@ -249,20 +240,14 @@ void IRsend::sendPanasonic (unsigned int address, unsigned long data) for(int i=0;i<16;i++) { mark(PANASONIC_BIT_MARK); - if (address & 0x8000) { - space(PANASONIC_ONE_SPACE); - } else { - space(PANASONIC_ZERO_SPACE); - } + if (address & 0x8000) space(PANASONIC_ONE_SPACE) ; + else space(PANASONIC_ZERO_SPACE) ; address <<= 1; } for (int i=0; i < 32; i++) { mark(PANASONIC_BIT_MARK); - if (data & TOPBIT) { - space(PANASONIC_ONE_SPACE); - } else { - space(PANASONIC_ZERO_SPACE); - } + if (data & TOPBIT) space(PANASONIC_ONE_SPACE) ; + else space(PANASONIC_ZERO_SPACE) ; data <<= 1; } mark(PANASONIC_BIT_MARK); @@ -408,8 +393,7 @@ void IRrecv::enableIRIn ( ) void IRrecv::blink13 (int blinkflag) { irparams.blinkflag = blinkflag; - if (blinkflag) - pinMode(BLINKLED, OUTPUT); + if (blinkflag) pinMode(BLINKLED, OUTPUT) ; } //+============================================================================= @@ -428,10 +412,7 @@ ISR (TIMER_INTR_NAME) uint8_t irdata = (uint8_t)digitalRead(irparams.recvpin); irparams.timer++; // One more 50us tick - if (irparams.rawlen >= RAWBUF) { - // Buffer overflow - irparams.rcvstate = STATE_STOP; - } + if (irparams.rawlen >= RAWBUF) irparams.rcvstate = STATE_STOP ; // Buffer overflow switch(irparams.rcvstate) { case STATE_IDLE: // In the middle of a gap if (irdata == MARK) { @@ -472,18 +453,13 @@ ISR (TIMER_INTR_NAME) } break; case STATE_STOP: // waiting, measuring gap - if (irdata == MARK) { // reset gap timer - irparams.timer = 0; - } + if (irdata == MARK) irparams.timer = 0 ; // reset gap timer break; } if (irparams.blinkflag) { - if (irdata == MARK) { - BLINKLED_ON(); // turn pin 13 LED on - } - else { - BLINKLED_OFF(); // turn pin 13 LED off + if (irdata == MARK) BLINKLED_ON() ; // turn pin 13 LED on + else BLINKLED_OFF() ; // turn pin 13 LED off } } } @@ -503,123 +479,95 @@ int IRrecv::decode (decode_results *results) { results->rawbuf = irparams.rawbuf; results->rawlen = irparams.rawlen; - if (irparams.rcvstate != STATE_STOP) { - return ERR; - } + if (irparams.rcvstate != STATE_STOP) return ERR ; #ifdef DECODE_NEC #ifdef DEBUG Serial.println("Attempting NEC decode"); #endif - if (decodeNEC(results)) { - return DECODED; - } + if (decodeNEC(results)) return DECODED ; #endif #ifdef DECODE_SONY #ifdef DEBUG Serial.println("Attempting Sony decode"); #endif - if (decodeSony(results)) { - return DECODED; - } + if (decodeSony(results)) return DECODED ; #endif #ifdef DECODE_SANYO #ifdef DEBUG Serial.println("Attempting Sanyo decode"); #endif - if (decodeSanyo(results)) { - return DECODED; - } + if (decodeSanyo(results)) return DECODED ; #endif #ifdef DECODE_MITSUBISHI #ifdef DEBUG Serial.println("Attempting Mitsubishi decode"); #endif - if (decodeMitsubishi(results)) { - return DECODED; - } + if (decodeMitsubishi(results)) return DECODED ; #endif #ifdef DECODE_RC5 #ifdef DEBUG Serial.println("Attempting RC5 decode"); #endif - if (decodeRC5(results)) { - return DECODED; - } + if (decodeRC5(results)) return DECODED ; #endif #ifdef DECODE_RC6 #ifdef DEBUG Serial.println("Attempting RC6 decode"); #endif - if (decodeRC6(results)) { - return DECODED; - } + if (decodeRC6(results)) return DECODED ; #endif #ifdef DECODE_PANASONIC #ifdef DEBUG Serial.println("Attempting Panasonic decode"); #endif - if (decodePanasonic(results)) { - return DECODED; - } + if (decodePanasonic(results)) return DECODED ; #endif #ifdef DECODE_LG #ifdef DEBUG Serial.println("Attempting LG decode"); #endif - if (decodeLG(results)) { - return DECODED; - } + if (decodeLG(results)) return DECODED ; #endif #ifdef DECODE_JVC #ifdef DEBUG Serial.println("Attempting JVC decode"); #endif - if (decodeJVC(results)) { - return DECODED; - } + if (decodeJVC(results)) return DECODED ; #endif #ifdef DECODE_SAMSUNG #ifdef DEBUG Serial.println("Attempting SAMSUNG decode"); #endif - if (decodeSAMSUNG(results)) { - return DECODED; - } + if (decodeSAMSUNG(results)) return DECODED ; #endif #ifdef DECODE_WHYNTER #ifdef DEBUG Serial.println("Attempting Whynter decode"); #endif - if (decodeWhynter(results)) { - return DECODED; - } + if (decodeWhynter(results)) return DECODED ; #endif #ifdef AIWA_RC_T501 #ifdef DEBUG Serial.println("Attempting Aiwa RC-T501 decode"); #endif - if (decodeAiwaRCT501(results)) { - return DECODED; - } + if (decodeAiwaRCT501(results)) return DECODED ; #endif // decodeHash returns a hash on any input. // Thus, it needs to be last in the list. // If you add any decodes, add them before this. - if (decodeHash(results)) { - return DECODED; - } + if (decodeHash(results)) return DECODED ; // Throw away and start over resume(); return ERR; @@ -633,9 +581,7 @@ long IRrecv::decodeNEC (decode_results *results) long data = 0; int offset = 1; // Skip first space // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], NEC_HDR_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], NEC_HDR_MARK)) return ERR ; offset++; // Check for repeat if (irparams.rawlen == 4 && @@ -646,28 +592,16 @@ long IRrecv::decodeNEC (decode_results *results) results->decode_type = NEC; return DECODED; } - if (irparams.rawlen < 2 * NEC_BITS + 4) { - return ERR; - } + if (irparams.rawlen < 2 * NEC_BITS + 4) return ERR ; // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], NEC_HDR_SPACE)) { - return ERR; - } + if (!MATCH_SPACE(results->rawbuf[offset], NEC_HDR_SPACE)) return ERR ; offset++; for (int i = 0; i < NEC_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], NEC_BIT_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], NEC_BIT_MARK)) return ERR ; offset++; - if (MATCH_SPACE(results->rawbuf[offset], NEC_ONE_SPACE)) { - data = (data << 1) | 1; - } - else if (MATCH_SPACE(results->rawbuf[offset], NEC_ZERO_SPACE)) { - data <<= 1; - } - else { - return ERR; - } + if (MATCH_SPACE(results->rawbuf[offset], NEC_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], NEC_ZERO_SPACE)) data <<= 1 ; + else return ERR ; offset++; } // Success @@ -683,9 +617,7 @@ long IRrecv::decodeNEC (decode_results *results) long IRrecv::decodeSony (decode_results *results) { long data = 0; - if (irparams.rawlen < 2 * SONY_BITS + 2) { - return ERR; - } + if (irparams.rawlen < 2 * SONY_BITS + 2) return ERR ; int offset = 0; // Dont skip first space, check its size // Some Sony's deliver repeats fast after first @@ -704,25 +636,15 @@ long IRrecv::decodeSony (decode_results *results) offset++; // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SONY_HDR_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], SONY_HDR_MARK)) return ERR ; offset++; while (offset + 1 < irparams.rawlen) { - if (!MATCH_SPACE(results->rawbuf[offset], SONY_HDR_SPACE)) { - break; - } + if (!MATCH_SPACE(results->rawbuf[offset], SONY_HDR_SPACE)) break ; offset++; - if (MATCH_MARK(results->rawbuf[offset], SONY_ONE_MARK)) { - data = (data << 1) | 1; - } - else if (MATCH_MARK(results->rawbuf[offset], SONY_ZERO_MARK)) { - data <<= 1; - } - else { - return ERR; - } + if (MATCH_MARK(results->rawbuf[offset], SONY_ONE_MARK)) data = (data << 1) | 1 ; + else if (MATCH_MARK(results->rawbuf[offset], SONY_ZERO_MARK)) data <<= 1 ; + else return ERR ; offset++; } @@ -744,54 +666,34 @@ long IRrecv::decodeWhynter (decode_results *results) { long data = 0; - if (irparams.rawlen < 2 * WHYNTER_BITS + 6) { - return ERR; - } + if (irparams.rawlen < 2 * WHYNTER_BITS + 6) return ERR ; int offset = 1; // skip initial space // sequence begins with a bit mark and a zero space - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return ERR ; offset++; - if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_ZERO_SPACE)) { - return ERR; - } + if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_ZERO_SPACE)) return ERR ; offset++; // header mark and space - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_HDR_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_HDR_MARK)) return ERR ; offset++; - if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_HDR_SPACE)) { - return ERR; - } + if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_HDR_SPACE)) return ERR ; offset++; // data bits for (int i = 0; i < WHYNTER_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return ERR ; offset++; - if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE)) { - data = (data << 1) | 1; - } - else if (MATCH_SPACE(results->rawbuf[offset],WHYNTER_ZERO_SPACE)) { - data <<= 1; - } - else { - return ERR; - } + if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset],WHYNTER_ZERO_SPACE)) data <<= 1 ; + else return ERR ; offset++; } // trailing mark - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return ERR ; // Success results->bits = WHYNTER_BITS; results->value = data; @@ -808,9 +710,7 @@ long IRrecv::decodeWhynter (decode_results *results) long IRrecv::decodeSanyo (decode_results *results) { long data = 0; - if (irparams.rawlen < 2 * SANYO_BITS + 2) { - return ERR; - } + if (irparams.rawlen < 2 * SANYO_BITS + 2) return ERR ; int offset = 0; // Skip first space // Initial space @@ -832,31 +732,19 @@ long IRrecv::decodeSanyo (decode_results *results) offset++; // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return ERR ; offset++; // Skip Second Mark - if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return ERR ; offset++; while (offset + 1 < irparams.rawlen) { - if (!MATCH_SPACE(results->rawbuf[offset], SANYO_HDR_SPACE)) { - break; - } + if (!MATCH_SPACE(results->rawbuf[offset], SANYO_HDR_SPACE)) break ; offset++; - if (MATCH_MARK(results->rawbuf[offset], SANYO_ONE_MARK)) { - data = (data << 1) | 1; - } - else if (MATCH_MARK(results->rawbuf[offset], SANYO_ZERO_MARK)) { - data <<= 1; - } - else { - return ERR; - } + if (MATCH_MARK(results->rawbuf[offset], SANYO_ONE_MARK)) data = (data << 1) | 1 ; + else if (MATCH_MARK(results->rawbuf[offset], SANYO_ZERO_MARK)) data <<= 1 ; + else return ERR ; offset++; } @@ -880,9 +768,7 @@ long IRrecv::decodeMitsubishi (decode_results *results) { // Serial.print("?!? decoding Mitsubishi:");Serial.print(irparams.rawlen); Serial.print(" want "); Serial.println( 2 * MITSUBISHI_BITS + 2); long data = 0; - if (irparams.rawlen < 2 * MITSUBISHI_BITS + 2) { - return ERR; - } + if (irparams.rawlen < 2 * MITSUBISHI_BITS + 2) return ERR ; int offset = 0; // Skip first space // Initial space @@ -912,26 +798,14 @@ long IRrecv::decodeMitsubishi (decode_results *results) // 14200 7 41 7 42 7 42 7 17 7 17 7 18 7 41 7 18 7 17 7 17 7 18 7 41 8 17 7 17 7 18 7 17 7 // Initial Space - if (!MATCH_MARK(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) return ERR ; offset++; while (offset + 1 < irparams.rawlen) { - if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ONE_MARK)) { - data = (data << 1) | 1; - } - else if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ZERO_MARK)) { - data <<= 1; - } - else { - // Serial.println("A"); Serial.println(offset); Serial.println(results->rawbuf[offset]); - return ERR; - } + if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ONE_MARK)) data = (data << 1) | 1 ; + else if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ZERO_MARK)) data <<= 1 ; + else return ERR ; offset++; - if (!MATCH_SPACE(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) { - // Serial.println("B"); Serial.println(offset); Serial.println(results->rawbuf[offset]); - break; - } + if (!MATCH_SPACE(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) break ; offset++; } @@ -958,27 +832,16 @@ long IRrecv::decodeMitsubishi (decode_results *results) // int IRrecv::getRClevel (decode_results *results, int *offset, int *used, int t1) { - if (*offset >= results->rawlen) { - // After end of recorded buffer, assume SPACE. - return SPACE; - } + if (*offset >= results->rawlen) return SPACE ; // After end of recorded buffer, assume SPACE. int width = results->rawbuf[*offset]; int val = ((*offset) % 2) ? MARK : SPACE; int correction = (val == MARK) ? MARK_EXCESS : - MARK_EXCESS; int avail; - if (MATCH(width, t1 + correction)) { - avail = 1; - } - else if (MATCH(width, 2*t1 + correction)) { - avail = 2; - } - else if (MATCH(width, 3*t1 + correction)) { - avail = 3; - } - else { - return -1; - } + if (MATCH(width, t1 + correction)) avail = 1 ; + else if (MATCH(width, 2*t1 + correction)) avail = 2 ; + else if (MATCH(width, 3*t1 + correction)) avail = 3 ; + else return -1 ; (*used)++; if (*used >= avail) { @@ -1000,31 +863,21 @@ int IRrecv::getRClevel (decode_results *results, int *offset, int *used, int #ifdef DECODE_RC5 long IRrecv::decodeRC5 (decode_results *results) { - if (irparams.rawlen < MIN_RC5_SAMPLES + 2) { - return ERR; - } + if (irparams.rawlen < MIN_RC5_SAMPLES + 2) return ERR ; int offset = 1; // Skip gap space long data = 0; int used = 0; // Get start bits - if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return ERR; - if (getRClevel(results, &offset, &used, RC5_T1) != SPACE) return ERR; - if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return ERR; + if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return ERR ; + if (getRClevel(results, &offset, &used, RC5_T1) != SPACE) return ERR ; + if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return ERR ; int nbits; for (nbits = 0; offset < irparams.rawlen; nbits++) { int levelA = getRClevel(results, &offset, &used, RC5_T1); int levelB = getRClevel(results, &offset, &used, RC5_T1); - if (levelA == SPACE && levelB == MARK) { - // 1 bit - data = (data << 1) | 1; - } - else if (levelA == MARK && levelB == SPACE) { - // zero bit - data <<= 1; - } - else { - return ERR; - } + if (levelA == SPACE && levelB == MARK) data = (data << 1) | 1 ; // 1 bit + else if (levelA == MARK && levelB == SPACE) data <<= 1 ; // zero bit + else return ERR ; } // Success @@ -1039,24 +892,18 @@ long IRrecv::decodeRC5 (decode_results *results) #ifdef DECODE_RC6 long IRrecv::decodeRC6 (decode_results *results) { - if (results->rawlen < MIN_RC6_SAMPLES) { - return ERR; - } + if (results->rawlen < MIN_RC6_SAMPLES) return ERR ; int offset = 1; // Skip first space // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], RC6_HDR_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], RC6_HDR_MARK)) return ERR ; offset++; - if (!MATCH_SPACE(results->rawbuf[offset], RC6_HDR_SPACE)) { - return ERR; - } + if (!MATCH_SPACE(results->rawbuf[offset], RC6_HDR_SPACE)) return ERR ; offset++; long data = 0; int used = 0; // Get start bit (1) - if (getRClevel(results, &offset, &used, RC6_T1) != MARK) return ERR; - if (getRClevel(results, &offset, &used, RC6_T1) != SPACE) return ERR; + if (getRClevel(results, &offset, &used, RC6_T1) != MARK) return ERR ; + if (getRClevel(results, &offset, &used, RC6_T1) != SPACE) return ERR ; int nbits; for (nbits = 0; offset < results->rawlen; nbits++) { int levelA, levelB; // Next two levels @@ -1070,17 +917,9 @@ long IRrecv::decodeRC6 (decode_results *results) // T bit is double wide; make sure second half matches if (levelB != getRClevel(results, &offset, &used, RC6_T1)) return ERR; } - if (levelA == MARK && levelB == SPACE) { // reversed compared to RC5 - // 1 bit - data = (data << 1) | 1; - } - else if (levelA == SPACE && levelB == MARK) { - // zero bit - data <<= 1; - } - else { - return ERR; // Error - } + if (levelA == MARK && levelB == SPACE) data = (data << 1) | 1 ; // 1-bit (reversed compared to RC5) + else if (levelA == SPACE && levelB == MARK) data <<= 1 ; // zero bit + else return ERR ; // Error } // Success results->bits = nbits; @@ -1097,27 +936,17 @@ long IRrecv::decodePanasonic (decode_results *results) unsigned long long data = 0; int offset = 1; - if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) return ERR ; offset++; - if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_SPACE)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_SPACE)) return ERR ; offset++; // decode address for (int i = 0; i < PANASONIC_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_BIT_MARK)) { - return ERR; - } - if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ONE_SPACE)) { - data = (data << 1) | 1; - } else if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ZERO_SPACE)) { - data <<= 1; - } else { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_BIT_MARK)) return ERR ; + if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ZERO_SPACE)) data <<= 1 ; + else return ERR ; offset++; } results->value = (unsigned long)data; @@ -1136,38 +965,22 @@ long IRrecv::decodeLG (decode_results *results) int offset = 1; // Skip first space // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], LG_HDR_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], LG_HDR_MARK)) return ERR ; offset++; - if (irparams.rawlen < 2 * LG_BITS + 1 ) { - return ERR; - } + if (irparams.rawlen < 2 * LG_BITS + 1 ) return ERR ; // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], LG_HDR_SPACE)) { - return ERR; - } + if (!MATCH_SPACE(results->rawbuf[offset], LG_HDR_SPACE)) return ERR ; offset++; for (int i = 0; i < LG_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return ERR ; offset++; - if (MATCH_SPACE(results->rawbuf[offset], LG_ONE_SPACE)) { - data = (data << 1) | 1; - } - else if (MATCH_SPACE(results->rawbuf[offset], LG_ZERO_SPACE)) { - data <<= 1; - } - else { - return ERR; - } + if (MATCH_SPACE(results->rawbuf[offset], LG_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], LG_ZERO_SPACE)) data <<= 1 ; + else return ERR ; offset++; } //Stop bit - if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)){ - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return ERR ; // Success results->bits = LG_BITS; results->value = data; @@ -1194,38 +1007,22 @@ long IRrecv::decodeJVC (decode_results *results) return DECODED; } // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], JVC_HDR_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], JVC_HDR_MARK)) return ERR ; offset++; - if (irparams.rawlen < 2 * JVC_BITS + 1 ) { - return ERR; - } + if (irparams.rawlen < 2 * JVC_BITS + 1 ) return ERR ; // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) { - return ERR; - } + if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) return ERR ; offset++; for (int i = 0; i < JVC_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return ERR ; offset++; - if (MATCH_SPACE(results->rawbuf[offset], JVC_ONE_SPACE)) { - data = (data << 1) | 1; - } - else if (MATCH_SPACE(results->rawbuf[offset], JVC_ZERO_SPACE)) { - data <<= 1; - } - else { - return ERR; - } + if (MATCH_SPACE(results->rawbuf[offset], JVC_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], JVC_ZERO_SPACE)) data <<= 1 ; + else return ERR ; offset++; } //Stop bit - if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)){ - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return ERR ; // Success results->bits = JVC_BITS; results->value = data; @@ -1243,9 +1040,7 @@ long IRrecv::decodeSAMSUNG (decode_results *results) long data = 0; int offset = 1; // Skip first space // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_HDR_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_HDR_MARK)) return ERR ; offset++; // Check for repeat if (irparams.rawlen == 4 && @@ -1256,28 +1051,16 @@ long IRrecv::decodeSAMSUNG (decode_results *results) results->decode_type = SAMSUNG; return DECODED; } - if (irparams.rawlen < 2 * SAMSUNG_BITS + 4) { - return ERR; - } + if (irparams.rawlen < 2 * SAMSUNG_BITS + 4) return ERR ; // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) { - return ERR; - } + if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) return ERR ; offset++; for (int i = 0; i < SAMSUNG_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_BIT_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_BIT_MARK)) return ERR ; offset++; - if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ONE_SPACE)) { - data = (data << 1) | 1; - } - else if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ZERO_SPACE)) { - data <<= 1; - } - else { - return ERR; - } + if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ZERO_SPACE)) data <<= 1 ; + else return ERR ; offset++; } // Success @@ -1300,49 +1083,30 @@ long IRrecv::decodeAiwaRCT501 (decode_results *results) int offset = 1; // skip first garbage read // Check SIZE - if(irparams.rawlen < 2 * (AIWA_RC_T501_SUM_BITS) + 4) { - return ERR; - } + if (irparams.rawlen < 2 * (AIWA_RC_T501_SUM_BITS) + 4) return ERR ; // Check HDR - if(!MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_HDR_MARK)) { - return ERR; - } + if (!MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_HDR_MARK)) return ERR ; offset++; // Check HDR space - if(!MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_HDR_SPACE)) { - return ERR; - } + if (!MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_HDR_SPACE)) return ERR ; offset++; offset += 26; // skip pre-data - optional while(offset < irparams.rawlen - 4) { - if(MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_BIT_MARK)) { - offset++; - } - else { - return ERR; - } + if (MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_BIT_MARK)) offset++ ; + else return ERR ; // ONE & ZERO - if(MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ONE_SPACE)) { - data = (data << 1) | 1; - } - else if(MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ZERO_SPACE)) { - data <<= 1; - } - else { - // End of one & zero detected - break; - } + if (MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ZERO_SPACE)) data <<= 1 ; + else break ; // End of one & zero detected offset++; } results->bits = (offset - 1) / 2; - if(results->bits < 42) { - return ERR; - } + if (results->bits < 42) return ERR ; results->value = data; results->decode_type = AIWA_RC_T501; return DECODED; @@ -1369,15 +1133,9 @@ long IRrecv::decodeAiwaRCT501 (decode_results *results) // int IRrecv::compare (unsigned int oldval, unsigned int newval) { - if (newval < oldval * .8) { - return 0; - } - else if (oldval < newval * .8) { - return 2; - } - else { - return 1; - } + if (newval < oldval * .8) return 0 ; + else if (oldval < newval * .8) return 2 ; + else return 1 ; } //+============================================================================= @@ -1392,9 +1150,7 @@ int IRrecv::compare (unsigned int oldval, unsigned int newval) long IRrecv::decodeHash (decode_results *results) { // Require at least 6 samples to prevent triggering on noise - if (results->rawlen < 6) { - return ERR; - } + if (results->rawlen < 6) return ERR ; long hash = FNV_BASIS_32; for (int i = 1; i+2 < results->rawlen; i++) { int value = compare(results->rawbuf[i], results->rawbuf[i+2]); @@ -1511,11 +1267,8 @@ void IRsend::sendAiwaRCT501 (int code) // Send pre-data for(i=0; i < 26; i++) { mark(AIWA_RC_T501_BIT_MARK); - if(pre & TOPBIT) { - space(AIWA_RC_T501_ONE_SPACE); - } else { - space(AIWA_RC_T501_ZERO_SPACE); - } + if (pre & TOPBIT) space(AIWA_RC_T501_ONE_SPACE) ; + else space(AIWA_RC_T501_ZERO_SPACE) ; pre <<= 1; } @@ -1524,11 +1277,8 @@ void IRsend::sendAiwaRCT501 (int code) // Send code for(i=0; i < 15; i++) { mark(AIWA_RC_T501_BIT_MARK); - if(code & TOPBIT) { - space(AIWA_RC_T501_ONE_SPACE); - } else { - space(AIWA_RC_T501_ZERO_SPACE); - } + if (code & TOPBIT) space(AIWA_RC_T501_ONE_SPACE) ; + else space(AIWA_RC_T501_ZERO_SPACE) ; code <<= 1; } // POST-DATA, 1 bit, 0x0 From 7d926499b433422e59ed6a9246de60df03d103e7 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Wed, 17 Jun 2015 23:04:47 +0100 Subject: [PATCH 05/31] Cleaned up the DEBUG output --- IRremote.cpp | 73 ++++++++++++++++++---------------------------------- 1 file changed, 25 insertions(+), 48 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index e5d44e0..40255c0 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -24,6 +24,15 @@ // Provides ISR #include +//------------------------------------------------------------------------------ +// Debug directives +#ifdef DEBUG +# define DBG_PRINTLN(s) Serial.println(s); +#else +# define DBG_PRINTLN(s) +#endif + +//------------------------------------------------------------------------------ volatile irparams_t irparams; // These versions of MATCH, MATCH_MARK, and MATCH_SPACE are only for debugging. @@ -87,7 +96,6 @@ int MATCH_SPACE (int measured_ticks, int desired_us) { return MATCH(measured_ticks, (desired_us - MARK_EXCESS)); } -// Debugging versions are in IRremote.cpp #endif @@ -481,86 +489,62 @@ int IRrecv::decode (decode_results *results) results->rawlen = irparams.rawlen; if (irparams.rcvstate != STATE_STOP) return ERR ; #ifdef DECODE_NEC -#ifdef DEBUG - Serial.println("Attempting NEC decode"); -#endif + DBG_PRINTLN("Attempting NEC decode"); if (decodeNEC(results)) return DECODED ; #endif #ifdef DECODE_SONY -#ifdef DEBUG - Serial.println("Attempting Sony decode"); -#endif + DBG_PRINTLN("Attempting Sony decode"); if (decodeSony(results)) return DECODED ; #endif #ifdef DECODE_SANYO -#ifdef DEBUG - Serial.println("Attempting Sanyo decode"); -#endif + DBG_PRINTLN("Attempting Sanyo decode"); if (decodeSanyo(results)) return DECODED ; #endif #ifdef DECODE_MITSUBISHI -#ifdef DEBUG - Serial.println("Attempting Mitsubishi decode"); -#endif + DBG_PRINTLN("Attempting Mitsubishi decode"); if (decodeMitsubishi(results)) return DECODED ; #endif #ifdef DECODE_RC5 -#ifdef DEBUG - Serial.println("Attempting RC5 decode"); -#endif + DBG_PRINTLN("Attempting RC5 decode"); if (decodeRC5(results)) return DECODED ; #endif #ifdef DECODE_RC6 -#ifdef DEBUG - Serial.println("Attempting RC6 decode"); -#endif + DBG_PRINTLN("Attempting RC6 decode"); if (decodeRC6(results)) return DECODED ; #endif #ifdef DECODE_PANASONIC -#ifdef DEBUG - Serial.println("Attempting Panasonic decode"); -#endif - if (decodePanasonic(results)) return DECODED ; + DBG_PRINTLN("Attempting Panasonic decode"); + if (decodePanasonic(results)) return DECODED ; #endif #ifdef DECODE_LG -#ifdef DEBUG - Serial.println("Attempting LG decode"); -#endif - if (decodeLG(results)) return DECODED ; + DBG_PRINTLN("Attempting LG decode"); + if (decodeLG(results)) return DECODED ; #endif #ifdef DECODE_JVC -#ifdef DEBUG - Serial.println("Attempting JVC decode"); -#endif - if (decodeJVC(results)) return DECODED ; + DBG_PRINTLN("Attempting JVC decode"); + if (decodeJVC(results)) return DECODED ; #endif #ifdef DECODE_SAMSUNG -#ifdef DEBUG - Serial.println("Attempting SAMSUNG decode"); -#endif + DBG_PRINTLN("Attempting SAMSUNG decode"); if (decodeSAMSUNG(results)) return DECODED ; #endif #ifdef DECODE_WHYNTER -#ifdef DEBUG - Serial.println("Attempting Whynter decode"); -#endif + DBG_PRINTLN("Attempting Whynter decode"); if (decodeWhynter(results)) return DECODED ; #endif #ifdef AIWA_RC_T501 -#ifdef DEBUG - Serial.println("Attempting Aiwa RC-T501 decode"); -#endif + DBG_PRINTLN("Attempting Aiwa RC-T501 decode"); if (decodeAiwaRCT501(results)) return DECODED ; #endif @@ -848,14 +832,7 @@ int IRrecv::getRClevel (decode_results *results, int *offset, int *used, int *used = 0; (*offset)++; } -#ifdef DEBUG - if (val == MARK) { - Serial.println("MARK"); - } - else { - Serial.println("SPACE"); - } -#endif + DBG_PRINTLN( (val == MARK) ? "MARK" : "SPACE" ); return val; } From 6af9a1b4853b994e9012ef13bcd6b70052319202 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Wed, 17 Jun 2015 23:12:32 +0100 Subject: [PATCH 06/31] Whitespace cleanup on for() loops --- IRremote.cpp | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index 40255c0..3377ae8 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -106,7 +106,7 @@ void IRsend::sendNEC (unsigned long data, int nbits) enableIROut(38); mark(NEC_HDR_MARK); space(NEC_HDR_SPACE); - for (int i = 0; i < nbits; i++) { + for (int i = 0; i < nbits; i++) { if (data & TOPBIT) { mark(NEC_BIT_MARK); space(NEC_ONE_SPACE); @@ -131,7 +131,7 @@ void IRsend::sendWhynter (unsigned long data, int nbits) space(WHYNTER_ZERO_SPACE); mark(WHYNTER_HDR_MARK); space(WHYNTER_HDR_SPACE); - for (int i = 0; i < nbits; i++) { + for (int i = 0; i < nbits; i++) { if (data & TOPBIT) { mark(WHYNTER_ONE_MARK); space(WHYNTER_ONE_SPACE); @@ -155,7 +155,7 @@ void IRsend::sendSony (unsigned long data, int nbits) mark(SONY_HDR_MARK); space(SONY_HDR_SPACE); data = data << (32 - nbits); - for (int i = 0; i < nbits; i++) { + for (int i = 0; i < nbits; i++) { if (data & TOPBIT) { mark(SONY_ONE_MARK); space(SONY_HDR_SPACE); @@ -173,7 +173,7 @@ void IRsend::sendSony (unsigned long data, int nbits) void IRsend::sendRaw (unsigned int buf[], int len, int hz) { enableIROut(hz); - for (int i = 0; i < len; i++) { + for (int i = 0; i < len; i++) { if (i & 1) space(buf[i]) ; else mark (buf[i]) ; } @@ -191,7 +191,7 @@ void IRsend::sendRC5 (unsigned long data, int nbits) mark(RC5_T1); // First start bit space(RC5_T1); // Second start bit mark(RC5_T1); // Second start bit - for (int i = 0; i < nbits; i++) { + for (int i = 0; i < nbits; i++) { if (data & TOPBIT) { space(RC5_T1); // 1 is space, then mark mark(RC5_T1); @@ -219,7 +219,7 @@ void IRsend::sendRC6 (unsigned long data, int nbits) mark(RC6_T1); // start bit space(RC6_T1); int t; - for (int i = 0; i < nbits; i++) { + for (int i = 0; i < nbits; i++) { if (i == 3) t = RC6_T1 * 2 ; // double-wide trailer bit else t = RC6_T1 ; if (data & TOPBIT) { @@ -245,14 +245,14 @@ void IRsend::sendPanasonic (unsigned int address, unsigned long data) mark(PANASONIC_HDR_MARK); space(PANASONIC_HDR_SPACE); - for(int i=0;i<16;i++) + for (int i = 0; i < 16; i++) { mark(PANASONIC_BIT_MARK); if (address & 0x8000) space(PANASONIC_ONE_SPACE) ; else space(PANASONIC_ZERO_SPACE) ; address <<= 1; } - for (int i=0; i < 32; i++) { + for (int i = 0; i < 32; i++) { mark(PANASONIC_BIT_MARK); if (data & TOPBIT) space(PANASONIC_ONE_SPACE) ; else space(PANASONIC_ZERO_SPACE) ; @@ -273,7 +273,7 @@ void IRsend::sendJVC (unsigned long data, int nbits, int repeat) mark(JVC_HDR_MARK); space(JVC_HDR_SPACE); } - for (int i = 0; i < nbits; i++) { + for (int i = 0; i < nbits; i++) { if (data & TOPBIT) { mark(JVC_BIT_MARK); space(JVC_ONE_SPACE); @@ -296,7 +296,7 @@ void IRsend::sendSAMSUNG (unsigned long data, int nbits) enableIROut(38); mark(SAMSUNG_HDR_MARK); space(SAMSUNG_HDR_SPACE); - for (int i = 0; i < nbits; i++) { + for (int i = 0; i < nbits; i++) { if (data & TOPBIT) { mark(SAMSUNG_BIT_MARK); space(SAMSUNG_ONE_SPACE); @@ -580,7 +580,7 @@ long IRrecv::decodeNEC (decode_results *results) // Initial space if (!MATCH_SPACE(results->rawbuf[offset], NEC_HDR_SPACE)) return ERR ; offset++; - for (int i = 0; i < NEC_BITS; i++) { + for (int i = 0; i < NEC_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset], NEC_BIT_MARK)) return ERR ; offset++; if (MATCH_SPACE(results->rawbuf[offset], NEC_ONE_SPACE)) data = (data << 1) | 1 ; @@ -667,7 +667,7 @@ long IRrecv::decodeWhynter (decode_results *results) offset++; // data bits - for (int i = 0; i < WHYNTER_BITS; i++) { + for (int i = 0; i < WHYNTER_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return ERR ; offset++; if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE)) data = (data << 1) | 1 ; @@ -849,7 +849,7 @@ long IRrecv::decodeRC5 (decode_results *results) if (getRClevel(results, &offset, &used, RC5_T1) != SPACE) return ERR ; if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return ERR ; int nbits; - for (nbits = 0; offset < irparams.rawlen; nbits++) { + for (nbits = 0; offset < irparams.rawlen; nbits++) { int levelA = getRClevel(results, &offset, &used, RC5_T1); int levelB = getRClevel(results, &offset, &used, RC5_T1); if (levelA == SPACE && levelB == MARK) data = (data << 1) | 1 ; // 1 bit @@ -882,7 +882,7 @@ long IRrecv::decodeRC6 (decode_results *results) if (getRClevel(results, &offset, &used, RC6_T1) != MARK) return ERR ; if (getRClevel(results, &offset, &used, RC6_T1) != SPACE) return ERR ; int nbits; - for (nbits = 0; offset < results->rawlen; nbits++) { + for (nbits = 0; offset < results->rawlen; nbits++) { int levelA, levelB; // Next two levels levelA = getRClevel(results, &offset, &used, RC6_T1); if (nbits == 3) { @@ -919,7 +919,7 @@ long IRrecv::decodePanasonic (decode_results *results) offset++; // decode address - for (int i = 0; i < PANASONIC_BITS; i++) { + for (int i = 0; i < PANASONIC_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_BIT_MARK)) return ERR ; if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ONE_SPACE)) data = (data << 1) | 1 ; else if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ZERO_SPACE)) data <<= 1 ; @@ -948,7 +948,7 @@ long IRrecv::decodeLG (decode_results *results) // Initial space if (!MATCH_SPACE(results->rawbuf[offset], LG_HDR_SPACE)) return ERR ; offset++; - for (int i = 0; i < LG_BITS; i++) { + for (int i = 0; i < LG_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return ERR ; offset++; if (MATCH_SPACE(results->rawbuf[offset], LG_ONE_SPACE)) data = (data << 1) | 1 ; @@ -990,7 +990,7 @@ long IRrecv::decodeJVC (decode_results *results) // Initial space if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) return ERR ; offset++; - for (int i = 0; i < JVC_BITS; i++) { + for (int i = 0; i < JVC_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return ERR ; offset++; if (MATCH_SPACE(results->rawbuf[offset], JVC_ONE_SPACE)) data = (data << 1) | 1 ; @@ -1032,7 +1032,7 @@ long IRrecv::decodeSAMSUNG (decode_results *results) // Initial space if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) return ERR ; offset++; - for (int i = 0; i < SAMSUNG_BITS; i++) { + for (int i = 0; i < SAMSUNG_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_BIT_MARK)) return ERR ; offset++; if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ONE_SPACE)) data = (data << 1) | 1 ; @@ -1129,7 +1129,7 @@ long IRrecv::decodeHash (decode_results *results) // Require at least 6 samples to prevent triggering on noise if (results->rawlen < 6) return ERR ; long hash = FNV_BASIS_32; - for (int i = 1; i+2 < results->rawlen; i++) { + for (int i = 1; (i + 2) < results->rawlen; i++) { int value = compare(results->rawbuf[i], results->rawbuf[i+2]); // Add value into the hash hash = (hash * FNV_PRIME_32) ^ value; @@ -1170,8 +1170,8 @@ void IRsend::sendSharp (unsigned long data, int nbits) // Sending codes in bursts of 3 (normal, inverted, normal) makes transmission // much more reliable. That's the exact behaviour of CD-S6470 remote control. - for (int n = 0; n < 3; n++) { - for (int i = 1 << (nbits-1); i > 0; i>>=1) { + for (int n = 0; n < 3; n++) { + for (int i = 1 << (nbits - 1); i > 0; i >>= 1) { if (data & i) { mark(SHARP_BIT_MARK); space(SHARP_ONE_SPACE); @@ -1207,7 +1207,7 @@ void IRsend::sendDISH (unsigned long data, int nbits) enableIROut(56); mark(DISH_HDR_MARK); space(DISH_HDR_SPACE); - for (int i = 0; i < nbits; i++) { + for (int i = 0; i < nbits; i++) { if (data & DISH_TOP_BIT) { mark(DISH_BIT_MARK); space(DISH_ONE_SPACE); @@ -1242,7 +1242,7 @@ void IRsend::sendAiwaRCT501 (int code) // Skip leading zero's pre <<= 6; // Send pre-data - for(i=0; i < 26; i++) { + for (i = 0; i < 26; i++) { mark(AIWA_RC_T501_BIT_MARK); if (pre & TOPBIT) space(AIWA_RC_T501_ONE_SPACE) ; else space(AIWA_RC_T501_ZERO_SPACE) ; @@ -1252,7 +1252,7 @@ void IRsend::sendAiwaRCT501 (int code) // Skip firts code bit code <<= 1; // Send code - for(i=0; i < 15; i++) { + for (i = 0; i < 15; i++) { mark(AIWA_RC_T501_BIT_MARK); if (code & TOPBIT) space(AIWA_RC_T501_ONE_SPACE) ; else space(AIWA_RC_T501_ZERO_SPACE) ; From 001ccf94257c9e3d15d981c561d8b99ac492f79b Mon Sep 17 00:00:00 2001 From: Bluechip Date: Thu, 18 Jun 2015 19:24:21 +0100 Subject: [PATCH 07/31] Optimise send() loops Query accuracy of sendAiwaRCT501() [see inline comment] --- IRremote.cpp | 65 ++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 40 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index 3377ae8..7102d8b 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -106,8 +106,8 @@ void IRsend::sendNEC (unsigned long data, int nbits) enableIROut(38); mark(NEC_HDR_MARK); space(NEC_HDR_SPACE); - for (int i = 0; i < nbits; i++) { - if (data & TOPBIT) { + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { mark(NEC_BIT_MARK); space(NEC_ONE_SPACE); } @@ -115,7 +115,6 @@ void IRsend::sendNEC (unsigned long data, int nbits) mark(NEC_BIT_MARK); space(NEC_ZERO_SPACE); } - data <<= 1; } mark(NEC_BIT_MARK); space(0); @@ -131,8 +130,8 @@ void IRsend::sendWhynter (unsigned long data, int nbits) space(WHYNTER_ZERO_SPACE); mark(WHYNTER_HDR_MARK); space(WHYNTER_HDR_SPACE); - for (int i = 0; i < nbits; i++) { - if (data & TOPBIT) { + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { mark(WHYNTER_ONE_MARK); space(WHYNTER_ONE_SPACE); } @@ -140,7 +139,6 @@ void IRsend::sendWhynter (unsigned long data, int nbits) mark(WHYNTER_ZERO_MARK); space(WHYNTER_ZERO_SPACE); } - data <<= 1; } mark(WHYNTER_ZERO_MARK); space(WHYNTER_ZERO_SPACE); @@ -154,9 +152,8 @@ void IRsend::sendSony (unsigned long data, int nbits) enableIROut(40); mark(SONY_HDR_MARK); space(SONY_HDR_SPACE); - data = data << (32 - nbits); - for (int i = 0; i < nbits; i++) { - if (data & TOPBIT) { + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { mark(SONY_ONE_MARK); space(SONY_HDR_SPACE); } @@ -164,7 +161,6 @@ void IRsend::sendSony (unsigned long data, int nbits) mark(SONY_ZERO_MARK); space(SONY_HDR_SPACE); } - data <<= 1; } } #endif @@ -187,12 +183,11 @@ void IRsend::sendRaw (unsigned int buf[], int len, int hz) void IRsend::sendRC5 (unsigned long data, int nbits) { enableIROut(36); - data = data << (32 - nbits); mark(RC5_T1); // First start bit space(RC5_T1); // Second start bit mark(RC5_T1); // Second start bit - for (int i = 0; i < nbits; i++) { - if (data & TOPBIT) { + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { space(RC5_T1); // 1 is space, then mark mark(RC5_T1); } @@ -200,7 +195,6 @@ void IRsend::sendRC5 (unsigned long data, int nbits) mark(RC5_T1); space(RC5_T1); } - data <<= 1; } space(0); // Turn off at end } @@ -213,16 +207,15 @@ void IRsend::sendRC5 (unsigned long data, int nbits) void IRsend::sendRC6 (unsigned long data, int nbits) { enableIROut(36); - data = data << (32 - nbits); mark(RC6_HDR_MARK); space(RC6_HDR_SPACE); mark(RC6_T1); // start bit space(RC6_T1); - int t; - for (int i = 0; i < nbits; i++) { + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + int t; if (i == 3) t = RC6_T1 * 2 ; // double-wide trailer bit else t = RC6_T1 ; - if (data & TOPBIT) { + if (data & mask) { mark(t); space(t); } @@ -230,8 +223,6 @@ void IRsend::sendRC6 (unsigned long data, int nbits) space(t); mark(t); } - - data <<= 1; } space(0); // Turn off at end } @@ -245,18 +236,16 @@ void IRsend::sendPanasonic (unsigned int address, unsigned long data) mark(PANASONIC_HDR_MARK); space(PANASONIC_HDR_SPACE); - for (int i = 0; i < 16; i++) + for (unsigned long mask = 1 << (16 - 1); mask; mask >>= 1) { { mark(PANASONIC_BIT_MARK); - if (address & 0x8000) space(PANASONIC_ONE_SPACE) ; - else space(PANASONIC_ZERO_SPACE) ; - address <<= 1; + if (address & mask) space(PANASONIC_ONE_SPACE) ; + else space(PANASONIC_ZERO_SPACE) ; } - for (int i = 0; i < 32; i++) { + for (unsigned long mask = 1 << (32 - 1); mask; mask >>= 1) { mark(PANASONIC_BIT_MARK); - if (data & TOPBIT) space(PANASONIC_ONE_SPACE) ; - else space(PANASONIC_ZERO_SPACE) ; - data <<= 1; + if (data & mask) space(PANASONIC_ONE_SPACE) ; + else space(PANASONIC_ZERO_SPACE) ; } mark(PANASONIC_BIT_MARK); space(0); @@ -268,13 +257,12 @@ void IRsend::sendPanasonic (unsigned int address, unsigned long data) void IRsend::sendJVC (unsigned long data, int nbits, int repeat) { enableIROut(38); - data = data << (32 - nbits); if (!repeat){ mark(JVC_HDR_MARK); space(JVC_HDR_SPACE); } - for (int i = 0; i < nbits; i++) { - if (data & TOPBIT) { + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { mark(JVC_BIT_MARK); space(JVC_ONE_SPACE); } @@ -282,7 +270,6 @@ void IRsend::sendJVC (unsigned long data, int nbits, int repeat) mark(JVC_BIT_MARK); space(JVC_ZERO_SPACE); } - data <<= 1; } mark(JVC_BIT_MARK); space(0); @@ -296,8 +283,8 @@ void IRsend::sendSAMSUNG (unsigned long data, int nbits) enableIROut(38); mark(SAMSUNG_HDR_MARK); space(SAMSUNG_HDR_SPACE); - for (int i = 0; i < nbits; i++) { - if (data & TOPBIT) { + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { mark(SAMSUNG_BIT_MARK); space(SAMSUNG_ONE_SPACE); } @@ -305,7 +292,6 @@ void IRsend::sendSAMSUNG (unsigned long data, int nbits) mark(SAMSUNG_BIT_MARK); space(SAMSUNG_ZERO_SPACE); } - data <<= 1; } mark(SAMSUNG_BIT_MARK); space(0); @@ -1171,8 +1157,8 @@ void IRsend::sendSharp (unsigned long data, int nbits) // Sending codes in bursts of 3 (normal, inverted, normal) makes transmission // much more reliable. That's the exact behaviour of CD-S6470 remote control. for (int n = 0; n < 3; n++) { - for (int i = 1 << (nbits - 1); i > 0; i >>= 1) { - if (data & i) { + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { mark(SHARP_BIT_MARK); space(SHARP_ONE_SPACE); } @@ -1207,8 +1193,8 @@ void IRsend::sendDISH (unsigned long data, int nbits) enableIROut(56); mark(DISH_HDR_MARK); space(DISH_HDR_SPACE); - for (int i = 0; i < nbits; i++) { - if (data & DISH_TOP_BIT) { + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mark) { mark(DISH_BIT_MARK); space(DISH_ONE_SPACE); } @@ -1216,7 +1202,6 @@ void IRsend::sendDISH (unsigned long data, int nbits) mark(DISH_BIT_MARK); space(DISH_ZERO_SPACE); } - data <<= 1; } } #endif From a338d5525a1e44e33fa552dfd2705e9f635a4e24 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Thu, 18 Jun 2015 19:52:22 +0100 Subject: [PATCH 08/31] Bit more cleanup Guests have arrived - sanity checkin --- IRremote.cpp | 290 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 183 insertions(+), 107 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index 7102d8b..b32c636 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -103,19 +103,22 @@ int MATCH_SPACE (int measured_ticks, int desired_us) #ifdef SEND_NEC void IRsend::sendNEC (unsigned long data, int nbits) { + // Set IR carrier frequency enableIROut(38); + mark(NEC_HDR_MARK); space(NEC_HDR_SPACE); + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { if (data & mask) { mark(NEC_BIT_MARK); space(NEC_ONE_SPACE); - } - else { + } else { mark(NEC_BIT_MARK); space(NEC_ZERO_SPACE); } } + mark(NEC_BIT_MARK); space(0); } @@ -125,21 +128,24 @@ void IRsend::sendNEC (unsigned long data, int nbits) #ifdef SEND_WHYNTER void IRsend::sendWhynter (unsigned long data, int nbits) { + // Set IR carrier frequency enableIROut(38); + mark(WHYNTER_ZERO_MARK); space(WHYNTER_ZERO_SPACE); mark(WHYNTER_HDR_MARK); space(WHYNTER_HDR_SPACE); + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { if (data & mask) { mark(WHYNTER_ONE_MARK); space(WHYNTER_ONE_SPACE); - } - else { + } else { mark(WHYNTER_ZERO_MARK); space(WHYNTER_ZERO_SPACE); } } + mark(WHYNTER_ZERO_MARK); space(WHYNTER_ZERO_SPACE); } @@ -149,15 +155,17 @@ void IRsend::sendWhynter (unsigned long data, int nbits) #ifdef SEND_SONY void IRsend::sendSony (unsigned long data, int nbits) { + // Set IR carrier frequency enableIROut(40); + mark(SONY_HDR_MARK); space(SONY_HDR_SPACE); + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { if (data & mask) { mark(SONY_ONE_MARK); space(SONY_HDR_SPACE); - } - else { + } else { mark(SONY_ZERO_MARK); space(SONY_HDR_SPACE); } @@ -168,11 +176,14 @@ void IRsend::sendSony (unsigned long data, int nbits) //+============================================================================= void IRsend::sendRaw (unsigned int buf[], int len, int hz) { + // Set IR carrier frequency enableIROut(hz); + for (int i = 0; i < len; i++) { if (i & 1) space(buf[i]) ; else mark (buf[i]) ; } + space(0); // Just to be sure } @@ -182,20 +193,23 @@ void IRsend::sendRaw (unsigned int buf[], int len, int hz) #ifdef SEND_RC5 void IRsend::sendRC5 (unsigned long data, int nbits) { + // Set IR carrier frequency enableIROut(36); + mark(RC5_T1); // First start bit space(RC5_T1); // Second start bit mark(RC5_T1); // Second start bit + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { if (data & mask) { space(RC5_T1); // 1 is space, then mark mark(RC5_T1); - } - else { + } else { mark(RC5_T1); space(RC5_T1); } } + space(0); // Turn off at end } #endif @@ -206,24 +220,25 @@ void IRsend::sendRC5 (unsigned long data, int nbits) #ifdef SEND_RC6 void IRsend::sendRC6 (unsigned long data, int nbits) { + // Set IR carrier frequency enableIROut(36); + mark(RC6_HDR_MARK); space(RC6_HDR_SPACE); mark(RC6_T1); // start bit space(RC6_T1); + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - int t; - if (i == 3) t = RC6_T1 * 2 ; // double-wide trailer bit - else t = RC6_T1 ; + int t = (i == 3) ? (RC6_T1 * 2) : (RC6_T1) ; if (data & mask) { mark(t); space(t); - } - else { + } else { space(t); mark(t); } } + space(0); // Turn off at end } #endif @@ -232,7 +247,9 @@ void IRsend::sendRC6 (unsigned long data, int nbits) #ifdef SEND_PANASONIC void IRsend::sendPanasonic (unsigned int address, unsigned long data) { + // Set IR carrier frequency enableIROut(35); + mark(PANASONIC_HDR_MARK); space(PANASONIC_HDR_SPACE); @@ -242,11 +259,13 @@ void IRsend::sendPanasonic (unsigned int address, unsigned long data) if (address & mask) space(PANASONIC_ONE_SPACE) ; else space(PANASONIC_ZERO_SPACE) ; } + for (unsigned long mask = 1 << (32 - 1); mask; mask >>= 1) { mark(PANASONIC_BIT_MARK); if (data & mask) space(PANASONIC_ONE_SPACE) ; else space(PANASONIC_ZERO_SPACE) ; } + mark(PANASONIC_BIT_MARK); space(0); } @@ -256,11 +275,14 @@ void IRsend::sendPanasonic (unsigned int address, unsigned long data) #ifdef SEND_JVC void IRsend::sendJVC (unsigned long data, int nbits, int repeat) { + // Set IR carrier frequency enableIROut(38); + if (!repeat){ mark(JVC_HDR_MARK); space(JVC_HDR_SPACE); } + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { if (data & mask) { mark(JVC_BIT_MARK); @@ -271,6 +293,7 @@ void IRsend::sendJVC (unsigned long data, int nbits, int repeat) space(JVC_ZERO_SPACE); } } + mark(JVC_BIT_MARK); space(0); } @@ -280,19 +303,22 @@ void IRsend::sendJVC (unsigned long data, int nbits, int repeat) #ifdef SEND_SAMSUNG void IRsend::sendSAMSUNG (unsigned long data, int nbits) { + // Set IR carrier frequency enableIROut(38); + mark(SAMSUNG_HDR_MARK); space(SAMSUNG_HDR_SPACE); + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(SAMSUNG_BIT_MARK); - space(SAMSUNG_ONE_SPACE); - } - else { - mark(SAMSUNG_BIT_MARK); - space(SAMSUNG_ZERO_SPACE); - } + if (data & mask) { + mark(SAMSUNG_BIT_MARK); + space(SAMSUNG_ONE_SPACE); + } else { + mark(SAMSUNG_BIT_MARK); + space(SAMSUNG_ZERO_SPACE); + } } + mark(SAMSUNG_BIT_MARK); space(0); } @@ -407,48 +433,52 @@ ISR (TIMER_INTR_NAME) irparams.timer++; // One more 50us tick if (irparams.rawlen >= RAWBUF) irparams.rcvstate = STATE_STOP ; // Buffer overflow + switch(irparams.rcvstate) { - case STATE_IDLE: // In the middle of a gap - if (irdata == MARK) { - if (irparams.timer < GAP_TICKS) { - // Not big enough to be a gap. - irparams.timer = 0; + case STATE_IDLE: // In the middle of a gap + if (irdata == MARK) { + if (irparams.timer < GAP_TICKS) { + // Not big enough to be a gap. + irparams.timer = 0; + } + else { + // gap just ended, record duration and start recording transmission + irparams.rawlen = 0; + irparams.rawbuf[irparams.rawlen++] = irparams.timer; + irparams.timer = 0; + irparams.rcvstate = STATE_MARK; + } } - else { - // gap just ended, record duration and start recording transmission - irparams.rawlen = 0; + break; + + case STATE_MARK: // timing MARK + if (irdata == SPACE) { // MARK ended, record time + irparams.rawbuf[irparams.rawlen++] = irparams.timer; + irparams.timer = 0; + irparams.rcvstate = STATE_SPACE; + } + break; + + case STATE_SPACE: // timing SPACE + if (irdata == MARK) { // SPACE just ended, record it irparams.rawbuf[irparams.rawlen++] = irparams.timer; irparams.timer = 0; irparams.rcvstate = STATE_MARK; } - } - break; - case STATE_MARK: // timing MARK - if (irdata == SPACE) { // MARK ended, record time - irparams.rawbuf[irparams.rawlen++] = irparams.timer; - irparams.timer = 0; - irparams.rcvstate = STATE_SPACE; - } - break; - case STATE_SPACE: // timing SPACE - if (irdata == MARK) { // SPACE just ended, record it - irparams.rawbuf[irparams.rawlen++] = irparams.timer; - irparams.timer = 0; - irparams.rcvstate = STATE_MARK; - } - else { // SPACE - if (irparams.timer > GAP_TICKS) { - // big SPACE, indicates gap between codes - // Mark current code as ready for processing - // Switch to STOP - // Don't reset timer; keep counting space width - irparams.rcvstate = STATE_STOP; + else { // SPACE + if (irparams.timer > GAP_TICKS) { + // big SPACE, indicates gap between codes + // Mark current code as ready for processing + // Switch to STOP + // Don't reset timer; keep counting space width + irparams.rcvstate = STATE_STOP; + } } - } - break; - case STATE_STOP: // waiting, measuring gap - if (irdata == MARK) irparams.timer = 0 ; // reset gap timer - break; + break; + + case STATE_STOP: // waiting, measuring gap + if (irdata == MARK) irparams.timer = 0 ; // reset gap timer + break; } if (irparams.blinkflag) { @@ -473,7 +503,9 @@ int IRrecv::decode (decode_results *results) { results->rawbuf = irparams.rawbuf; results->rawlen = irparams.rawlen; + if (irparams.rcvstate != STATE_STOP) return ERR ; + #ifdef DECODE_NEC DBG_PRINTLN("Attempting NEC decode"); if (decodeNEC(results)) return DECODED ; @@ -550,9 +582,11 @@ long IRrecv::decodeNEC (decode_results *results) { long data = 0; int offset = 1; // Skip first space + // Initial mark if (!MATCH_MARK(results->rawbuf[offset], NEC_HDR_MARK)) return ERR ; offset++; + // Check for repeat if (irparams.rawlen == 4 && MATCH_SPACE(results->rawbuf[offset], NEC_RPT_SPACE) && @@ -563,9 +597,11 @@ long IRrecv::decodeNEC (decode_results *results) return DECODED; } if (irparams.rawlen < 2 * NEC_BITS + 4) return ERR ; + // Initial space if (!MATCH_SPACE(results->rawbuf[offset], NEC_HDR_SPACE)) return ERR ; offset++; + for (int i = 0; i < NEC_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset], NEC_BIT_MARK)) return ERR ; offset++; @@ -574,10 +610,12 @@ long IRrecv::decodeNEC (decode_results *results) else return ERR ; offset++; } + // Success - results->bits = NEC_BITS; - results->value = data; + results->bits = NEC_BITS; + results->value = data; results->decode_type = NEC; + return DECODED; } #endif @@ -596,11 +634,13 @@ long IRrecv::decodeSony (decode_results *results) // Serial.print("IR Gap found: "); results->bits = 0; results->value = REPEAT; -#ifdef DECODE_SANYO - results->decode_type = SANYO; -#else - results->decode_type = UNKNOWN; -#endif + +# ifdef DECODE_SANYO + results->decode_type = SANYO; +# else + results->decode_type = UNKNOWN; +# endif + return DECODED; } offset++; @@ -624,7 +664,7 @@ long IRrecv::decodeSony (decode_results *results) results->bits = 0; return ERR; } - results->value = data; + results->value = data; results->decode_type = SONY; return DECODED; } @@ -656,6 +696,7 @@ long IRrecv::decodeWhynter (decode_results *results) for (int i = 0; i < WHYNTER_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return ERR ; offset++; + if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE)) data = (data << 1) | 1 ; else if (MATCH_SPACE(results->rawbuf[offset],WHYNTER_ZERO_SPACE)) data <<= 1 ; else return ERR ; @@ -664,6 +705,7 @@ long IRrecv::decodeWhynter (decode_results *results) // trailing mark if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return ERR ; + // Success results->bits = WHYNTER_BITS; results->value = data; @@ -724,7 +766,8 @@ long IRrecv::decodeSanyo (decode_results *results) results->bits = 0; return ERR; } - results->value = data; + + results->value = data; results->decode_type = SANYO; return DECODED; } @@ -761,7 +804,6 @@ long IRrecv::decodeMitsubishi (decode_results *results) } #endif - offset++; // Typical @@ -770,11 +812,13 @@ long IRrecv::decodeMitsubishi (decode_results *results) // Initial Space if (!MATCH_MARK(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) return ERR ; offset++; + while (offset + 1 < irparams.rawlen) { if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ONE_MARK)) data = (data << 1) | 1 ; else if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ZERO_MARK)) data <<= 1 ; else return ERR ; offset++; + if (!MATCH_SPACE(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) break ; offset++; } @@ -785,7 +829,8 @@ long IRrecv::decodeMitsubishi (decode_results *results) results->bits = 0; return ERR; } - results->value = data; + + results->value = data; results->decode_type = MITSUBISHI; return DECODED; } @@ -818,6 +863,7 @@ int IRrecv::getRClevel (decode_results *results, int *offset, int *used, int *used = 0; (*offset)++; } + DBG_PRINTLN( (val == MARK) ? "MARK" : "SPACE" ); return val; } @@ -838,14 +884,15 @@ long IRrecv::decodeRC5 (decode_results *results) for (nbits = 0; offset < irparams.rawlen; nbits++) { int levelA = getRClevel(results, &offset, &used, RC5_T1); int levelB = getRClevel(results, &offset, &used, RC5_T1); + if (levelA == SPACE && levelB == MARK) data = (data << 1) | 1 ; // 1 bit else if (levelA == MARK && levelB == SPACE) data <<= 1 ; // zero bit else return ERR ; } // Success - results->bits = nbits; - results->value = data; + results->bits = nbits; + results->value = data; results->decode_type = RC5; return DECODED; } @@ -857,13 +904,17 @@ long IRrecv::decodeRC6 (decode_results *results) { if (results->rawlen < MIN_RC6_SAMPLES) return ERR ; int offset = 1; // Skip first space + // Initial mark if (!MATCH_MARK(results->rawbuf[offset], RC6_HDR_MARK)) return ERR ; offset++; + if (!MATCH_SPACE(results->rawbuf[offset], RC6_HDR_SPACE)) return ERR ; offset++; - long data = 0; - int used = 0; + + long data = 0; + int used = 0; + // Get start bit (1) if (getRClevel(results, &offset, &used, RC6_T1) != MARK) return ERR ; if (getRClevel(results, &offset, &used, RC6_T1) != SPACE) return ERR ; @@ -884,6 +935,7 @@ long IRrecv::decodeRC6 (decode_results *results) else if (levelA == SPACE && levelB == MARK) data <<= 1 ; // zero bit else return ERR ; // Error } + // Success results->bits = nbits; results->value = data; @@ -907,15 +959,18 @@ long IRrecv::decodePanasonic (decode_results *results) // decode address for (int i = 0; i < PANASONIC_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_BIT_MARK)) return ERR ; + if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ONE_SPACE)) data = (data << 1) | 1 ; else if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ZERO_SPACE)) data <<= 1 ; else return ERR ; offset++; } - results->value = (unsigned long)data; + + results->value = (unsigned long)data; results->panasonicAddress = (unsigned int)(data >> 32); - results->decode_type = PANASONIC; - results->bits = PANASONIC_BITS; + results->decode_type = PANASONIC; + results->bits = PANASONIC_BITS; + return DECODED; } #endif @@ -924,8 +979,8 @@ long IRrecv::decodePanasonic (decode_results *results) #ifdef DECODE_LG long IRrecv::decodeLG (decode_results *results) { - long data = 0; - int offset = 1; // Skip first space + long data = 0; + int offset = 1; // Skip first space // Initial mark if (!MATCH_MARK(results->rawbuf[offset], LG_HDR_MARK)) return ERR ; @@ -942,24 +997,25 @@ long IRrecv::decodeLG (decode_results *results) else return ERR ; offset++; } - //Stop bit + + // Stop bit if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return ERR ; + // Success results->bits = LG_BITS; results->value = data; results->decode_type = LG; return DECODED; } - - #endif //+============================================================================= #ifdef DECODE_JVC long IRrecv::decodeJVC (decode_results *results) { - long data = 0; - int offset = 1; // Skip first space + long data = 0; + int offset = 1; // Skip first space + // Check for repeat if (irparams.rawlen - 1 == 33 && MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK) && @@ -969,13 +1025,17 @@ long IRrecv::decodeJVC (decode_results *results) results->decode_type = JVC; return DECODED; } + // Initial mark if (!MATCH_MARK(results->rawbuf[offset], JVC_HDR_MARK)) return ERR ; offset++; + if (irparams.rawlen < 2 * JVC_BITS + 1 ) return ERR ; + // Initial space if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) return ERR ; offset++; + for (int i = 0; i < JVC_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return ERR ; offset++; @@ -984,12 +1044,15 @@ long IRrecv::decodeJVC (decode_results *results) else return ERR ; offset++; } - //Stop bit + + // Stop bit if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return ERR ; + // Success - results->bits = JVC_BITS; - results->value = data; + results->bits = JVC_BITS; + results->value = data; results->decode_type = JVC; + return DECODED; } #endif @@ -1000,11 +1063,13 @@ long IRrecv::decodeJVC (decode_results *results) #ifdef DECODE_SAMSUNG long IRrecv::decodeSAMSUNG (decode_results *results) { - long data = 0; - int offset = 1; // Skip first space + long data = 0; + int offset = 1; // Skip first space + // Initial mark if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_HDR_MARK)) return ERR ; offset++; + // Check for repeat if (irparams.rawlen == 4 && MATCH_SPACE(results->rawbuf[offset], SAMSUNG_RPT_SPACE) && @@ -1015,20 +1080,25 @@ long IRrecv::decodeSAMSUNG (decode_results *results) return DECODED; } if (irparams.rawlen < 2 * SAMSUNG_BITS + 4) return ERR ; + // Initial space if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) return ERR ; offset++; + for (int i = 0; i < SAMSUNG_BITS; i++) { if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_BIT_MARK)) return ERR ; + offset++; + if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ONE_SPACE)) data = (data << 1) | 1 ; else if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ZERO_SPACE)) data <<= 1 ; else return ERR ; offset++; } + // Success - results->bits = SAMSUNG_BITS; - results->value = data; + results->bits = SAMSUNG_BITS; + results->value = data; results->decode_type = SAMSUNG; return DECODED; } @@ -1042,8 +1112,8 @@ long IRrecv::decodeSAMSUNG (decode_results *results) #ifdef DECODE_AIWA_RC_T501 long IRrecv::decodeAiwaRCT501 (decode_results *results) { - int data = 0; - int offset = 1; // skip first garbage read + int data = 0; + int offset = 1; // skip first garbage read // Check SIZE if (irparams.rawlen < 2 * (AIWA_RC_T501_SUM_BITS) + 4) return ERR ; @@ -1070,11 +1140,10 @@ long IRrecv::decodeAiwaRCT501 (decode_results *results) results->bits = (offset - 1) / 2; if (results->bits < 42) return ERR ; - results->value = data; + results->value = data; results->decode_type = AIWA_RC_T501; return DECODED; } - #endif //+============================================================================= @@ -1120,9 +1189,11 @@ long IRrecv::decodeHash (decode_results *results) // Add value into the hash hash = (hash * FNV_PRIME_32) ^ value; } - results->value = hash; - results->bits = 32; + + results->value = hash; + results->bits = 32; results->decode_type = UNKNOWN; + return DECODED; } @@ -1151,7 +1222,7 @@ long IRrecv::decodeHash (decode_results *results) #ifdef SEND_SHARP void IRsend::sendSharp (unsigned long data, int nbits) { - unsigned long invertdata = data ^ SHARP_TOGGLE_MASK; + unsigned long invertdata = data ^ SHARP_TOGGLE_MASK; enableIROut(38); // Sending codes in bursts of 3 (normal, inverted, normal) makes transmission @@ -1161,8 +1232,7 @@ void IRsend::sendSharp (unsigned long data, int nbits) if (data & mask) { mark(SHARP_BIT_MARK); space(SHARP_ONE_SPACE); - } - else { + } else { mark(SHARP_BIT_MARK); space(SHARP_ZERO_SPACE); } @@ -1190,15 +1260,17 @@ void IRsend::sendSharp (unsigned int address, unsigned int command) #ifdef SEND_DISH void IRsend::sendDISH (unsigned long data, int nbits) { + // Set IR carrier frequency enableIROut(56); + mark(DISH_HDR_MARK); space(DISH_HDR_SPACE); + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { if (data & mark) { mark(DISH_BIT_MARK); space(DISH_ONE_SPACE); - } - else { + } else { mark(DISH_BIT_MARK); space(DISH_ZERO_SPACE); } @@ -1215,25 +1287,27 @@ void IRsend::sendDISH (unsigned long data, int nbits) void IRsend::sendAiwaRCT501 (int code) { // PRE-DATA, 26 bits, 0x227EEC0 - long int pre = 0x227EEC0; - int i; + unsigned long pre = 0x227EEC0; + int mask; + // Set IR carrier frequency enableIROut(AIWA_RC_T501_HZ); // HDR mark + HDR space mark(AIWA_RC_T501_HDR_MARK); space(AIWA_RC_T501_HDR_SPACE); - // Skip leading zero's - pre <<= 6; // Send pre-data - for (i = 0; i < 26; i++) { + for (unsigned long mask = 1 << (26 - 1); mask; mask >>= 1) { mark(AIWA_RC_T501_BIT_MARK); - if (pre & TOPBIT) space(AIWA_RC_T501_ONE_SPACE) ; - else space(AIWA_RC_T501_ZERO_SPACE) ; - pre <<= 1; + if (pre & mask) space(AIWA_RC_T501_ONE_SPACE) ; + else space(AIWA_RC_T501_ZERO_SPACE) ; } +//-v- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! +// it only send 15bits and ignores the top bit +// then uses TOPBIT which is bit-31 to check the bit code +// I suspect TOPBIT should be changed to 0x00008000 // Skip firts code bit code <<= 1; // Send code @@ -1243,6 +1317,8 @@ void IRsend::sendAiwaRCT501 (int code) else space(AIWA_RC_T501_ZERO_SPACE) ; code <<= 1; } +//-^- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! + // POST-DATA, 1 bit, 0x0 mark(AIWA_RC_T501_BIT_MARK); space(AIWA_RC_T501_ZERO_SPACE); From 5f92834a12488bd92c2189da212e531556883a59 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Fri, 19 Jun 2015 00:12:29 +0100 Subject: [PATCH 09/31] Finish sendXXX() cleanup Move NEC decode to be with NEC send --- IRremote.cpp | 655 +++++++++++++++++++++++++++++---------------------- 1 file changed, 372 insertions(+), 283 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index b32c636..df9b069 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -100,80 +100,12 @@ int MATCH_SPACE (int measured_ticks, int desired_us) #endif //+============================================================================= -#ifdef SEND_NEC -void IRsend::sendNEC (unsigned long data, int nbits) -{ - // Set IR carrier frequency - enableIROut(38); - - mark(NEC_HDR_MARK); - space(NEC_HDR_SPACE); - - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(NEC_BIT_MARK); - space(NEC_ONE_SPACE); - } else { - mark(NEC_BIT_MARK); - space(NEC_ZERO_SPACE); - } - } - - mark(NEC_BIT_MARK); - space(0); -} -#endif - -//+============================================================================= -#ifdef SEND_WHYNTER -void IRsend::sendWhynter (unsigned long data, int nbits) -{ - // Set IR carrier frequency - enableIROut(38); - - mark(WHYNTER_ZERO_MARK); - space(WHYNTER_ZERO_SPACE); - mark(WHYNTER_HDR_MARK); - space(WHYNTER_HDR_SPACE); - - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(WHYNTER_ONE_MARK); - space(WHYNTER_ONE_SPACE); - } else { - mark(WHYNTER_ZERO_MARK); - space(WHYNTER_ZERO_SPACE); - } - } - - mark(WHYNTER_ZERO_MARK); - space(WHYNTER_ZERO_SPACE); -} -#endif - -//+============================================================================= -#ifdef SEND_SONY -void IRsend::sendSony (unsigned long data, int nbits) -{ - // Set IR carrier frequency - enableIROut(40); - - mark(SONY_HDR_MARK); - space(SONY_HDR_SPACE); - - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(SONY_ONE_MARK); - space(SONY_HDR_SPACE); - } else { - mark(SONY_ZERO_MARK); - space(SONY_HDR_SPACE); - } - } -} -#endif - -//+============================================================================= +// RRRR AAA W W +// R R A A W W +// RRRR AAAAA W W W +// R R A A W W W +// R R A A WWW +// void IRsend::sendRaw (unsigned int buf[], int len, int hz) { // Set IR carrier frequency @@ -188,139 +120,341 @@ void IRsend::sendRaw (unsigned int buf[], int len, int hz) } //+============================================================================= +// N N EEEEE CCCC +// NN N E C +// N N N EEE C +// N NN E C +// N N EEEEE CCCC +// +#ifdef SEND_NEC +void IRsend::sendNEC (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(38); + + // Header + mark(NEC_HDR_MARK); + space(NEC_HDR_SPACE); + + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(NEC_BIT_MARK); + space(NEC_ONE_SPACE); + } else { + mark(NEC_BIT_MARK); + space(NEC_ZERO_SPACE); + } + } + + // Footer + mark(NEC_BIT_MARK); + space(0); // Alwasy end with the LED off +} +#endif + +//+============================================================================= +// NECs have a repeat only 4 items long +// +#ifdef DECODE_NEC +long IRrecv::decodeNEC (decode_results *results) +{ + long data = 0; // We decode in to here; Start with nothing + int offset = 1; // Index in to results; Skip first entry!? + + // Check header "mark" + if (!MATCH_MARK(results->rawbuf[offset], NEC_HDR_MARK)) return false ; + offset++; + + // Check for repeat + if ( (irparams.rawlen == 4) + && MATCH_SPACE(results->rawbuf[offset ], NEC_RPT_SPACE) + && MATCH_MARK (results->rawbuf[offset+1], NEC_BIT_MARK ) + ) { + results->bits = 0; + results->value = REPEAT; + results->decode_type = NEC; + return true; + } + + // Check we have enough data + if (irparams.rawlen < (2 * NEC_BITS) + 4) return false ; + + // Check header "space" + if (!MATCH_SPACE(results->rawbuf[offset], NEC_HDR_SPACE)) return false ; + offset++; + + // Build the data + for (int i = 0; i < NEC_BITS; i++) { + // Check data "mark" + if (!MATCH_MARK(results->rawbuf[offset], NEC_BIT_MARK)) return false ; + offset++; + // Suppend this bit + if (MATCH_SPACE(results->rawbuf[offset], NEC_ONE_SPACE )) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], NEC_ZERO_SPACE)) data = (data << 1) | 0 ; + else return false ; + offset++; + } + + // Success + results->bits = NEC_BITS; + results->value = data; + results->decode_type = NEC; + + return true; +} +#endif + +//+============================================================================= +// W W H H Y Y N N TTTTT EEEEE RRRRR +// W W H H Y Y NN N T E R R +// W W W HHHHH Y N N N T EEE RRRR +// W W W H H Y N NN T E R R +// WWW H H Y N N T EEEEE R R +// +#ifdef SEND_WHYNTER +void IRsend::sendWhynter (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(38); + + // Start + mark(WHYNTER_ZERO_MARK); + space(WHYNTER_ZERO_SPACE); + + // Header + mark(WHYNTER_HDR_MARK); + space(WHYNTER_HDR_SPACE); + + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(WHYNTER_ONE_MARK); + space(WHYNTER_ONE_SPACE); + } else { + mark(WHYNTER_ZERO_MARK); + space(WHYNTER_ZERO_SPACE); + } + } + + // Footer + mark(WHYNTER_ZERO_MARK); + space(WHYNTER_ZERO_SPACE); // Always end with the LED off +} +#endif + +//+============================================================================= +// SSSS OOO N N Y Y +// S O O NN N Y Y +// SSS O O N N N Y +// S O O N NN Y +// SSSS OOO N N Y +// +#ifdef SEND_SONY +void IRsend::sendSony (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(40); + + // Header + mark(SONY_HDR_MARK); + space(SONY_HDR_SPACE); + + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(SONY_ONE_MARK); + space(SONY_HDR_SPACE); + } else { + mark(SONY_ZERO_MARK); + space(SONY_HDR_SPACE); + } + } + + // We will have ended with LED off +} +#endif + +//+============================================================================= +// RRRR CCCC 55555 +// R R C 5 +// R R C 5555 +// RRRR C 5 +// R R C 5 5 +// R R CCCC 555 +// // Note: first bit must be a one (start bit) // #ifdef SEND_RC5 void IRsend::sendRC5 (unsigned long data, int nbits) { - // Set IR carrier frequency - enableIROut(36); + // Set IR carrier frequency + enableIROut(36); - mark(RC5_T1); // First start bit - space(RC5_T1); // Second start bit - mark(RC5_T1); // Second start bit + // Start + mark(RC5_T1); + space(RC5_T1); + mark(RC5_T1); - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - space(RC5_T1); // 1 is space, then mark - mark(RC5_T1); - } else { - mark(RC5_T1); - space(RC5_T1); - } - } + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + space(RC5_T1); // 1 is space, then mark + mark(RC5_T1); + } else { + mark(RC5_T1); + space(RC5_T1); + } + } - space(0); // Turn off at end + space(0); // Always end with the LED off } #endif //+============================================================================= -// Caller needs to take care of flipping the toggle bit +// RRRR CCCC 666 +// R R C 6 +// R R C 6 66 +// RRRR C 66 6 +// R R C 6 6 +// R R CCCC 666 +// +// NB : Caller needs to take care of flipping the toggle bit // #ifdef SEND_RC6 void IRsend::sendRC6 (unsigned long data, int nbits) { - // Set IR carrier frequency - enableIROut(36); + // Set IR carrier frequency + enableIROut(36); - mark(RC6_HDR_MARK); - space(RC6_HDR_SPACE); - mark(RC6_T1); // start bit - space(RC6_T1); + // Header + mark(RC6_HDR_MARK); + space(RC6_HDR_SPACE); - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - int t = (i == 3) ? (RC6_T1 * 2) : (RC6_T1) ; - if (data & mask) { - mark(t); - space(t); - } else { - space(t); - mark(t); - } - } + // Start bit + mark(RC6_T1); + space(RC6_T1); - space(0); // Turn off at end + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + int t = (i == 3) ? (RC6_T1 * 2) : (RC6_T1) ; + if (data & mask) { + mark(t); + space(t); + } else { + space(t); + mark(t); + } + } + + space(0); // Always end with the LED off } #endif //+============================================================================= +// PPPP AAA N N AAA SSSS OOO N N IIIII CCCC +// P P A A NN N A A S O O NN N I C +// PPPP AAAAA N N N AAAAA SSS O O N N N I C +// P A A N NN A A S O O N NN I C +// P A A N N A A SSSS OOO N N IIIII CCCC +// #ifdef SEND_PANASONIC void IRsend::sendPanasonic (unsigned int address, unsigned long data) { // Set IR carrier frequency - enableIROut(35); + enableIROut(35); - mark(PANASONIC_HDR_MARK); - space(PANASONIC_HDR_SPACE); + // Header + mark(PANASONIC_HDR_MARK); + space(PANASONIC_HDR_SPACE); + // Address for (unsigned long mask = 1 << (16 - 1); mask; mask >>= 1) { - { - mark(PANASONIC_BIT_MARK); - if (address & mask) space(PANASONIC_ONE_SPACE) ; - else space(PANASONIC_ZERO_SPACE) ; + mark(PANASONIC_BIT_MARK); + if (address & mask) space(PANASONIC_ONE_SPACE) ; + else space(PANASONIC_ZERO_SPACE) ; } + // Data for (unsigned long mask = 1 << (32 - 1); mask; mask >>= 1) { mark(PANASONIC_BIT_MARK); if (data & mask) space(PANASONIC_ONE_SPACE) ; else space(PANASONIC_ZERO_SPACE) ; } + // Footer mark(PANASONIC_BIT_MARK); - space(0); + space(0); // Always end with the LED off } #endif //+============================================================================= +// JJJJJ V V CCCC +// J V V C +// J V V C +// J J V V C +// J V CCCC +// #ifdef SEND_JVC void IRsend::sendJVC (unsigned long data, int nbits, int repeat) { // Set IR carrier frequency - enableIROut(38); + enableIROut(38); - if (!repeat){ - mark(JVC_HDR_MARK); - space(JVC_HDR_SPACE); - } + // Only send the Header if this is NOT a repeat command + if (!repeat){ + mark(JVC_HDR_MARK); + space(JVC_HDR_SPACE); + } + // Data for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(JVC_BIT_MARK); - space(JVC_ONE_SPACE); - } - else { - mark(JVC_BIT_MARK); - space(JVC_ZERO_SPACE); - } - } + if (data & mask) { + mark(JVC_BIT_MARK); + space(JVC_ONE_SPACE); + } else { + mark(JVC_BIT_MARK); + space(JVC_ZERO_SPACE); + } + } + // Footer mark(JVC_BIT_MARK); - space(0); + space(0); // Always end with the LED off } #endif //+============================================================================= +// SSSS AAA MMM SSSS U U N N GGGG +// S A A M M M S U U NN N G +// SSS AAAAA M M M SSS U U N N N G GG +// S A A M M S U U N NN G G +// SSSS A A M M SSSS UUU N N GGG +// #ifdef SEND_SAMSUNG void IRsend::sendSAMSUNG (unsigned long data, int nbits) { - // Set IR carrier frequency - enableIROut(38); + // Set IR carrier frequency + enableIROut(38); - mark(SAMSUNG_HDR_MARK); - space(SAMSUNG_HDR_SPACE); + // Header + mark(SAMSUNG_HDR_MARK); + space(SAMSUNG_HDR_SPACE); - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(SAMSUNG_BIT_MARK); - space(SAMSUNG_ONE_SPACE); - } else { - mark(SAMSUNG_BIT_MARK); - space(SAMSUNG_ZERO_SPACE); - } - } + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(SAMSUNG_BIT_MARK); + space(SAMSUNG_ONE_SPACE); + } else { + mark(SAMSUNG_BIT_MARK); + space(SAMSUNG_ZERO_SPACE); + } + } - mark(SAMSUNG_BIT_MARK); - space(0); + // Footer + mark(SAMSUNG_BIT_MARK); + space(0); // Always end with the LED off } #endif @@ -504,128 +638,83 @@ int IRrecv::decode (decode_results *results) results->rawbuf = irparams.rawbuf; results->rawlen = irparams.rawlen; - if (irparams.rcvstate != STATE_STOP) return ERR ; + if (irparams.rcvstate != STATE_STOP) return false ; #ifdef DECODE_NEC DBG_PRINTLN("Attempting NEC decode"); - if (decodeNEC(results)) return DECODED ; + if (decodeNEC(results)) return true ; #endif #ifdef DECODE_SONY DBG_PRINTLN("Attempting Sony decode"); - if (decodeSony(results)) return DECODED ; + if (decodeSony(results)) return true ; #endif #ifdef DECODE_SANYO DBG_PRINTLN("Attempting Sanyo decode"); - if (decodeSanyo(results)) return DECODED ; + if (decodeSanyo(results)) return true ; #endif #ifdef DECODE_MITSUBISHI DBG_PRINTLN("Attempting Mitsubishi decode"); - if (decodeMitsubishi(results)) return DECODED ; + if (decodeMitsubishi(results)) return true ; #endif #ifdef DECODE_RC5 DBG_PRINTLN("Attempting RC5 decode"); - if (decodeRC5(results)) return DECODED ; + if (decodeRC5(results)) return true ; #endif #ifdef DECODE_RC6 DBG_PRINTLN("Attempting RC6 decode"); - if (decodeRC6(results)) return DECODED ; + if (decodeRC6(results)) return true ; #endif #ifdef DECODE_PANASONIC DBG_PRINTLN("Attempting Panasonic decode"); - if (decodePanasonic(results)) return DECODED ; + if (decodePanasonic(results)) return true ; #endif #ifdef DECODE_LG DBG_PRINTLN("Attempting LG decode"); - if (decodeLG(results)) return DECODED ; + if (decodeLG(results)) return true ; #endif #ifdef DECODE_JVC DBG_PRINTLN("Attempting JVC decode"); - if (decodeJVC(results)) return DECODED ; + if (decodeJVC(results)) return true ; #endif #ifdef DECODE_SAMSUNG DBG_PRINTLN("Attempting SAMSUNG decode"); - if (decodeSAMSUNG(results)) return DECODED ; + if (decodeSAMSUNG(results)) return true ; #endif #ifdef DECODE_WHYNTER DBG_PRINTLN("Attempting Whynter decode"); - if (decodeWhynter(results)) return DECODED ; + if (decodeWhynter(results)) return true ; #endif #ifdef AIWA_RC_T501 DBG_PRINTLN("Attempting Aiwa RC-T501 decode"); - if (decodeAiwaRCT501(results)) return DECODED ; + if (decodeAiwaRCT501(results)) return true ; #endif // decodeHash returns a hash on any input. // Thus, it needs to be last in the list. // If you add any decodes, add them before this. - if (decodeHash(results)) return DECODED ; + if (decodeHash(results)) return true ; // Throw away and start over resume(); - return ERR; + return false; } -//+============================================================================= -#ifdef DECODE_NEC -// NECs have a repeat only 4 items long -long IRrecv::decodeNEC (decode_results *results) -{ - long data = 0; - int offset = 1; // Skip first space - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], NEC_HDR_MARK)) return ERR ; - offset++; - - // Check for repeat - if (irparams.rawlen == 4 && - MATCH_SPACE(results->rawbuf[offset], NEC_RPT_SPACE) && - MATCH_MARK(results->rawbuf[offset+1], NEC_BIT_MARK)) { - results->bits = 0; - results->value = REPEAT; - results->decode_type = NEC; - return DECODED; - } - if (irparams.rawlen < 2 * NEC_BITS + 4) return ERR ; - - // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], NEC_HDR_SPACE)) return ERR ; - offset++; - - for (int i = 0; i < NEC_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], NEC_BIT_MARK)) return ERR ; - offset++; - if (MATCH_SPACE(results->rawbuf[offset], NEC_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], NEC_ZERO_SPACE)) data <<= 1 ; - else return ERR ; - offset++; - } - - // Success - results->bits = NEC_BITS; - results->value = data; - results->decode_type = NEC; - - return DECODED; -} -#endif - //+============================================================================= #ifdef DECODE_SONY long IRrecv::decodeSony (decode_results *results) { long data = 0; - if (irparams.rawlen < 2 * SONY_BITS + 2) return ERR ; + if (irparams.rawlen < 2 * SONY_BITS + 2) return false ; int offset = 0; // Dont skip first space, check its size // Some Sony's deliver repeats fast after first @@ -641,12 +730,12 @@ long IRrecv::decodeSony (decode_results *results) results->decode_type = UNKNOWN; # endif - return DECODED; + return true; } offset++; // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SONY_HDR_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], SONY_HDR_MARK)) return false ; offset++; while (offset + 1 < irparams.rawlen) { @@ -654,7 +743,7 @@ long IRrecv::decodeSony (decode_results *results) offset++; if (MATCH_MARK(results->rawbuf[offset], SONY_ONE_MARK)) data = (data << 1) | 1 ; else if (MATCH_MARK(results->rawbuf[offset], SONY_ZERO_MARK)) data <<= 1 ; - else return ERR ; + else return false ; offset++; } @@ -662,11 +751,11 @@ long IRrecv::decodeSony (decode_results *results) results->bits = (offset - 1) / 2; if (results->bits < 12) { results->bits = 0; - return ERR; + return false; } results->value = data; results->decode_type = SONY; - return DECODED; + return true; } #endif @@ -676,41 +765,41 @@ long IRrecv::decodeWhynter (decode_results *results) { long data = 0; - if (irparams.rawlen < 2 * WHYNTER_BITS + 6) return ERR ; + if (irparams.rawlen < 2 * WHYNTER_BITS + 6) return false ; int offset = 1; // skip initial space // sequence begins with a bit mark and a zero space - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; offset++; - if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_ZERO_SPACE)) return ERR ; + if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_ZERO_SPACE)) return false ; offset++; // header mark and space - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_HDR_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_HDR_MARK)) return false ; offset++; - if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_HDR_SPACE)) return ERR ; + if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_HDR_SPACE)) return false ; offset++; // data bits for (int i = 0; i < WHYNTER_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; offset++; if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE)) data = (data << 1) | 1 ; else if (MATCH_SPACE(results->rawbuf[offset],WHYNTER_ZERO_SPACE)) data <<= 1 ; - else return ERR ; + else return false ; offset++; } // trailing mark - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; // Success results->bits = WHYNTER_BITS; results->value = data; results->decode_type = WHYNTER; - return DECODED; + return true; } #endif @@ -722,7 +811,7 @@ long IRrecv::decodeWhynter (decode_results *results) long IRrecv::decodeSanyo (decode_results *results) { long data = 0; - if (irparams.rawlen < 2 * SANYO_BITS + 2) return ERR ; + if (irparams.rawlen < 2 * SANYO_BITS + 2) return false ; int offset = 0; // Skip first space // Initial space @@ -739,16 +828,16 @@ long IRrecv::decodeSanyo (decode_results *results) results->bits = 0; results->value = REPEAT; results->decode_type = SANYO; - return DECODED; + return true; } offset++; // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; offset++; // Skip Second Mark - if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; offset++; while (offset + 1 < irparams.rawlen) { @@ -756,7 +845,7 @@ long IRrecv::decodeSanyo (decode_results *results) offset++; if (MATCH_MARK(results->rawbuf[offset], SANYO_ONE_MARK)) data = (data << 1) | 1 ; else if (MATCH_MARK(results->rawbuf[offset], SANYO_ZERO_MARK)) data <<= 1 ; - else return ERR ; + else return false ; offset++; } @@ -764,12 +853,12 @@ long IRrecv::decodeSanyo (decode_results *results) results->bits = (offset - 1) / 2; if (results->bits < 12) { results->bits = 0; - return ERR; + return false; } results->value = data; results->decode_type = SANYO; - return DECODED; + return true; } #endif @@ -781,7 +870,7 @@ long IRrecv::decodeMitsubishi (decode_results *results) { // Serial.print("?!? decoding Mitsubishi:");Serial.print(irparams.rawlen); Serial.print(" want "); Serial.println( 2 * MITSUBISHI_BITS + 2); long data = 0; - if (irparams.rawlen < 2 * MITSUBISHI_BITS + 2) return ERR ; + if (irparams.rawlen < 2 * MITSUBISHI_BITS + 2) return false ; int offset = 0; // Skip first space // Initial space @@ -800,7 +889,7 @@ long IRrecv::decodeMitsubishi (decode_results *results) results->bits = 0; results->value = REPEAT; results->decode_type = MITSUBISHI; - return DECODED; + return true; } #endif @@ -810,13 +899,13 @@ long IRrecv::decodeMitsubishi (decode_results *results) // 14200 7 41 7 42 7 42 7 17 7 17 7 18 7 41 7 18 7 17 7 17 7 18 7 41 8 17 7 17 7 18 7 17 7 // Initial Space - if (!MATCH_MARK(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) return false ; offset++; while (offset + 1 < irparams.rawlen) { if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ONE_MARK)) data = (data << 1) | 1 ; else if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ZERO_MARK)) data <<= 1 ; - else return ERR ; + else return false ; offset++; if (!MATCH_SPACE(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) break ; @@ -827,12 +916,12 @@ long IRrecv::decodeMitsubishi (decode_results *results) results->bits = (offset - 1) / 2; if (results->bits < MITSUBISHI_BITS) { results->bits = 0; - return ERR; + return false; } results->value = data; results->decode_type = MITSUBISHI; - return DECODED; + return true; } #endif @@ -872,14 +961,14 @@ int IRrecv::getRClevel (decode_results *results, int *offset, int *used, int #ifdef DECODE_RC5 long IRrecv::decodeRC5 (decode_results *results) { - if (irparams.rawlen < MIN_RC5_SAMPLES + 2) return ERR ; + if (irparams.rawlen < MIN_RC5_SAMPLES + 2) return false ; int offset = 1; // Skip gap space long data = 0; int used = 0; // Get start bits - if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return ERR ; - if (getRClevel(results, &offset, &used, RC5_T1) != SPACE) return ERR ; - if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return ERR ; + if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; + if (getRClevel(results, &offset, &used, RC5_T1) != SPACE) return false ; + if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; int nbits; for (nbits = 0; offset < irparams.rawlen; nbits++) { int levelA = getRClevel(results, &offset, &used, RC5_T1); @@ -887,14 +976,14 @@ long IRrecv::decodeRC5 (decode_results *results) if (levelA == SPACE && levelB == MARK) data = (data << 1) | 1 ; // 1 bit else if (levelA == MARK && levelB == SPACE) data <<= 1 ; // zero bit - else return ERR ; + else return false ; } // Success results->bits = nbits; results->value = data; results->decode_type = RC5; - return DECODED; + return true; } #endif @@ -902,45 +991,45 @@ long IRrecv::decodeRC5 (decode_results *results) #ifdef DECODE_RC6 long IRrecv::decodeRC6 (decode_results *results) { - if (results->rawlen < MIN_RC6_SAMPLES) return ERR ; + if (results->rawlen < MIN_RC6_SAMPLES) return false ; int offset = 1; // Skip first space // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], RC6_HDR_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], RC6_HDR_MARK)) return false ; offset++; - if (!MATCH_SPACE(results->rawbuf[offset], RC6_HDR_SPACE)) return ERR ; + if (!MATCH_SPACE(results->rawbuf[offset], RC6_HDR_SPACE)) return false ; offset++; long data = 0; int used = 0; // Get start bit (1) - if (getRClevel(results, &offset, &used, RC6_T1) != MARK) return ERR ; - if (getRClevel(results, &offset, &used, RC6_T1) != SPACE) return ERR ; + if (getRClevel(results, &offset, &used, RC6_T1) != MARK) return false ; + if (getRClevel(results, &offset, &used, RC6_T1) != SPACE) return false ; int nbits; for (nbits = 0; offset < results->rawlen; nbits++) { int levelA, levelB; // Next two levels levelA = getRClevel(results, &offset, &used, RC6_T1); if (nbits == 3) { // T bit is double wide; make sure second half matches - if (levelA != getRClevel(results, &offset, &used, RC6_T1)) return ERR; + if (levelA != getRClevel(results, &offset, &used, RC6_T1)) return false; } levelB = getRClevel(results, &offset, &used, RC6_T1); if (nbits == 3) { // T bit is double wide; make sure second half matches - if (levelB != getRClevel(results, &offset, &used, RC6_T1)) return ERR; + if (levelB != getRClevel(results, &offset, &used, RC6_T1)) return false; } if (levelA == MARK && levelB == SPACE) data = (data << 1) | 1 ; // 1-bit (reversed compared to RC5) else if (levelA == SPACE && levelB == MARK) data <<= 1 ; // zero bit - else return ERR ; // Error + else return false ; // Error } // Success results->bits = nbits; results->value = data; results->decode_type = RC6; - return DECODED; + return true; } #endif @@ -951,18 +1040,18 @@ long IRrecv::decodePanasonic (decode_results *results) unsigned long long data = 0; int offset = 1; - if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) return false ; offset++; - if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_SPACE)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_SPACE)) return false ; offset++; // decode address for (int i = 0; i < PANASONIC_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_BIT_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_BIT_MARK)) return false ; if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ONE_SPACE)) data = (data << 1) | 1 ; else if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ZERO_SPACE)) data <<= 1 ; - else return ERR ; + else return false ; offset++; } @@ -971,7 +1060,7 @@ long IRrecv::decodePanasonic (decode_results *results) results->decode_type = PANASONIC; results->bits = PANASONIC_BITS; - return DECODED; + return true; } #endif @@ -983,29 +1072,29 @@ long IRrecv::decodeLG (decode_results *results) int offset = 1; // Skip first space // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], LG_HDR_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], LG_HDR_MARK)) return false ; offset++; - if (irparams.rawlen < 2 * LG_BITS + 1 ) return ERR ; + if (irparams.rawlen < 2 * LG_BITS + 1 ) return false ; // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], LG_HDR_SPACE)) return ERR ; + if (!MATCH_SPACE(results->rawbuf[offset], LG_HDR_SPACE)) return false ; offset++; for (int i = 0; i < LG_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; offset++; if (MATCH_SPACE(results->rawbuf[offset], LG_ONE_SPACE)) data = (data << 1) | 1 ; else if (MATCH_SPACE(results->rawbuf[offset], LG_ZERO_SPACE)) data <<= 1 ; - else return ERR ; + else return false ; offset++; } // Stop bit - if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; // Success results->bits = LG_BITS; results->value = data; results->decode_type = LG; - return DECODED; + return true; } #endif @@ -1023,37 +1112,37 @@ long IRrecv::decodeJVC (decode_results *results) results->bits = 0; results->value = REPEAT; results->decode_type = JVC; - return DECODED; + return true; } // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], JVC_HDR_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], JVC_HDR_MARK)) return false ; offset++; - if (irparams.rawlen < 2 * JVC_BITS + 1 ) return ERR ; + if (irparams.rawlen < 2 * JVC_BITS + 1 ) return false ; // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) return ERR ; + if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) return false ; offset++; for (int i = 0; i < JVC_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return false ; offset++; if (MATCH_SPACE(results->rawbuf[offset], JVC_ONE_SPACE)) data = (data << 1) | 1 ; else if (MATCH_SPACE(results->rawbuf[offset], JVC_ZERO_SPACE)) data <<= 1 ; - else return ERR ; + else return false ; offset++; } // Stop bit - if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return false ; // Success results->bits = JVC_BITS; results->value = data; results->decode_type = JVC; - return DECODED; + return true; } #endif @@ -1067,7 +1156,7 @@ long IRrecv::decodeSAMSUNG (decode_results *results) int offset = 1; // Skip first space // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_HDR_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_HDR_MARK)) return false ; offset++; // Check for repeat @@ -1077,22 +1166,22 @@ long IRrecv::decodeSAMSUNG (decode_results *results) results->bits = 0; results->value = REPEAT; results->decode_type = SAMSUNG; - return DECODED; + return true; } - if (irparams.rawlen < 2 * SAMSUNG_BITS + 4) return ERR ; + if (irparams.rawlen < 2 * SAMSUNG_BITS + 4) return false ; // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) return ERR ; + if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) return false ; offset++; for (int i = 0; i < SAMSUNG_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_BIT_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_BIT_MARK)) return false ; offset++; if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ONE_SPACE)) data = (data << 1) | 1 ; else if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ZERO_SPACE)) data <<= 1 ; - else return ERR ; + else return false ; offset++; } @@ -1100,7 +1189,7 @@ long IRrecv::decodeSAMSUNG (decode_results *results) results->bits = SAMSUNG_BITS; results->value = data; results->decode_type = SAMSUNG; - return DECODED; + return true; } #endif @@ -1116,20 +1205,20 @@ long IRrecv::decodeAiwaRCT501 (decode_results *results) int offset = 1; // skip first garbage read // Check SIZE - if (irparams.rawlen < 2 * (AIWA_RC_T501_SUM_BITS) + 4) return ERR ; + if (irparams.rawlen < 2 * (AIWA_RC_T501_SUM_BITS) + 4) return false ; // Check HDR - if (!MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_HDR_MARK)) return ERR ; + if (!MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_HDR_MARK)) return false ; offset++; // Check HDR space - if (!MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_HDR_SPACE)) return ERR ; + if (!MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_HDR_SPACE)) return false ; offset++; offset += 26; // skip pre-data - optional while(offset < irparams.rawlen - 4) { if (MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_BIT_MARK)) offset++ ; - else return ERR ; + else return false ; // ONE & ZERO if (MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ONE_SPACE)) data = (data << 1) | 1 ; @@ -1139,10 +1228,10 @@ long IRrecv::decodeAiwaRCT501 (decode_results *results) } results->bits = (offset - 1) / 2; - if (results->bits < 42) return ERR ; + if (results->bits < 42) return false ; results->value = data; results->decode_type = AIWA_RC_T501; - return DECODED; + return true; } #endif @@ -1182,7 +1271,7 @@ int IRrecv::compare (unsigned int oldval, unsigned int newval) long IRrecv::decodeHash (decode_results *results) { // Require at least 6 samples to prevent triggering on noise - if (results->rawlen < 6) return ERR ; + if (results->rawlen < 6) return false ; long hash = FNV_BASIS_32; for (int i = 1; (i + 2) < results->rawlen; i++) { int value = compare(results->rawbuf[i], results->rawbuf[i+2]); @@ -1194,7 +1283,7 @@ long IRrecv::decodeHash (decode_results *results) results->bits = 32; results->decode_type = UNKNOWN; - return DECODED; + return true; } //+============================================================================= From 04e2cfbdadc2c0177a89abaa9f034127675c289e Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 01:20:25 +0100 Subject: [PATCH 10/31] Compiling, all functionality enabled, tested with Panasonic --- IRremote.cpp | 1242 ++++++++++++++++++++++++++++--------------------- IRremote.h | 58 +-- IRremoteInt.h | 134 +----- 3 files changed, 759 insertions(+), 675 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index df9b069..bce7b37 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -1,3 +1,29 @@ +#define SEND_NEC +#define DECODE_NEC +#define SEND_WHYNTER +#define DECODE_WHYNTER +#define SEND_SONY +#define DECODE_SONY +#define DECODE_SANYO +#define SEND_RC5 +#define DECODE_RC5 +#define SEND_RC6 +#define DECODE_RC6 +#define SEND_PANASONIC +#define DECODE_PANASONIC +#define SEND_JVC +#define DECODE_JVC +#define SEND_SAMSUNG +#define DECODE_SAMSUNG +#define DECODE_LG +#define SEND_AIWA_RC_T501 +#define DECODE_MITSUBISHI +#define DECODE_AIWA_RC_T501 +#define SEND_SHARP +#define SEND_DISH + + + //****************************************************************************** // IRremote // Version 0.11 August, 2009 @@ -108,15 +134,15 @@ int MATCH_SPACE (int measured_ticks, int desired_us) // void IRsend::sendRaw (unsigned int buf[], int len, int hz) { - // Set IR carrier frequency - enableIROut(hz); + // Set IR carrier frequency + enableIROut(hz); - for (int i = 0; i < len; i++) { - if (i & 1) space(buf[i]) ; - else mark (buf[i]) ; - } + for (int i = 0; i < len; i++) { + if (i & 1) space(buf[i]) ; + else mark (buf[i]) ; + } - space(0); // Just to be sure + space(0); // Always end with the LED off } //+============================================================================= @@ -126,6 +152,14 @@ void IRsend::sendRaw (unsigned int buf[], int len, int hz) // N NN E C // N N EEEEE CCCC // +#define NEC_BITS 32 +#define NEC_HDR_MARK 9000 +#define NEC_HDR_SPACE 4500 +#define NEC_BIT_MARK 560 +#define NEC_ONE_SPACE 1690 +#define NEC_ZERO_SPACE 560 +#define NEC_RPT_SPACE 2250 + #ifdef SEND_NEC void IRsend::sendNEC (unsigned long data, int nbits) { @@ -149,11 +183,11 @@ void IRsend::sendNEC (unsigned long data, int nbits) // Footer mark(NEC_BIT_MARK); - space(0); // Alwasy end with the LED off + space(0); // Always end with the LED off } #endif -//+============================================================================= +//+======================================================== // NECs have a repeat only 4 items long // #ifdef DECODE_NEC @@ -212,6 +246,15 @@ long IRrecv::decodeNEC (decode_results *results) // W W W H H Y N NN T E R R // WWW H H Y N N T EEEEE R R // +#define WHYNTER_BITS 32 +#define WHYNTER_HDR_MARK 2850 +#define WHYNTER_HDR_SPACE 2850 +#define WHYNTER_BIT_MARK 750 +#define WHYNTER_ONE_MARK 750 +#define WHYNTER_ONE_SPACE 2150 +#define WHYNTER_ZERO_MARK 750 +#define WHYNTER_ZERO_SPACE 750 + #ifdef SEND_WHYNTER void IRsend::sendWhynter (unsigned long data, int nbits) { @@ -243,6 +286,50 @@ void IRsend::sendWhynter (unsigned long data, int nbits) } #endif +//+======================================================== +#ifdef DECODE_WHYNTER +long IRrecv::decodeWhynter (decode_results *results) +{ + long data = 0; + + if (irparams.rawlen < 2 * WHYNTER_BITS + 6) return false ; + + int offset = 1; // skip initial space + + // sequence begins with a bit mark and a zero space + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; + offset++; + if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_ZERO_SPACE)) return false ; + offset++; + + // header mark and space + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_HDR_MARK)) return false ; + offset++; + if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_HDR_SPACE)) return false ; + offset++; + + // data bits + for (int i = 0; i < WHYNTER_BITS; i++) { + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; + offset++; + + if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset],WHYNTER_ZERO_SPACE)) data <<= 1 ; + else return false ; + offset++; + } + + // trailing mark + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; + + // Success + results->bits = WHYNTER_BITS; + results->value = data; + results->decode_type = WHYNTER; + return true; +} +#endif + //+============================================================================= // SSSS OOO N N Y Y // S O O NN N Y Y @@ -250,6 +337,14 @@ void IRsend::sendWhynter (unsigned long data, int nbits) // S O O N NN Y // SSSS OOO N N Y // +#define SONY_BITS 12 +#define SONY_HDR_MARK 2400 +#define SONY_HDR_SPACE 600 +#define SONY_ONE_MARK 1200 +#define SONY_ZERO_MARK 600 +#define SONY_RPT_LENGTH 45000 +#define SONY_DOUBLE_SPACE_USECS 500 // usually ssee 713 - not using ticks as get number wrapround + #ifdef SEND_SONY void IRsend::sendSony (unsigned long data, int nbits) { @@ -275,16 +370,145 @@ void IRsend::sendSony (unsigned long data, int nbits) } #endif +//+======================================================== +#ifdef DECODE_SONY +long IRrecv::decodeSony (decode_results *results) +{ + long data = 0; + if (irparams.rawlen < 2 * SONY_BITS + 2) return false ; + int offset = 0; // Dont skip first space, check its size + + // Some Sony's deliver repeats fast after first + // unfortunately can't spot difference from of repeat from two fast clicks + if (results->rawbuf[offset] < SONY_DOUBLE_SPACE_USECS) { + // Serial.print("IR Gap found: "); + results->bits = 0; + results->value = REPEAT; + +# ifdef DECODE_SANYO + results->decode_type = SANYO; +# else + results->decode_type = UNKNOWN; +# endif + + return true; + } + offset++; + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], SONY_HDR_MARK)) return false ; + offset++; + + while (offset + 1 < irparams.rawlen) { + if (!MATCH_SPACE(results->rawbuf[offset], SONY_HDR_SPACE)) break ; + offset++; + if (MATCH_MARK(results->rawbuf[offset], SONY_ONE_MARK)) data = (data << 1) | 1 ; + else if (MATCH_MARK(results->rawbuf[offset], SONY_ZERO_MARK)) data <<= 1 ; + else return false ; + offset++; + } + + // Success + results->bits = (offset - 1) / 2; + if (results->bits < 12) { + results->bits = 0; + return false; + } + results->value = data; + results->decode_type = SONY; + return true; +} +#endif + +//+============================================================================= +// SSSS AAA N N Y Y OOO +// S A A NN N Y Y O O +// SSS AAAAA N N N Y O O +// S A A N NN Y O O +// SSSS A A N N Y OOO +// + +// I think this is a Sanyo decoder - serial = SA 8650B +// Looks like Sony except for timings, 48 chars of data and time/space different +// +// SA 8650B +#define SANYO_BITS 12 + +#define SANYO_HDR_MARK 3500 // seen range 3500 +#define SANYO_HDR_SPACE 950 // seen 950 +#define SANYO_ONE_MARK 2400 // seen 2400 +#define SANYO_ZERO_MARK 700 // seen 700 +#define SANYO_DOUBLE_SPACE_USECS 800 // usually ssee 713 - not using ticks as get number wrapround +#define SANYO_RPT_LENGTH 45000 + +#ifdef DECODE_SANYO +long IRrecv::decodeSanyo (decode_results *results) +{ + long data = 0; + if (irparams.rawlen < 2 * SANYO_BITS + 2) return false ; + int offset = 0; // Skip first space + // Initial space + +#if 0 + // Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay + Serial.print("IR Gap: "); + Serial.println( results->rawbuf[offset]); + Serial.println( "test against:"); + Serial.println(results->rawbuf[offset]); +#endif + + if (results->rawbuf[offset] < SANYO_DOUBLE_SPACE_USECS) { + // Serial.print("IR Gap found: "); + results->bits = 0; + results->value = REPEAT; + results->decode_type = SANYO; + return true; + } + offset++; + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; + offset++; + + // Skip Second Mark + if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; + offset++; + + while (offset + 1 < irparams.rawlen) { + if (!MATCH_SPACE(results->rawbuf[offset], SANYO_HDR_SPACE)) break ; + offset++; + if (MATCH_MARK(results->rawbuf[offset], SANYO_ONE_MARK)) data = (data << 1) | 1 ; + else if (MATCH_MARK(results->rawbuf[offset], SANYO_ZERO_MARK)) data <<= 1 ; + else return false ; + offset++; + } + + // Success + results->bits = (offset - 1) / 2; + if (results->bits < 12) { + results->bits = 0; + return false; + } + + results->value = data; + results->decode_type = SANYO; + return true; +} +#endif + //+============================================================================= // RRRR CCCC 55555 // R R C 5 -// R R C 5555 -// RRRR C 5 -// R R C 5 5 -// R R CCCC 555 +// RRRR C 5555 +// R R C 5 +// R R CCCC 5555 // -// Note: first bit must be a one (start bit) +// NB: First bit must be a one (start bit) // +#define MIN_RC5_SAMPLES 11 +#define RC5_T1 889 +#define RC5_RPT_LENGTH 46000 + #ifdef SEND_RC5 void IRsend::sendRC5 (unsigned long data, int nbits) { @@ -311,16 +535,51 @@ void IRsend::sendRC5 (unsigned long data, int nbits) } #endif +//+======================================================== +#ifdef DECODE_RC5 +long IRrecv::decodeRC5 (decode_results *results) +{ + if (irparams.rawlen < MIN_RC5_SAMPLES + 2) return false ; + int offset = 1; // Skip gap space + long data = 0; + int used = 0; + // Get start bits + if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; + if (getRClevel(results, &offset, &used, RC5_T1) != SPACE) return false ; + if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; + int nbits; + for (nbits = 0; offset < irparams.rawlen; nbits++) { + int levelA = getRClevel(results, &offset, &used, RC5_T1); + int levelB = getRClevel(results, &offset, &used, RC5_T1); + + if (levelA == SPACE && levelB == MARK) data = (data << 1) | 1 ; // 1 bit + else if (levelA == MARK && levelB == SPACE) data <<= 1 ; // zero bit + else return false ; + } + + // Success + results->bits = nbits; + results->value = data; + results->decode_type = RC5; + return true; +} +#endif + //+============================================================================= -// RRRR CCCC 666 -// R R C 6 -// R R C 6 66 -// RRRR C 66 6 +// RRRR CCCC 6666 +// R R C 6 +// RRRR C 6666 // R R C 6 6 // R R CCCC 666 // // NB : Caller needs to take care of flipping the toggle bit // +#define MIN_RC6_SAMPLES 1 +#define RC6_HDR_MARK 2666 +#define RC6_HDR_SPACE 889 +#define RC6_T1 444 +#define RC6_RPT_LENGTH 46000 + #ifdef SEND_RC6 void IRsend::sendRC6 (unsigned long data, int nbits) { @@ -336,8 +595,9 @@ void IRsend::sendRC6 (unsigned long data, int nbits) space(RC6_T1); // Data - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - int t = (i == 3) ? (RC6_T1 * 2) : (RC6_T1) ; + for (unsigned long i = 1, mask = 1 << (nbits - 1); mask; i++, mask >>= 1) { + // The fourth bit we send is a "double width trailer bit" + int t = (i == 4) ? (RC6_T1 * 2) : (RC6_T1) ; if (data & mask) { mark(t); space(t); @@ -351,6 +611,52 @@ void IRsend::sendRC6 (unsigned long data, int nbits) } #endif +//+======================================================== +#ifdef DECODE_RC6 +long IRrecv::decodeRC6 (decode_results *results) +{ + if (results->rawlen < MIN_RC6_SAMPLES) return false ; + int offset = 1; // Skip first space + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], RC6_HDR_MARK)) return false ; + offset++; + + if (!MATCH_SPACE(results->rawbuf[offset], RC6_HDR_SPACE)) return false ; + offset++; + + long data = 0; + int used = 0; + + // Get start bit (1) + if (getRClevel(results, &offset, &used, RC6_T1) != MARK) return false ; + if (getRClevel(results, &offset, &used, RC6_T1) != SPACE) return false ; + int nbits; + for (nbits = 0; offset < results->rawlen; nbits++) { + int levelA, levelB; // Next two levels + levelA = getRClevel(results, &offset, &used, RC6_T1); + if (nbits == 3) { + // T bit is double wide; make sure second half matches + if (levelA != getRClevel(results, &offset, &used, RC6_T1)) return false; + } + levelB = getRClevel(results, &offset, &used, RC6_T1); + if (nbits == 3) { + // T bit is double wide; make sure second half matches + if (levelB != getRClevel(results, &offset, &used, RC6_T1)) return false; + } + if (levelA == MARK && levelB == SPACE) data = (data << 1) | 1 ; // 1-bit (reversed compared to RC5) + else if (levelA == SPACE && levelB == MARK) data <<= 1 ; // zero bit + else return false ; // Error + } + + // Success + results->bits = nbits; + results->value = data; + results->decode_type = RC6; + return true; +} +#endif + //+============================================================================= // PPPP AAA N N AAA SSSS OOO N N IIIII CCCC // P P A A NN N A A S O O NN N I C @@ -358,6 +664,13 @@ void IRsend::sendRC6 (unsigned long data, int nbits) // P A A N NN A A S O O N NN I C // P A A N N A A SSSS OOO N N IIIII CCCC // +#define PANASONIC_BITS 48 +#define PANASONIC_HDR_MARK 3502 +#define PANASONIC_HDR_SPACE 1750 +#define PANASONIC_BIT_MARK 502 +#define PANASONIC_ONE_SPACE 1244 +#define PANASONIC_ZERO_SPACE 400 + #ifdef SEND_PANASONIC void IRsend::sendPanasonic (unsigned int address, unsigned long data) { @@ -388,6 +701,37 @@ void IRsend::sendPanasonic (unsigned int address, unsigned long data) } #endif +//+======================================================== +#ifdef DECODE_PANASONIC +long IRrecv::decodePanasonic (decode_results *results) +{ + unsigned long long data = 0; + int offset = 1; + + if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) return false ; + offset++; + if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_SPACE)) return false ; + offset++; + + // decode address + for (int i = 0; i < PANASONIC_BITS; i++) { + if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_BIT_MARK)) return false ; + + if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ZERO_SPACE)) data <<= 1 ; + else return false ; + offset++; + } + + results->value = (unsigned long)data; + results->panasonicAddress = (unsigned int)(data >> 32); + results->decode_type = PANASONIC; + results->bits = PANASONIC_BITS; + + return true; +} +#endif + //+============================================================================= // JJJJJ V V CCCC // J V V C @@ -395,6 +739,14 @@ void IRsend::sendPanasonic (unsigned int address, unsigned long data) // J J V V C // J V CCCC // +#define JVC_BITS 16 +#define JVC_HDR_MARK 8000 +#define JVC_HDR_SPACE 4000 +#define JVC_BIT_MARK 600 +#define JVC_ONE_SPACE 1600 +#define JVC_ZERO_SPACE 550 +#define JVC_RPT_LENGTH 60000 + #ifdef SEND_JVC void IRsend::sendJVC (unsigned long data, int nbits, int repeat) { @@ -424,6 +776,54 @@ void IRsend::sendJVC (unsigned long data, int nbits, int repeat) } #endif +//+======================================================== +#ifdef DECODE_JVC +long IRrecv::decodeJVC (decode_results *results) +{ + long data = 0; + int offset = 1; // Skip first space + + // Check for repeat + if (irparams.rawlen - 1 == 33 && + MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK) && + MATCH_MARK(results->rawbuf[irparams.rawlen-1], JVC_BIT_MARK)) { + results->bits = 0; + results->value = REPEAT; + results->decode_type = JVC; + return true; + } + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], JVC_HDR_MARK)) return false ; + offset++; + + if (irparams.rawlen < 2 * JVC_BITS + 1 ) return false ; + + // Initial space + if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) return false ; + offset++; + + for (int i = 0; i < JVC_BITS; i++) { + if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return false ; + offset++; + if (MATCH_SPACE(results->rawbuf[offset], JVC_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], JVC_ZERO_SPACE)) data <<= 1 ; + else return false ; + offset++; + } + + // Stop bit + if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return false ; + + // Success + results->bits = JVC_BITS; + results->value = data; + results->decode_type = JVC; + + return true; +} +#endif + //+============================================================================= // SSSS AAA MMM SSSS U U N N GGGG // S A A M M M S U U NN N G @@ -431,6 +831,14 @@ void IRsend::sendJVC (unsigned long data, int nbits, int repeat) // S A A M M S U U N NN G G // SSSS A A M M SSSS UUU N N GGG // +#define SAMSUNG_BITS 32 +#define SAMSUNG_HDR_MARK 5000 +#define SAMSUNG_HDR_SPACE 5000 +#define SAMSUNG_BIT_MARK 560 +#define SAMSUNG_ONE_SPACE 1600 +#define SAMSUNG_ZERO_SPACE 560 +#define SAMSUNG_RPT_SPACE 2250 + #ifdef SEND_SAMSUNG void IRsend::sendSAMSUNG (unsigned long data, int nbits) { @@ -457,6 +865,187 @@ void IRsend::sendSAMSUNG (unsigned long data, int nbits) space(0); // Always end with the LED off } #endif + +//+======================================================== +// SAMSUNGs have a repeat only 4 items long +// +#ifdef DECODE_SAMSUNG +long IRrecv::decodeSAMSUNG (decode_results *results) +{ + long data = 0; + int offset = 1; // Skip first space + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_HDR_MARK)) return false ; + offset++; + + // Check for repeat + if (irparams.rawlen == 4 && + MATCH_SPACE(results->rawbuf[offset], SAMSUNG_RPT_SPACE) && + MATCH_MARK(results->rawbuf[offset+1], SAMSUNG_BIT_MARK)) { + results->bits = 0; + results->value = REPEAT; + results->decode_type = SAMSUNG; + return true; + } + if (irparams.rawlen < 2 * SAMSUNG_BITS + 4) return false ; + + // Initial space + if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) return false ; + offset++; + + for (int i = 0; i < SAMSUNG_BITS; i++) { + if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_BIT_MARK)) return false ; + + offset++; + + if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ZERO_SPACE)) data <<= 1 ; + else return false ; + offset++; + } + + // Success + results->bits = SAMSUNG_BITS; + results->value = data; + results->decode_type = SAMSUNG; + return true; +} +#endif + +//+============================================================================= +// L GGGG +// L G +// L G GG +// L G G +// LLLLL GGG +// +#define LG_BITS 28 + +#define LG_HDR_MARK 8000 +#define LG_HDR_SPACE 4000 +#define LG_BIT_MARK 600 +#define LG_ONE_SPACE 1600 +#define LG_ZERO_SPACE 550 +#define LG_RPT_LENGTH 60000 + +#ifdef DECODE_LG +long IRrecv::decodeLG (decode_results *results) +{ + long data = 0; + int offset = 1; // Skip first space + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], LG_HDR_MARK)) return false ; + offset++; + if (irparams.rawlen < 2 * LG_BITS + 1 ) return false ; + // Initial space + if (!MATCH_SPACE(results->rawbuf[offset], LG_HDR_SPACE)) return false ; + offset++; + for (int i = 0; i < LG_BITS; i++) { + if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; + offset++; + if (MATCH_SPACE(results->rawbuf[offset], LG_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], LG_ZERO_SPACE)) data <<= 1 ; + else return false ; + offset++; + } + + // Stop bit + if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; + + // Success + results->bits = LG_BITS; + results->value = data; + results->decode_type = LG; + return true; +} +#endif + +//+============================================================================= +// AAA IIIII W W AAA +// A A I W W A A +// AAAAA I W W W AAAAA +// A A I W W W A A +// A A IIIII WWW A A +// +// Baszed off the RC-T501 RCU +// Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 +// +#define AIWA_RC_T501_HZ 38 +#define AIWA_RC_T501_BITS 15 +#define AIWA_RC_T501_PRE_BITS 26 +#define AIWA_RC_T501_POST_BITS 1 +#define AIWA_RC_T501_SUM_BITS (AIWA_RC_T501_PRE_BITS + AIWA_RC_T501_BITS + AIWA_RC_T501_POST_BITS) +#define AIWA_RC_T501_HDR_MARK 8800 +#define AIWA_RC_T501_HDR_SPACE 4500 +#define AIWA_RC_T501_BIT_MARK 500 +#define AIWA_RC_T501_ONE_SPACE 600 +#define AIWA_RC_T501_ZERO_SPACE 1700 + +#ifdef SEND_AIWA_RC_T501 +void IRsend::sendAiwaRCT501 (int code) +{ + unsigned long pre = 0x0227EEC0; // 26-bits + int mask; + + // Set IR carrier frequency + enableIROut(AIWA_RC_T501_HZ); + + // Header + mark(AIWA_RC_T501_HDR_MARK); + space(AIWA_RC_T501_HDR_SPACE); + + // Send "pre" data + for (unsigned long mask = 1 << (26 - 1); mask; mask >>= 1) { + mark(AIWA_RC_T501_BIT_MARK); + if (pre & mask) space(AIWA_RC_T501_ONE_SPACE) ; + else space(AIWA_RC_T501_ZERO_SPACE) ; + } + +//-v- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! +// it only send 15bits and ignores the top bit +// then uses TOPBIT which is bit-31 to check the bit code +// I suspect TOPBIT should be changed to 0x00008000 + // Skip firts code bit + code <<= 1; + // Send code + for (int i = 0; i < 15; i++) { + mark(AIWA_RC_T501_BIT_MARK); + if (code & TOPBIT) space(AIWA_RC_T501_ONE_SPACE) ; + else space(AIWA_RC_T501_ZERO_SPACE) ; + code <<= 1; + } +//-^- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! + + // POST-DATA, 1 bit, 0x0 + mark(AIWA_RC_T501_BIT_MARK); + space(AIWA_RC_T501_ZERO_SPACE); + + mark(AIWA_RC_T501_BIT_MARK); + space(0); +} +#endif + + + + + + + + + + + + + + + + + + + + //+============================================================================= // Sends an IR mark for the specified number of microseconds. @@ -464,8 +1053,8 @@ void IRsend::sendSAMSUNG (unsigned long data, int nbits) // void IRsend::mark (int time) { - TIMER_ENABLE_PWM; // Enable pin 3 PWM output - if (time > 0) delayMicroseconds(time); + TIMER_ENABLE_PWM; // Enable pin 3 PWM output + if (time > 0) delayMicroseconds(time); } //+============================================================================= @@ -475,8 +1064,8 @@ void IRsend::mark (int time) // void IRsend::space (int time) { - TIMER_DISABLE_PWM; // Disable pin 3 PWM output - if (time > 0) delayMicroseconds(time); + TIMER_DISABLE_PWM; // Disable pin 3 PWM output + if (time > 0) delayMicroseconds(time); } //+============================================================================= @@ -493,25 +1082,25 @@ void IRsend::space (int time) // void IRsend::enableIROut (int khz) { - // Disable the Timer2 Interrupt (which is used for receiving IR) - TIMER_DISABLE_INTR; //Timer2 Overflow Interrupt + // Disable the Timer2 Interrupt (which is used for receiving IR) + TIMER_DISABLE_INTR; //Timer2 Overflow Interrupt - pinMode(TIMER_PWM_PIN, OUTPUT); - digitalWrite(TIMER_PWM_PIN, LOW); // When not sending PWM, we want it low + pinMode(TIMER_PWM_PIN, OUTPUT); + digitalWrite(TIMER_PWM_PIN, LOW); // When not sending PWM, we want it low - // COM2A = 00: disconnect OC2A - // COM2B = 00: disconnect OC2B; to send signal set to 10: OC2B non-inverted - // WGM2 = 101: phase-correct PWM with OCRA as top - // CS2 = 000: no prescaling - // The top value for the timer. The modulation frequency will be SYSCLOCK / 2 / OCR2A. - TIMER_CONFIG_KHZ(khz); + // COM2A = 00: disconnect OC2A + // COM2B = 00: disconnect OC2B; to send signal set to 10: OC2B non-inverted + // WGM2 = 101: phase-correct PWM with OCRA as top + // CS2 = 000: no prescaling + // The top value for the timer. The modulation frequency will be SYSCLOCK / 2 / OCR2A. + TIMER_CONFIG_KHZ(khz); } //+============================================================================= IRrecv::IRrecv (int recvpin) { - irparams.recvpin = recvpin; - irparams.blinkflag = 0; + irparams.recvpin = recvpin; + irparams.blinkflag = 0; } //+============================================================================= @@ -519,26 +1108,26 @@ IRrecv::IRrecv (int recvpin) // void IRrecv::enableIRIn ( ) { - cli(); - // setup pulse clock timer interrupt - //Prescale /8 (16M/8 = 0.5 microseconds per tick) - // Therefore, the timer interval can range from 0.5 to 128 microseconds - // depending on the reset value (255 to 0) - TIMER_CONFIG_NORMAL(); + cli(); + // setup pulse clock timer interrupt + //Prescale /8 (16M/8 = 0.5 microseconds per tick) + // Therefore, the timer interval can range from 0.5 to 128 microseconds + // depending on the reset value (255 to 0) + TIMER_CONFIG_NORMAL(); - //Timer2 Overflow Interrupt Enable - TIMER_ENABLE_INTR; + //Timer2 Overflow Interrupt Enable + TIMER_ENABLE_INTR; - TIMER_RESET; + TIMER_RESET; - sei(); // enable interrupts + sei(); // enable interrupts - // initialize state machine variables - irparams.rcvstate = STATE_IDLE; - irparams.rawlen = 0; + // initialize state machine variables + irparams.rcvstate = STATE_IDLE; + irparams.rawlen = 0; - // set pin modes - pinMode(irparams.recvpin, INPUT); + // set pin modes + pinMode(irparams.recvpin, INPUT); } //+============================================================================= @@ -546,8 +1135,8 @@ void IRrecv::enableIRIn ( ) // void IRrecv::blink13 (int blinkflag) { - irparams.blinkflag = blinkflag; - if (blinkflag) pinMode(BLINKLED, OUTPUT) ; + irparams.blinkflag = blinkflag; + if (blinkflag) pinMode(BLINKLED, OUTPUT) ; } //+============================================================================= @@ -618,253 +1207,134 @@ ISR (TIMER_INTR_NAME) if (irparams.blinkflag) { if (irdata == MARK) BLINKLED_ON() ; // turn pin 13 LED on else BLINKLED_OFF() ; // turn pin 13 LED off - } } } //+============================================================================= void IRrecv::resume ( ) { - irparams.rcvstate = STATE_IDLE; - irparams.rawlen = 0; + irparams.rcvstate = STATE_IDLE; + irparams.rawlen = 0; } + + + + + + + + + + + + //+============================================================================= // Decodes the received IR message // Returns 0 if no data ready, 1 if data ready. // Results of decoding are stored in results int IRrecv::decode (decode_results *results) { - results->rawbuf = irparams.rawbuf; - results->rawlen = irparams.rawlen; + results->rawbuf = irparams.rawbuf; + results->rawlen = irparams.rawlen; - if (irparams.rcvstate != STATE_STOP) return false ; + if (irparams.rcvstate != STATE_STOP) return false ; #ifdef DECODE_NEC - DBG_PRINTLN("Attempting NEC decode"); - if (decodeNEC(results)) return true ; + DBG_PRINTLN("Attempting NEC decode"); + if (decodeNEC(results)) return true ; #endif #ifdef DECODE_SONY - DBG_PRINTLN("Attempting Sony decode"); - if (decodeSony(results)) return true ; + DBG_PRINTLN("Attempting Sony decode"); + if (decodeSony(results)) return true ; #endif #ifdef DECODE_SANYO - DBG_PRINTLN("Attempting Sanyo decode"); - if (decodeSanyo(results)) return true ; + DBG_PRINTLN("Attempting Sanyo decode"); + if (decodeSanyo(results)) return true ; #endif #ifdef DECODE_MITSUBISHI - DBG_PRINTLN("Attempting Mitsubishi decode"); - if (decodeMitsubishi(results)) return true ; + DBG_PRINTLN("Attempting Mitsubishi decode"); + if (decodeMitsubishi(results)) return true ; #endif #ifdef DECODE_RC5 - DBG_PRINTLN("Attempting RC5 decode"); - if (decodeRC5(results)) return true ; + DBG_PRINTLN("Attempting RC5 decode"); + if (decodeRC5(results)) return true ; #endif #ifdef DECODE_RC6 - DBG_PRINTLN("Attempting RC6 decode"); - if (decodeRC6(results)) return true ; + DBG_PRINTLN("Attempting RC6 decode"); + if (decodeRC6(results)) return true ; #endif #ifdef DECODE_PANASONIC - DBG_PRINTLN("Attempting Panasonic decode"); - if (decodePanasonic(results)) return true ; + DBG_PRINTLN("Attempting Panasonic decode"); + if (decodePanasonic(results)) return true ; #endif #ifdef DECODE_LG - DBG_PRINTLN("Attempting LG decode"); - if (decodeLG(results)) return true ; + DBG_PRINTLN("Attempting LG decode"); + if (decodeLG(results)) return true ; #endif #ifdef DECODE_JVC - DBG_PRINTLN("Attempting JVC decode"); - if (decodeJVC(results)) return true ; + DBG_PRINTLN("Attempting JVC decode"); + if (decodeJVC(results)) return true ; #endif #ifdef DECODE_SAMSUNG - DBG_PRINTLN("Attempting SAMSUNG decode"); - if (decodeSAMSUNG(results)) return true ; + DBG_PRINTLN("Attempting SAMSUNG decode"); + if (decodeSAMSUNG(results)) return true ; #endif #ifdef DECODE_WHYNTER - DBG_PRINTLN("Attempting Whynter decode"); - if (decodeWhynter(results)) return true ; + DBG_PRINTLN("Attempting Whynter decode"); + if (decodeWhynter(results)) return true ; #endif #ifdef AIWA_RC_T501 - DBG_PRINTLN("Attempting Aiwa RC-T501 decode"); - if (decodeAiwaRCT501(results)) return true ; + DBG_PRINTLN("Attempting Aiwa RC-T501 decode"); + if (decodeAiwaRCT501(results)) return true ; #endif - // decodeHash returns a hash on any input. - // Thus, it needs to be last in the list. - // If you add any decodes, add them before this. - if (decodeHash(results)) return true ; - // Throw away and start over - resume(); - return false; + // decodeHash returns a hash on any input. + // Thus, it needs to be last in the list. + // If you add any decodes, add them before this. + if (decodeHash(results)) return true ; + // Throw away and start over + resume(); + return false; } -//+============================================================================= -#ifdef DECODE_SONY -long IRrecv::decodeSony (decode_results *results) -{ - long data = 0; - if (irparams.rawlen < 2 * SONY_BITS + 2) return false ; - int offset = 0; // Dont skip first space, check its size - // Some Sony's deliver repeats fast after first - // unfortunately can't spot difference from of repeat from two fast clicks - if (results->rawbuf[offset] < SONY_DOUBLE_SPACE_USECS) { - // Serial.print("IR Gap found: "); - results->bits = 0; - results->value = REPEAT; -# ifdef DECODE_SANYO - results->decode_type = SANYO; -# else - results->decode_type = UNKNOWN; -# endif - return true; - } - offset++; - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SONY_HDR_MARK)) return false ; - offset++; - while (offset + 1 < irparams.rawlen) { - if (!MATCH_SPACE(results->rawbuf[offset], SONY_HDR_SPACE)) break ; - offset++; - if (MATCH_MARK(results->rawbuf[offset], SONY_ONE_MARK)) data = (data << 1) | 1 ; - else if (MATCH_MARK(results->rawbuf[offset], SONY_ZERO_MARK)) data <<= 1 ; - else return false ; - offset++; - } - // Success - results->bits = (offset - 1) / 2; - if (results->bits < 12) { - results->bits = 0; - return false; - } - results->value = data; - results->decode_type = SONY; - return true; -} -#endif -//+============================================================================= -#ifdef DECODE_WHYNTER -long IRrecv::decodeWhynter (decode_results *results) -{ - long data = 0; - if (irparams.rawlen < 2 * WHYNTER_BITS + 6) return false ; - int offset = 1; // skip initial space - // sequence begins with a bit mark and a zero space - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; - offset++; - if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_ZERO_SPACE)) return false ; - offset++; - - // header mark and space - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_HDR_MARK)) return false ; - offset++; - if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_HDR_SPACE)) return false ; - offset++; - - // data bits - for (int i = 0; i < WHYNTER_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; - offset++; - - if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset],WHYNTER_ZERO_SPACE)) data <<= 1 ; - else return false ; - offset++; - } - - // trailing mark - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; - - // Success - results->bits = WHYNTER_BITS; - results->value = data; - results->decode_type = WHYNTER; - return true; -} -#endif - -//+============================================================================= -// I think this is a Sanyo decoder - serial = SA 8650B -// Looks like Sony except for timings, 48 chars of data and time/space different -// -#ifdef DECODE_SANYO -long IRrecv::decodeSanyo (decode_results *results) -{ - long data = 0; - if (irparams.rawlen < 2 * SANYO_BITS + 2) return false ; - int offset = 0; // Skip first space - // Initial space - -#if 0 - // Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay - Serial.print("IR Gap: "); - Serial.println( results->rawbuf[offset]); - Serial.println( "test against:"); - Serial.println(results->rawbuf[offset]); -#endif - - if (results->rawbuf[offset] < SANYO_DOUBLE_SPACE_USECS) { - // Serial.print("IR Gap found: "); - results->bits = 0; - results->value = REPEAT; - results->decode_type = SANYO; - return true; - } - offset++; - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; - offset++; - - // Skip Second Mark - if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; - offset++; - - while (offset + 1 < irparams.rawlen) { - if (!MATCH_SPACE(results->rawbuf[offset], SANYO_HDR_SPACE)) break ; - offset++; - if (MATCH_MARK(results->rawbuf[offset], SANYO_ONE_MARK)) data = (data << 1) | 1 ; - else if (MATCH_MARK(results->rawbuf[offset], SANYO_ZERO_MARK)) data <<= 1 ; - else return false ; - offset++; - } - - // Success - results->bits = (offset - 1) / 2; - if (results->bits < 12) { - results->bits = 0; - return false; - } - - results->value = data; - results->decode_type = SANYO; - return true; -} -#endif //+============================================================================= // Looks like Sony except for timings, 48 chars of data and time/space different // + +#define MITSUBISHI_BITS 16 + +// Mitsubishi RM 75501 +// 14200 7 41 7 42 7 42 7 17 7 17 7 18 7 41 7 18 7 17 7 17 7 18 7 41 8 17 7 17 7 18 7 17 7 +// #define MITSUBISHI_HDR_MARK 250 // seen range 3500 +#define MITSUBISHI_HDR_SPACE 350 // 7*50+100 +#define MITSUBISHI_ONE_MARK 1950 // 41*50-100 +#define MITSUBISHI_ZERO_MARK 750 // 17*50-100 +// #define MITSUBISHI_DOUBLE_SPACE_USECS 800 // usually ssee 713 - not using ticks as get number wrapround +// #define MITSUBISHI_RPT_LENGTH 45000 + #ifdef DECODE_MITSUBISHI long IRrecv::decodeMitsubishi (decode_results *results) { @@ -957,241 +1427,6 @@ int IRrecv::getRClevel (decode_results *results, int *offset, int *used, int return val; } -//+============================================================================= -#ifdef DECODE_RC5 -long IRrecv::decodeRC5 (decode_results *results) -{ - if (irparams.rawlen < MIN_RC5_SAMPLES + 2) return false ; - int offset = 1; // Skip gap space - long data = 0; - int used = 0; - // Get start bits - if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; - if (getRClevel(results, &offset, &used, RC5_T1) != SPACE) return false ; - if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; - int nbits; - for (nbits = 0; offset < irparams.rawlen; nbits++) { - int levelA = getRClevel(results, &offset, &used, RC5_T1); - int levelB = getRClevel(results, &offset, &used, RC5_T1); - - if (levelA == SPACE && levelB == MARK) data = (data << 1) | 1 ; // 1 bit - else if (levelA == MARK && levelB == SPACE) data <<= 1 ; // zero bit - else return false ; - } - - // Success - results->bits = nbits; - results->value = data; - results->decode_type = RC5; - return true; -} -#endif - -//+============================================================================= -#ifdef DECODE_RC6 -long IRrecv::decodeRC6 (decode_results *results) -{ - if (results->rawlen < MIN_RC6_SAMPLES) return false ; - int offset = 1; // Skip first space - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], RC6_HDR_MARK)) return false ; - offset++; - - if (!MATCH_SPACE(results->rawbuf[offset], RC6_HDR_SPACE)) return false ; - offset++; - - long data = 0; - int used = 0; - - // Get start bit (1) - if (getRClevel(results, &offset, &used, RC6_T1) != MARK) return false ; - if (getRClevel(results, &offset, &used, RC6_T1) != SPACE) return false ; - int nbits; - for (nbits = 0; offset < results->rawlen; nbits++) { - int levelA, levelB; // Next two levels - levelA = getRClevel(results, &offset, &used, RC6_T1); - if (nbits == 3) { - // T bit is double wide; make sure second half matches - if (levelA != getRClevel(results, &offset, &used, RC6_T1)) return false; - } - levelB = getRClevel(results, &offset, &used, RC6_T1); - if (nbits == 3) { - // T bit is double wide; make sure second half matches - if (levelB != getRClevel(results, &offset, &used, RC6_T1)) return false; - } - if (levelA == MARK && levelB == SPACE) data = (data << 1) | 1 ; // 1-bit (reversed compared to RC5) - else if (levelA == SPACE && levelB == MARK) data <<= 1 ; // zero bit - else return false ; // Error - } - - // Success - results->bits = nbits; - results->value = data; - results->decode_type = RC6; - return true; -} -#endif - -//+============================================================================= -#ifdef DECODE_PANASONIC -long IRrecv::decodePanasonic (decode_results *results) -{ - unsigned long long data = 0; - int offset = 1; - - if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) return false ; - offset++; - if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_SPACE)) return false ; - offset++; - - // decode address - for (int i = 0; i < PANASONIC_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_BIT_MARK)) return false ; - - if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ZERO_SPACE)) data <<= 1 ; - else return false ; - offset++; - } - - results->value = (unsigned long)data; - results->panasonicAddress = (unsigned int)(data >> 32); - results->decode_type = PANASONIC; - results->bits = PANASONIC_BITS; - - return true; -} -#endif - -//+============================================================================= -#ifdef DECODE_LG -long IRrecv::decodeLG (decode_results *results) -{ - long data = 0; - int offset = 1; // Skip first space - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], LG_HDR_MARK)) return false ; - offset++; - if (irparams.rawlen < 2 * LG_BITS + 1 ) return false ; - // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], LG_HDR_SPACE)) return false ; - offset++; - for (int i = 0; i < LG_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; - offset++; - if (MATCH_SPACE(results->rawbuf[offset], LG_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], LG_ZERO_SPACE)) data <<= 1 ; - else return false ; - offset++; - } - - // Stop bit - if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; - - // Success - results->bits = LG_BITS; - results->value = data; - results->decode_type = LG; - return true; -} -#endif - -//+============================================================================= -#ifdef DECODE_JVC -long IRrecv::decodeJVC (decode_results *results) -{ - long data = 0; - int offset = 1; // Skip first space - - // Check for repeat - if (irparams.rawlen - 1 == 33 && - MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK) && - MATCH_MARK(results->rawbuf[irparams.rawlen-1], JVC_BIT_MARK)) { - results->bits = 0; - results->value = REPEAT; - results->decode_type = JVC; - return true; - } - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], JVC_HDR_MARK)) return false ; - offset++; - - if (irparams.rawlen < 2 * JVC_BITS + 1 ) return false ; - - // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) return false ; - offset++; - - for (int i = 0; i < JVC_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return false ; - offset++; - if (MATCH_SPACE(results->rawbuf[offset], JVC_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], JVC_ZERO_SPACE)) data <<= 1 ; - else return false ; - offset++; - } - - // Stop bit - if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return false ; - - // Success - results->bits = JVC_BITS; - results->value = data; - results->decode_type = JVC; - - return true; -} -#endif - -//+============================================================================= -// SAMSUNGs have a repeat only 4 items long -// -#ifdef DECODE_SAMSUNG -long IRrecv::decodeSAMSUNG (decode_results *results) -{ - long data = 0; - int offset = 1; // Skip first space - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_HDR_MARK)) return false ; - offset++; - - // Check for repeat - if (irparams.rawlen == 4 && - MATCH_SPACE(results->rawbuf[offset], SAMSUNG_RPT_SPACE) && - MATCH_MARK(results->rawbuf[offset+1], SAMSUNG_BIT_MARK)) { - results->bits = 0; - results->value = REPEAT; - results->decode_type = SAMSUNG; - return true; - } - if (irparams.rawlen < 2 * SAMSUNG_BITS + 4) return false ; - - // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) return false ; - offset++; - - for (int i = 0; i < SAMSUNG_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_BIT_MARK)) return false ; - - offset++; - - if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ZERO_SPACE)) data <<= 1 ; - else return false ; - offset++; - } - - // Success - results->bits = SAMSUNG_BITS; - results->value = data; - results->decode_type = SAMSUNG; - return true; -} -#endif //+============================================================================= // Aiwa system @@ -1308,8 +1543,18 @@ long IRrecv::decodeHash (decode_results *results) // i.e. use 0x1C10 instead of 0x0000000000001C10 which is listed in the // linked LIRC file. // + +#define SHARP_BITS 15 + +#define SHARP_BIT_MARK 245 +#define SHARP_ONE_SPACE 1805 +#define SHARP_ZERO_SPACE 795 +#define SHARP_GAP 600000 +#define SHARP_TOGGLE_MASK 0x3FF +#define SHARP_RPT_SPACE 3000 + #ifdef SEND_SHARP -void IRsend::sendSharp (unsigned long data, int nbits) +void IRsend::sendSharpRaw (unsigned long data, int nbits) { unsigned long invertdata = data ^ SHARP_TOGGLE_MASK; enableIROut(38); @@ -1346,6 +1591,16 @@ void IRsend::sendSharp (unsigned int address, unsigned int command) #endif //+============================================================================= +#define DISH_BITS 16 + +#define DISH_HDR_MARK 400 +#define DISH_HDR_SPACE 6100 +#define DISH_BIT_MARK 400 +#define DISH_ONE_SPACE 1700 +#define DISH_ZERO_SPACE 2800 +#define DISH_RPT_SPACE 6200 +#define DISH_TOP_BIT 0x8000 + #ifdef SEND_DISH void IRsend::sendDISH (unsigned long data, int nbits) { @@ -1356,7 +1611,7 @@ void IRsend::sendDISH (unsigned long data, int nbits) space(DISH_HDR_SPACE); for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mark) { + if (data & mask) { mark(DISH_BIT_MARK); space(DISH_ONE_SPACE); } else { @@ -1367,52 +1622,3 @@ void IRsend::sendDISH (unsigned long data, int nbits) } #endif -//+============================================================================= -// Aiwa system -// Remote control RC-T501 -// Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 -// -#ifdef SEND_AIWA_RC_T501 -void IRsend::sendAiwaRCT501 (int code) -{ - // PRE-DATA, 26 bits, 0x227EEC0 - unsigned long pre = 0x227EEC0; - int mask; - - // Set IR carrier frequency - enableIROut(AIWA_RC_T501_HZ); - - // HDR mark + HDR space - mark(AIWA_RC_T501_HDR_MARK); - space(AIWA_RC_T501_HDR_SPACE); - - // Send pre-data - for (unsigned long mask = 1 << (26 - 1); mask; mask >>= 1) { - mark(AIWA_RC_T501_BIT_MARK); - if (pre & mask) space(AIWA_RC_T501_ONE_SPACE) ; - else space(AIWA_RC_T501_ZERO_SPACE) ; - } - -//-v- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! -// it only send 15bits and ignores the top bit -// then uses TOPBIT which is bit-31 to check the bit code -// I suspect TOPBIT should be changed to 0x00008000 - // Skip firts code bit - code <<= 1; - // Send code - for (i = 0; i < 15; i++) { - mark(AIWA_RC_T501_BIT_MARK); - if (code & TOPBIT) space(AIWA_RC_T501_ONE_SPACE) ; - else space(AIWA_RC_T501_ZERO_SPACE) ; - code <<= 1; - } -//-^- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! - - // POST-DATA, 1 bit, 0x0 - mark(AIWA_RC_T501_BIT_MARK); - space(AIWA_RC_T501_ZERO_SPACE); - - mark(AIWA_RC_T501_BIT_MARK); - space(0); -} -#endif diff --git a/IRremote.h b/IRremote.h index 654fc7f..13b0d9b 100644 --- a/IRremote.h +++ b/IRremote.h @@ -26,22 +26,23 @@ // #define TEST enum decode_type_t { - NEC = 1, - SONY = 2, - RC5 = 3, - RC6 = 4, - DISH = 5, - SHARP = 6, - PANASONIC = 7, - JVC = 8, - SANYO = 9, - MITSUBISHI = 10, - SAMSUNG = 11, - LG = 12, - WHYNTER = 13, - AIWA_RC_T501 = 14, + UNKNOWN = -1, + UNUSED = 0, + NEC = 1, + SONY = 2, + RC5 = 3, + RC6 = 4, + DISH = 5, + SHARP = 6, + PANASONIC = 7, + JVC = 8, + SANYO = 9, + MITSUBISHI = 10, + SAMSUNG = 11, + LG = 12, + WHYNTER = 13, + AIWA_RC_T501 = 14, - UNKNOWN = -1 }; // Results returned from the decoder @@ -58,20 +59,6 @@ public: int rawlen; // Number of records in rawbuf. }; -// Send types -#define IRsendNEC -#define IRsendSONY -#define IRsendRC5 -#define IRsendRC6 -#define IRsendDISH -#define IRsendSHARP -#define IRsendPANASONIC -#define IRsendJVC -#define IRsendSANYO -#define IRsendMITSUBISHI -#define IRsendSAMSUNG -#define IRsendRAW - // Decoded value for NEC when a repeat code is received #define REPEAT 0xffffffff @@ -152,24 +139,21 @@ public: #ifdef SEND_WHYNTER void sendWhynter(unsigned long data, int nbits); #endif -#ifdef SEND_NEC +#ifdef SEND_NEC void sendNEC(unsigned long data, int nbits); #endif -#ifdef SEND_SONY +#ifdef SEND_SONY void sendSony(unsigned long data, int nbits); // Neither Sanyo nor Mitsubishi send is implemented yet // void sendSanyo(unsigned long data, int nbits); // void sendMitsubishi(unsigned long data, int nbits); #endif -#ifdef SEND_DISH +#ifdef SEND_DISH void sendDISH(unsigned long data, int nbits); #endif #ifdef SEND_SHARP - void sendSharp(unsigned int address, unsigned int command); void sendSharpRaw(unsigned long data, int nbits); -#endif -#ifdef SEND_IRsendSHARP - void sendSharp(unsigned long data, int nbits); + void sendSharp(unsigned int address, unsigned int command); #endif #ifdef SEND_PANASONIC void sendPanasonic(unsigned int address, unsigned long data); @@ -180,7 +164,7 @@ public: #ifdef SEND_AIWA_RC_T501 void sendAiwaRCT501(int code); #endif -#ifdef SEND_SAMSUNG +#ifdef SEND_SAMSUNG void sendSAMSUNG(unsigned long data, int nbits); #endif void enableIROut(int khz); diff --git a/IRremoteInt.h b/IRremoteInt.h index 32281f8..fa5e31a 100644 --- a/IRremoteInt.h +++ b/IRremoteInt.h @@ -95,118 +95,27 @@ // Pulse parms are *50-100 for the Mark and *50+100 for the space // First MARK is the one after the long gap // pulse parameters in usec -#define WHYNTER_HDR_MARK 2850 -#define WHYNTER_HDR_SPACE 2850 -#define WHYNTER_BIT_MARK 750 -#define WHYNTER_ONE_MARK 750 -#define WHYNTER_ONE_SPACE 2150 -#define WHYNTER_ZERO_MARK 750 -#define WHYNTER_ZERO_SPACE 750 - -#define NEC_HDR_MARK 9000 -#define NEC_HDR_SPACE 4500 -#define NEC_BIT_MARK 560 -#define NEC_ONE_SPACE 1690 -#define NEC_ZERO_SPACE 560 -#define NEC_RPT_SPACE 2250 - -#define SONY_HDR_MARK 2400 -#define SONY_HDR_SPACE 600 -#define SONY_ONE_MARK 1200 -#define SONY_ZERO_MARK 600 -#define SONY_RPT_LENGTH 45000 -#define SONY_DOUBLE_SPACE_USECS 500 // usually ssee 713 - not using ticks as get number wrapround - -// SA 8650B -#define SANYO_HDR_MARK 3500 // seen range 3500 -#define SANYO_HDR_SPACE 950 // seen 950 -#define SANYO_ONE_MARK 2400 // seen 2400 -#define SANYO_ZERO_MARK 700 // seen 700 -#define SANYO_DOUBLE_SPACE_USECS 800 // usually ssee 713 - not using ticks as get number wrapround -#define SANYO_RPT_LENGTH 45000 - -// Mitsubishi RM 75501 -// 14200 7 41 7 42 7 42 7 17 7 17 7 18 7 41 7 18 7 17 7 17 7 18 7 41 8 17 7 17 7 18 7 17 7 - -// #define MITSUBISHI_HDR_MARK 250 // seen range 3500 -#define MITSUBISHI_HDR_SPACE 350 // 7*50+100 -#define MITSUBISHI_ONE_MARK 1950 // 41*50-100 -#define MITSUBISHI_ZERO_MARK 750 // 17*50-100 -// #define MITSUBISHI_DOUBLE_SPACE_USECS 800 // usually ssee 713 - not using ticks as get number wrapround -// #define MITSUBISHI_RPT_LENGTH 45000 -#define RC5_T1 889 -#define RC5_RPT_LENGTH 46000 - -#define RC6_HDR_MARK 2666 -#define RC6_HDR_SPACE 889 -#define RC6_T1 444 -#define RC6_RPT_LENGTH 46000 - -#define SHARP_BIT_MARK 245 -#define SHARP_ONE_SPACE 1805 -#define SHARP_ZERO_SPACE 795 -#define SHARP_GAP 600000 -#define SHARP_TOGGLE_MASK 0x3FF -#define SHARP_RPT_SPACE 3000 - -#define DISH_HDR_MARK 400 -#define DISH_HDR_SPACE 6100 -#define DISH_BIT_MARK 400 -#define DISH_ONE_SPACE 1700 -#define DISH_ZERO_SPACE 2800 -#define DISH_RPT_SPACE 6200 -#define DISH_TOP_BIT 0x8000 - -#define PANASONIC_HDR_MARK 3502 -#define PANASONIC_HDR_SPACE 1750 -#define PANASONIC_BIT_MARK 502 -#define PANASONIC_ONE_SPACE 1244 -#define PANASONIC_ZERO_SPACE 400 - -#define JVC_HDR_MARK 8000 -#define JVC_HDR_SPACE 4000 -#define JVC_BIT_MARK 600 -#define JVC_ONE_SPACE 1600 -#define JVC_ZERO_SPACE 550 -#define JVC_RPT_LENGTH 60000 - -#define LG_HDR_MARK 8000 -#define LG_HDR_SPACE 4000 -#define LG_BIT_MARK 600 -#define LG_ONE_SPACE 1600 -#define LG_ZERO_SPACE 550 -#define LG_RPT_LENGTH 60000 - -#define SAMSUNG_HDR_MARK 5000 -#define SAMSUNG_HDR_SPACE 5000 -#define SAMSUNG_BIT_MARK 560 -#define SAMSUNG_ONE_SPACE 1600 -#define SAMSUNG_ZERO_SPACE 560 -#define SAMSUNG_RPT_SPACE 2250 -#define SHARP_BITS 15 -#define DISH_BITS 16 -// AIWA RC T501 -// Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 -#define AIWA_RC_T501_HZ 38 -#define AIWA_RC_T501_BITS 15 -#define AIWA_RC_T501_PRE_BITS 26 -#define AIWA_RC_T501_POST_BITS 1 -#define AIWA_RC_T501_SUM_BITS AIWA_RC_T501_PRE_BITS+AIWA_RC_T501_BITS+AIWA_RC_T501_POST_BITS -#define AIWA_RC_T501_HDR_MARK 8800 -#define AIWA_RC_T501_HDR_SPACE 4500 -#define AIWA_RC_T501_BIT_MARK 500 -#define AIWA_RC_T501_ONE_SPACE 600 -#define AIWA_RC_T501_ZERO_SPACE 1700 + + + + + + + + + + + #define TOLERANCE 25 // percent tolerance in measurements -#define LTOL (1.0 - TOLERANCE/100.) -#define UTOL (1.0 + TOLERANCE/100.) +#define LTOL (1.0 - TOLERANCE/100.) +#define UTOL (1.0 + TOLERANCE/100.) #define _GAP 5000 // Minimum map between transmissions #define GAP_TICKS (_GAP/USECPERTICK) @@ -228,7 +137,7 @@ typedef struct { unsigned int timer; // state timer, counts 50uS ticks. unsigned int rawbuf[RAWBUF]; // raw data uint8_t rawlen; // counter of entries in rawbuf -} +} irparams_t; // Defined in IRremote.cpp @@ -240,21 +149,6 @@ extern volatile irparams_t irparams; #define TOPBIT 0x80000000 -#define NEC_BITS 32 -#define SONY_BITS 12 -#define SANYO_BITS 12 -#define MITSUBISHI_BITS 16 -#define MIN_RC5_SAMPLES 11 -#define MIN_RC6_SAMPLES 1 -#define PANASONIC_BITS 48 -#define JVC_BITS 16 -#define LG_BITS 28 -#define SAMSUNG_BITS 32 -#define WHYNTER_BITS 32 - - - - // defines for timer2 (8 bits) #if defined(IR_USE_TIMER2) #define TIMER_RESET From 88e243fe068e06d2ed602fefe6bd5effd07006e1 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 04:29:28 +0100 Subject: [PATCH 11/31] Broken the source in to manageable chunks - 2KLOC files are not fun to debug! Utterly failed to reduce the MARK_?? functions back down to MACROs - every time I try, the decoders start failing ...However, I have found a considerable number of bugs in the toolchain, so I'm starting to wonder if the fault is not mine. --- IRremote.cpp | 1636 ++------------------------------------------- IRremote.h | 47 +- IRremoteInt.h | 8 +- irISR.cpp | 76 +++ irRecv.cpp | 195 ++++++ irSend.cpp | 66 ++ ir_Aiwa.cpp | 108 +++ ir_Dish.cpp | 55 ++ ir_JVC.cpp | 97 +++ ir_LG.cpp | 54 ++ ir_Mitsubishi.cpp | 85 +++ ir_NEC.cpp | 98 +++ ir_Panasonic.cpp | 80 +++ ir_RC5_RC6.cpp | 196 ++++++ ir_Samsung.cpp | 94 +++ ir_Sanyo.cpp | 79 +++ ir_Sharp.cpp | 71 ++ ir_Sony.cpp | 95 +++ ir_Whynter.cpp | 96 +++ 19 files changed, 1644 insertions(+), 1592 deletions(-) create mode 100644 irISR.cpp create mode 100644 irRecv.cpp create mode 100644 irSend.cpp create mode 100644 ir_Aiwa.cpp create mode 100644 ir_Dish.cpp create mode 100644 ir_JVC.cpp create mode 100644 ir_LG.cpp create mode 100644 ir_Mitsubishi.cpp create mode 100644 ir_NEC.cpp create mode 100644 ir_Panasonic.cpp create mode 100644 ir_RC5_RC6.cpp create mode 100644 ir_Samsung.cpp create mode 100644 ir_Sanyo.cpp create mode 100644 ir_Sharp.cpp create mode 100644 ir_Sony.cpp create mode 100644 ir_Whynter.cpp diff --git a/IRremote.cpp b/IRremote.cpp index bce7b37..534ae66 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -1,29 +1,3 @@ -#define SEND_NEC -#define DECODE_NEC -#define SEND_WHYNTER -#define DECODE_WHYNTER -#define SEND_SONY -#define DECODE_SONY -#define DECODE_SANYO -#define SEND_RC5 -#define DECODE_RC5 -#define SEND_RC6 -#define DECODE_RC6 -#define SEND_PANASONIC -#define DECODE_PANASONIC -#define SEND_JVC -#define DECODE_JVC -#define SEND_SAMSUNG -#define DECODE_SAMSUNG -#define DECODE_LG -#define SEND_AIWA_RC_T501 -#define DECODE_MITSUBISHI -#define DECODE_AIWA_RC_T501 -#define SEND_SHARP -#define SEND_DISH - - - //****************************************************************************** // IRremote // Version 0.11 August, 2009 @@ -44,1581 +18,63 @@ // Whynter A/C ARC-110WD added by Francesco Meschia //****************************************************************************** -#include "IRremote.h" -#include "IRremoteInt.h" - -// Provides ISR -#include +// Defining IR_GLOBAL here allows us to declare the instantiation of global variables +#define IR_GLOBAL +# include "IRremote.h" +# include "IRremoteInt.h" +#undef IR_GLOBAL //------------------------------------------------------------------------------ -// Debug directives -#ifdef DEBUG -# define DBG_PRINTLN(s) Serial.println(s); -#else -# define DBG_PRINTLN(s) -#endif - -//------------------------------------------------------------------------------ -volatile irparams_t irparams; - // These versions of MATCH, MATCH_MARK, and MATCH_SPACE are only for debugging. -// To use them, set DEBUG in IRremoteInt.h -// Normally macros are used for efficiency -#ifdef DEBUG +// To use them, set DEBUG to 1 in IRremoteInt.h +// (Normally macros are used for efficiency) +// ...but every time i reduce these functions down to macros, the decoders stop working!!?? + +//+============================================================================= int MATCH (int measured, int desired) { - Serial.print("Testing: "); - Serial.print(TICKS_LOW(desired), DEC); - Serial.print(" <= "); - Serial.print(measured, DEC); - Serial.print(" <= "); - Serial.println(TICKS_HIGH(desired), DEC); - return measured >= TICKS_LOW(desired) && measured <= TICKS_HIGH(desired); + DBG_PRINT("Testing: "); + DBG_PRINT(TICKS_LOW(desired), DEC); + DBG_PRINT(" <= "); + DBG_PRINT(measured, DEC); + DBG_PRINT(" <= "); + DBG_PRINTLN(TICKS_HIGH(desired), DEC); + + return ((measured >= TICKS_LOW(desired)) && (measured <= TICKS_HIGH(desired))); } +//+============================================================================= int MATCH_MARK (int measured_ticks, int desired_us) { - Serial.print("Testing mark "); - Serial.print(measured_ticks * USECPERTICK, DEC); - Serial.print(" vs "); - Serial.print(desired_us, DEC); - Serial.print(": "); - Serial.print(TICKS_LOW(desired_us + MARK_EXCESS), DEC); - Serial.print(" <= "); - Serial.print(measured_ticks, DEC); - Serial.print(" <= "); - Serial.println(TICKS_HIGH(desired_us + MARK_EXCESS), DEC); - return measured_ticks >= TICKS_LOW(desired_us + MARK_EXCESS) && measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS); + DBG_PRINT("Testing mark "); + DBG_PRINT(measured_ticks * USECPERTICK, DEC); + DBG_PRINT(" vs "); + DBG_PRINT(desired_us, DEC); + DBG_PRINT(": "); + DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS), DEC); + DBG_PRINT(" <= "); + DBG_PRINT(measured_ticks, DEC); + DBG_PRINT(" <= "); + DBG_PRINTLN(TICKS_HIGH(desired_us + MARK_EXCESS), DEC); + + return ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS)) + && (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS))); } +//+============================================================================= int MATCH_SPACE (int measured_ticks, int desired_us) { - Serial.print("Testing space "); - Serial.print(measured_ticks * USECPERTICK, DEC); - Serial.print(" vs "); - Serial.print(desired_us, DEC); - Serial.print(": "); - Serial.print(TICKS_LOW(desired_us - MARK_EXCESS), DEC); - Serial.print(" <= "); - Serial.print(measured_ticks, DEC); - Serial.print(" <= "); - Serial.println(TICKS_HIGH(desired_us - MARK_EXCESS), DEC); - return measured_ticks >= TICKS_LOW(desired_us - MARK_EXCESS) && measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS); + DBG_PRINT("Testing space "); + DBG_PRINT(measured_ticks * USECPERTICK, DEC); + DBG_PRINT(" vs "); + DBG_PRINT(desired_us, DEC); + DBG_PRINT(": "); + DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS), DEC); + DBG_PRINT(" <= "); + DBG_PRINT(measured_ticks, DEC); + DBG_PRINT(" <= "); + DBG_PRINTLN(TICKS_HIGH(desired_us - MARK_EXCESS), DEC); + + return ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS)) + && (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS))); } - -#else - -int MATCH (int measured, int desired) -{ - return measured >= TICKS_LOW(desired) && measured <= TICKS_HIGH(desired); -} - -int MATCH_MARK (int measured_ticks, int desired_us) -{ - return MATCH(measured_ticks, (desired_us + MARK_EXCESS)); -} - -int MATCH_SPACE (int measured_ticks, int desired_us) -{ - return MATCH(measured_ticks, (desired_us - MARK_EXCESS)); -} - -#endif - -//+============================================================================= -// RRRR AAA W W -// R R A A W W -// RRRR AAAAA W W W -// R R A A W W W -// R R A A WWW -// -void IRsend::sendRaw (unsigned int buf[], int len, int hz) -{ - // Set IR carrier frequency - enableIROut(hz); - - for (int i = 0; i < len; i++) { - if (i & 1) space(buf[i]) ; - else mark (buf[i]) ; - } - - space(0); // Always end with the LED off -} - -//+============================================================================= -// N N EEEEE CCCC -// NN N E C -// N N N EEE C -// N NN E C -// N N EEEEE CCCC -// -#define NEC_BITS 32 -#define NEC_HDR_MARK 9000 -#define NEC_HDR_SPACE 4500 -#define NEC_BIT_MARK 560 -#define NEC_ONE_SPACE 1690 -#define NEC_ZERO_SPACE 560 -#define NEC_RPT_SPACE 2250 - -#ifdef SEND_NEC -void IRsend::sendNEC (unsigned long data, int nbits) -{ - // Set IR carrier frequency - enableIROut(38); - - // Header - mark(NEC_HDR_MARK); - space(NEC_HDR_SPACE); - - // Data - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(NEC_BIT_MARK); - space(NEC_ONE_SPACE); - } else { - mark(NEC_BIT_MARK); - space(NEC_ZERO_SPACE); - } - } - - // Footer - mark(NEC_BIT_MARK); - space(0); // Always end with the LED off -} -#endif - -//+======================================================== -// NECs have a repeat only 4 items long -// -#ifdef DECODE_NEC -long IRrecv::decodeNEC (decode_results *results) -{ - long data = 0; // We decode in to here; Start with nothing - int offset = 1; // Index in to results; Skip first entry!? - - // Check header "mark" - if (!MATCH_MARK(results->rawbuf[offset], NEC_HDR_MARK)) return false ; - offset++; - - // Check for repeat - if ( (irparams.rawlen == 4) - && MATCH_SPACE(results->rawbuf[offset ], NEC_RPT_SPACE) - && MATCH_MARK (results->rawbuf[offset+1], NEC_BIT_MARK ) - ) { - results->bits = 0; - results->value = REPEAT; - results->decode_type = NEC; - return true; - } - - // Check we have enough data - if (irparams.rawlen < (2 * NEC_BITS) + 4) return false ; - - // Check header "space" - if (!MATCH_SPACE(results->rawbuf[offset], NEC_HDR_SPACE)) return false ; - offset++; - - // Build the data - for (int i = 0; i < NEC_BITS; i++) { - // Check data "mark" - if (!MATCH_MARK(results->rawbuf[offset], NEC_BIT_MARK)) return false ; - offset++; - // Suppend this bit - if (MATCH_SPACE(results->rawbuf[offset], NEC_ONE_SPACE )) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], NEC_ZERO_SPACE)) data = (data << 1) | 0 ; - else return false ; - offset++; - } - - // Success - results->bits = NEC_BITS; - results->value = data; - results->decode_type = NEC; - - return true; -} -#endif - -//+============================================================================= -// W W H H Y Y N N TTTTT EEEEE RRRRR -// W W H H Y Y NN N T E R R -// W W W HHHHH Y N N N T EEE RRRR -// W W W H H Y N NN T E R R -// WWW H H Y N N T EEEEE R R -// -#define WHYNTER_BITS 32 -#define WHYNTER_HDR_MARK 2850 -#define WHYNTER_HDR_SPACE 2850 -#define WHYNTER_BIT_MARK 750 -#define WHYNTER_ONE_MARK 750 -#define WHYNTER_ONE_SPACE 2150 -#define WHYNTER_ZERO_MARK 750 -#define WHYNTER_ZERO_SPACE 750 - -#ifdef SEND_WHYNTER -void IRsend::sendWhynter (unsigned long data, int nbits) -{ - // Set IR carrier frequency - enableIROut(38); - - // Start - mark(WHYNTER_ZERO_MARK); - space(WHYNTER_ZERO_SPACE); - - // Header - mark(WHYNTER_HDR_MARK); - space(WHYNTER_HDR_SPACE); - - // Data - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(WHYNTER_ONE_MARK); - space(WHYNTER_ONE_SPACE); - } else { - mark(WHYNTER_ZERO_MARK); - space(WHYNTER_ZERO_SPACE); - } - } - - // Footer - mark(WHYNTER_ZERO_MARK); - space(WHYNTER_ZERO_SPACE); // Always end with the LED off -} -#endif - -//+======================================================== -#ifdef DECODE_WHYNTER -long IRrecv::decodeWhynter (decode_results *results) -{ - long data = 0; - - if (irparams.rawlen < 2 * WHYNTER_BITS + 6) return false ; - - int offset = 1; // skip initial space - - // sequence begins with a bit mark and a zero space - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; - offset++; - if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_ZERO_SPACE)) return false ; - offset++; - - // header mark and space - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_HDR_MARK)) return false ; - offset++; - if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_HDR_SPACE)) return false ; - offset++; - - // data bits - for (int i = 0; i < WHYNTER_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; - offset++; - - if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset],WHYNTER_ZERO_SPACE)) data <<= 1 ; - else return false ; - offset++; - } - - // trailing mark - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; - - // Success - results->bits = WHYNTER_BITS; - results->value = data; - results->decode_type = WHYNTER; - return true; -} -#endif - -//+============================================================================= -// SSSS OOO N N Y Y -// S O O NN N Y Y -// SSS O O N N N Y -// S O O N NN Y -// SSSS OOO N N Y -// -#define SONY_BITS 12 -#define SONY_HDR_MARK 2400 -#define SONY_HDR_SPACE 600 -#define SONY_ONE_MARK 1200 -#define SONY_ZERO_MARK 600 -#define SONY_RPT_LENGTH 45000 -#define SONY_DOUBLE_SPACE_USECS 500 // usually ssee 713 - not using ticks as get number wrapround - -#ifdef SEND_SONY -void IRsend::sendSony (unsigned long data, int nbits) -{ - // Set IR carrier frequency - enableIROut(40); - - // Header - mark(SONY_HDR_MARK); - space(SONY_HDR_SPACE); - - // Data - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(SONY_ONE_MARK); - space(SONY_HDR_SPACE); - } else { - mark(SONY_ZERO_MARK); - space(SONY_HDR_SPACE); - } - } - - // We will have ended with LED off -} -#endif - -//+======================================================== -#ifdef DECODE_SONY -long IRrecv::decodeSony (decode_results *results) -{ - long data = 0; - if (irparams.rawlen < 2 * SONY_BITS + 2) return false ; - int offset = 0; // Dont skip first space, check its size - - // Some Sony's deliver repeats fast after first - // unfortunately can't spot difference from of repeat from two fast clicks - if (results->rawbuf[offset] < SONY_DOUBLE_SPACE_USECS) { - // Serial.print("IR Gap found: "); - results->bits = 0; - results->value = REPEAT; - -# ifdef DECODE_SANYO - results->decode_type = SANYO; -# else - results->decode_type = UNKNOWN; -# endif - - return true; - } - offset++; - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SONY_HDR_MARK)) return false ; - offset++; - - while (offset + 1 < irparams.rawlen) { - if (!MATCH_SPACE(results->rawbuf[offset], SONY_HDR_SPACE)) break ; - offset++; - if (MATCH_MARK(results->rawbuf[offset], SONY_ONE_MARK)) data = (data << 1) | 1 ; - else if (MATCH_MARK(results->rawbuf[offset], SONY_ZERO_MARK)) data <<= 1 ; - else return false ; - offset++; - } - - // Success - results->bits = (offset - 1) / 2; - if (results->bits < 12) { - results->bits = 0; - return false; - } - results->value = data; - results->decode_type = SONY; - return true; -} -#endif - -//+============================================================================= -// SSSS AAA N N Y Y OOO -// S A A NN N Y Y O O -// SSS AAAAA N N N Y O O -// S A A N NN Y O O -// SSSS A A N N Y OOO -// - -// I think this is a Sanyo decoder - serial = SA 8650B -// Looks like Sony except for timings, 48 chars of data and time/space different -// -// SA 8650B -#define SANYO_BITS 12 - -#define SANYO_HDR_MARK 3500 // seen range 3500 -#define SANYO_HDR_SPACE 950 // seen 950 -#define SANYO_ONE_MARK 2400 // seen 2400 -#define SANYO_ZERO_MARK 700 // seen 700 -#define SANYO_DOUBLE_SPACE_USECS 800 // usually ssee 713 - not using ticks as get number wrapround -#define SANYO_RPT_LENGTH 45000 - -#ifdef DECODE_SANYO -long IRrecv::decodeSanyo (decode_results *results) -{ - long data = 0; - if (irparams.rawlen < 2 * SANYO_BITS + 2) return false ; - int offset = 0; // Skip first space - // Initial space - -#if 0 - // Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay - Serial.print("IR Gap: "); - Serial.println( results->rawbuf[offset]); - Serial.println( "test against:"); - Serial.println(results->rawbuf[offset]); -#endif - - if (results->rawbuf[offset] < SANYO_DOUBLE_SPACE_USECS) { - // Serial.print("IR Gap found: "); - results->bits = 0; - results->value = REPEAT; - results->decode_type = SANYO; - return true; - } - offset++; - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; - offset++; - - // Skip Second Mark - if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; - offset++; - - while (offset + 1 < irparams.rawlen) { - if (!MATCH_SPACE(results->rawbuf[offset], SANYO_HDR_SPACE)) break ; - offset++; - if (MATCH_MARK(results->rawbuf[offset], SANYO_ONE_MARK)) data = (data << 1) | 1 ; - else if (MATCH_MARK(results->rawbuf[offset], SANYO_ZERO_MARK)) data <<= 1 ; - else return false ; - offset++; - } - - // Success - results->bits = (offset - 1) / 2; - if (results->bits < 12) { - results->bits = 0; - return false; - } - - results->value = data; - results->decode_type = SANYO; - return true; -} -#endif - -//+============================================================================= -// RRRR CCCC 55555 -// R R C 5 -// RRRR C 5555 -// R R C 5 -// R R CCCC 5555 -// -// NB: First bit must be a one (start bit) -// -#define MIN_RC5_SAMPLES 11 -#define RC5_T1 889 -#define RC5_RPT_LENGTH 46000 - -#ifdef SEND_RC5 -void IRsend::sendRC5 (unsigned long data, int nbits) -{ - // Set IR carrier frequency - enableIROut(36); - - // Start - mark(RC5_T1); - space(RC5_T1); - mark(RC5_T1); - - // Data - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - space(RC5_T1); // 1 is space, then mark - mark(RC5_T1); - } else { - mark(RC5_T1); - space(RC5_T1); - } - } - - space(0); // Always end with the LED off -} -#endif - -//+======================================================== -#ifdef DECODE_RC5 -long IRrecv::decodeRC5 (decode_results *results) -{ - if (irparams.rawlen < MIN_RC5_SAMPLES + 2) return false ; - int offset = 1; // Skip gap space - long data = 0; - int used = 0; - // Get start bits - if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; - if (getRClevel(results, &offset, &used, RC5_T1) != SPACE) return false ; - if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; - int nbits; - for (nbits = 0; offset < irparams.rawlen; nbits++) { - int levelA = getRClevel(results, &offset, &used, RC5_T1); - int levelB = getRClevel(results, &offset, &used, RC5_T1); - - if (levelA == SPACE && levelB == MARK) data = (data << 1) | 1 ; // 1 bit - else if (levelA == MARK && levelB == SPACE) data <<= 1 ; // zero bit - else return false ; - } - - // Success - results->bits = nbits; - results->value = data; - results->decode_type = RC5; - return true; -} -#endif - -//+============================================================================= -// RRRR CCCC 6666 -// R R C 6 -// RRRR C 6666 -// R R C 6 6 -// R R CCCC 666 -// -// NB : Caller needs to take care of flipping the toggle bit -// -#define MIN_RC6_SAMPLES 1 -#define RC6_HDR_MARK 2666 -#define RC6_HDR_SPACE 889 -#define RC6_T1 444 -#define RC6_RPT_LENGTH 46000 - -#ifdef SEND_RC6 -void IRsend::sendRC6 (unsigned long data, int nbits) -{ - // Set IR carrier frequency - enableIROut(36); - - // Header - mark(RC6_HDR_MARK); - space(RC6_HDR_SPACE); - - // Start bit - mark(RC6_T1); - space(RC6_T1); - - // Data - for (unsigned long i = 1, mask = 1 << (nbits - 1); mask; i++, mask >>= 1) { - // The fourth bit we send is a "double width trailer bit" - int t = (i == 4) ? (RC6_T1 * 2) : (RC6_T1) ; - if (data & mask) { - mark(t); - space(t); - } else { - space(t); - mark(t); - } - } - - space(0); // Always end with the LED off -} -#endif - -//+======================================================== -#ifdef DECODE_RC6 -long IRrecv::decodeRC6 (decode_results *results) -{ - if (results->rawlen < MIN_RC6_SAMPLES) return false ; - int offset = 1; // Skip first space - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], RC6_HDR_MARK)) return false ; - offset++; - - if (!MATCH_SPACE(results->rawbuf[offset], RC6_HDR_SPACE)) return false ; - offset++; - - long data = 0; - int used = 0; - - // Get start bit (1) - if (getRClevel(results, &offset, &used, RC6_T1) != MARK) return false ; - if (getRClevel(results, &offset, &used, RC6_T1) != SPACE) return false ; - int nbits; - for (nbits = 0; offset < results->rawlen; nbits++) { - int levelA, levelB; // Next two levels - levelA = getRClevel(results, &offset, &used, RC6_T1); - if (nbits == 3) { - // T bit is double wide; make sure second half matches - if (levelA != getRClevel(results, &offset, &used, RC6_T1)) return false; - } - levelB = getRClevel(results, &offset, &used, RC6_T1); - if (nbits == 3) { - // T bit is double wide; make sure second half matches - if (levelB != getRClevel(results, &offset, &used, RC6_T1)) return false; - } - if (levelA == MARK && levelB == SPACE) data = (data << 1) | 1 ; // 1-bit (reversed compared to RC5) - else if (levelA == SPACE && levelB == MARK) data <<= 1 ; // zero bit - else return false ; // Error - } - - // Success - results->bits = nbits; - results->value = data; - results->decode_type = RC6; - return true; -} -#endif - -//+============================================================================= -// PPPP AAA N N AAA SSSS OOO N N IIIII CCCC -// P P A A NN N A A S O O NN N I C -// PPPP AAAAA N N N AAAAA SSS O O N N N I C -// P A A N NN A A S O O N NN I C -// P A A N N A A SSSS OOO N N IIIII CCCC -// -#define PANASONIC_BITS 48 -#define PANASONIC_HDR_MARK 3502 -#define PANASONIC_HDR_SPACE 1750 -#define PANASONIC_BIT_MARK 502 -#define PANASONIC_ONE_SPACE 1244 -#define PANASONIC_ZERO_SPACE 400 - -#ifdef SEND_PANASONIC -void IRsend::sendPanasonic (unsigned int address, unsigned long data) -{ - // Set IR carrier frequency - enableIROut(35); - - // Header - mark(PANASONIC_HDR_MARK); - space(PANASONIC_HDR_SPACE); - - // Address - for (unsigned long mask = 1 << (16 - 1); mask; mask >>= 1) { - mark(PANASONIC_BIT_MARK); - if (address & mask) space(PANASONIC_ONE_SPACE) ; - else space(PANASONIC_ZERO_SPACE) ; - } - - // Data - for (unsigned long mask = 1 << (32 - 1); mask; mask >>= 1) { - mark(PANASONIC_BIT_MARK); - if (data & mask) space(PANASONIC_ONE_SPACE) ; - else space(PANASONIC_ZERO_SPACE) ; - } - - // Footer - mark(PANASONIC_BIT_MARK); - space(0); // Always end with the LED off -} -#endif - -//+======================================================== -#ifdef DECODE_PANASONIC -long IRrecv::decodePanasonic (decode_results *results) -{ - unsigned long long data = 0; - int offset = 1; - - if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) return false ; - offset++; - if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_SPACE)) return false ; - offset++; - - // decode address - for (int i = 0; i < PANASONIC_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_BIT_MARK)) return false ; - - if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ZERO_SPACE)) data <<= 1 ; - else return false ; - offset++; - } - - results->value = (unsigned long)data; - results->panasonicAddress = (unsigned int)(data >> 32); - results->decode_type = PANASONIC; - results->bits = PANASONIC_BITS; - - return true; -} -#endif - -//+============================================================================= -// JJJJJ V V CCCC -// J V V C -// J V V C -// J J V V C -// J V CCCC -// -#define JVC_BITS 16 -#define JVC_HDR_MARK 8000 -#define JVC_HDR_SPACE 4000 -#define JVC_BIT_MARK 600 -#define JVC_ONE_SPACE 1600 -#define JVC_ZERO_SPACE 550 -#define JVC_RPT_LENGTH 60000 - -#ifdef SEND_JVC -void IRsend::sendJVC (unsigned long data, int nbits, int repeat) -{ - // Set IR carrier frequency - enableIROut(38); - - // Only send the Header if this is NOT a repeat command - if (!repeat){ - mark(JVC_HDR_MARK); - space(JVC_HDR_SPACE); - } - - // Data - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(JVC_BIT_MARK); - space(JVC_ONE_SPACE); - } else { - mark(JVC_BIT_MARK); - space(JVC_ZERO_SPACE); - } - } - - // Footer - mark(JVC_BIT_MARK); - space(0); // Always end with the LED off -} -#endif - -//+======================================================== -#ifdef DECODE_JVC -long IRrecv::decodeJVC (decode_results *results) -{ - long data = 0; - int offset = 1; // Skip first space - - // Check for repeat - if (irparams.rawlen - 1 == 33 && - MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK) && - MATCH_MARK(results->rawbuf[irparams.rawlen-1], JVC_BIT_MARK)) { - results->bits = 0; - results->value = REPEAT; - results->decode_type = JVC; - return true; - } - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], JVC_HDR_MARK)) return false ; - offset++; - - if (irparams.rawlen < 2 * JVC_BITS + 1 ) return false ; - - // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) return false ; - offset++; - - for (int i = 0; i < JVC_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return false ; - offset++; - if (MATCH_SPACE(results->rawbuf[offset], JVC_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], JVC_ZERO_SPACE)) data <<= 1 ; - else return false ; - offset++; - } - - // Stop bit - if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return false ; - - // Success - results->bits = JVC_BITS; - results->value = data; - results->decode_type = JVC; - - return true; -} -#endif - -//+============================================================================= -// SSSS AAA MMM SSSS U U N N GGGG -// S A A M M M S U U NN N G -// SSS AAAAA M M M SSS U U N N N G GG -// S A A M M S U U N NN G G -// SSSS A A M M SSSS UUU N N GGG -// -#define SAMSUNG_BITS 32 -#define SAMSUNG_HDR_MARK 5000 -#define SAMSUNG_HDR_SPACE 5000 -#define SAMSUNG_BIT_MARK 560 -#define SAMSUNG_ONE_SPACE 1600 -#define SAMSUNG_ZERO_SPACE 560 -#define SAMSUNG_RPT_SPACE 2250 - -#ifdef SEND_SAMSUNG -void IRsend::sendSAMSUNG (unsigned long data, int nbits) -{ - // Set IR carrier frequency - enableIROut(38); - - // Header - mark(SAMSUNG_HDR_MARK); - space(SAMSUNG_HDR_SPACE); - - // Data - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(SAMSUNG_BIT_MARK); - space(SAMSUNG_ONE_SPACE); - } else { - mark(SAMSUNG_BIT_MARK); - space(SAMSUNG_ZERO_SPACE); - } - } - - // Footer - mark(SAMSUNG_BIT_MARK); - space(0); // Always end with the LED off -} -#endif - -//+======================================================== -// SAMSUNGs have a repeat only 4 items long -// -#ifdef DECODE_SAMSUNG -long IRrecv::decodeSAMSUNG (decode_results *results) -{ - long data = 0; - int offset = 1; // Skip first space - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_HDR_MARK)) return false ; - offset++; - - // Check for repeat - if (irparams.rawlen == 4 && - MATCH_SPACE(results->rawbuf[offset], SAMSUNG_RPT_SPACE) && - MATCH_MARK(results->rawbuf[offset+1], SAMSUNG_BIT_MARK)) { - results->bits = 0; - results->value = REPEAT; - results->decode_type = SAMSUNG; - return true; - } - if (irparams.rawlen < 2 * SAMSUNG_BITS + 4) return false ; - - // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) return false ; - offset++; - - for (int i = 0; i < SAMSUNG_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_BIT_MARK)) return false ; - - offset++; - - if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ZERO_SPACE)) data <<= 1 ; - else return false ; - offset++; - } - - // Success - results->bits = SAMSUNG_BITS; - results->value = data; - results->decode_type = SAMSUNG; - return true; -} -#endif - -//+============================================================================= -// L GGGG -// L G -// L G GG -// L G G -// LLLLL GGG -// -#define LG_BITS 28 - -#define LG_HDR_MARK 8000 -#define LG_HDR_SPACE 4000 -#define LG_BIT_MARK 600 -#define LG_ONE_SPACE 1600 -#define LG_ZERO_SPACE 550 -#define LG_RPT_LENGTH 60000 - -#ifdef DECODE_LG -long IRrecv::decodeLG (decode_results *results) -{ - long data = 0; - int offset = 1; // Skip first space - - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], LG_HDR_MARK)) return false ; - offset++; - if (irparams.rawlen < 2 * LG_BITS + 1 ) return false ; - // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], LG_HDR_SPACE)) return false ; - offset++; - for (int i = 0; i < LG_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; - offset++; - if (MATCH_SPACE(results->rawbuf[offset], LG_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], LG_ZERO_SPACE)) data <<= 1 ; - else return false ; - offset++; - } - - // Stop bit - if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; - - // Success - results->bits = LG_BITS; - results->value = data; - results->decode_type = LG; - return true; -} -#endif - -//+============================================================================= -// AAA IIIII W W AAA -// A A I W W A A -// AAAAA I W W W AAAAA -// A A I W W W A A -// A A IIIII WWW A A -// -// Baszed off the RC-T501 RCU -// Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 -// -#define AIWA_RC_T501_HZ 38 -#define AIWA_RC_T501_BITS 15 -#define AIWA_RC_T501_PRE_BITS 26 -#define AIWA_RC_T501_POST_BITS 1 -#define AIWA_RC_T501_SUM_BITS (AIWA_RC_T501_PRE_BITS + AIWA_RC_T501_BITS + AIWA_RC_T501_POST_BITS) -#define AIWA_RC_T501_HDR_MARK 8800 -#define AIWA_RC_T501_HDR_SPACE 4500 -#define AIWA_RC_T501_BIT_MARK 500 -#define AIWA_RC_T501_ONE_SPACE 600 -#define AIWA_RC_T501_ZERO_SPACE 1700 - -#ifdef SEND_AIWA_RC_T501 -void IRsend::sendAiwaRCT501 (int code) -{ - unsigned long pre = 0x0227EEC0; // 26-bits - int mask; - - // Set IR carrier frequency - enableIROut(AIWA_RC_T501_HZ); - - // Header - mark(AIWA_RC_T501_HDR_MARK); - space(AIWA_RC_T501_HDR_SPACE); - - // Send "pre" data - for (unsigned long mask = 1 << (26 - 1); mask; mask >>= 1) { - mark(AIWA_RC_T501_BIT_MARK); - if (pre & mask) space(AIWA_RC_T501_ONE_SPACE) ; - else space(AIWA_RC_T501_ZERO_SPACE) ; - } - -//-v- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! -// it only send 15bits and ignores the top bit -// then uses TOPBIT which is bit-31 to check the bit code -// I suspect TOPBIT should be changed to 0x00008000 - // Skip firts code bit - code <<= 1; - // Send code - for (int i = 0; i < 15; i++) { - mark(AIWA_RC_T501_BIT_MARK); - if (code & TOPBIT) space(AIWA_RC_T501_ONE_SPACE) ; - else space(AIWA_RC_T501_ZERO_SPACE) ; - code <<= 1; - } -//-^- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! - - // POST-DATA, 1 bit, 0x0 - mark(AIWA_RC_T501_BIT_MARK); - space(AIWA_RC_T501_ZERO_SPACE); - - mark(AIWA_RC_T501_BIT_MARK); - space(0); -} -#endif - - - - - - - - - - - - - - - - - - - - - -//+============================================================================= -// Sends an IR mark for the specified number of microseconds. -// The mark output is modulated at the PWM frequency. -// -void IRsend::mark (int time) -{ - TIMER_ENABLE_PWM; // Enable pin 3 PWM output - if (time > 0) delayMicroseconds(time); -} - -//+============================================================================= -// Leave pin off for time (given in microseconds) -// Sends an IR space for the specified number of microseconds. -// A space is no output, so the PWM output is disabled. -// -void IRsend::space (int time) -{ - TIMER_DISABLE_PWM; // Disable pin 3 PWM output - if (time > 0) delayMicroseconds(time); -} - -//+============================================================================= -// Enables IR output. The khz value controls the modulation frequency in kilohertz. -// The IR output will be on pin 3 (OC2B). -// This routine is designed for 36-40KHz; if you use it for other values, it's up to you -// to make sure it gives reasonable results. (Watch out for overflow / underflow / rounding.) -// TIMER2 is used in phase-correct PWM mode, with OCR2A controlling the frequency and OCR2B -// controlling the duty cycle. -// There is no prescaling, so the output frequency is 16MHz / (2 * OCR2A) -// To turn the output on and off, we leave the PWM running, but connect and disconnect the output pin. -// A few hours staring at the ATmega documentation and this will all make sense. -// See my Secrets of Arduino PWM at http://arcfn.com/2009/07/secrets-of-arduino-pwm.html for details. -// -void IRsend::enableIROut (int khz) -{ - // Disable the Timer2 Interrupt (which is used for receiving IR) - TIMER_DISABLE_INTR; //Timer2 Overflow Interrupt - - pinMode(TIMER_PWM_PIN, OUTPUT); - digitalWrite(TIMER_PWM_PIN, LOW); // When not sending PWM, we want it low - - // COM2A = 00: disconnect OC2A - // COM2B = 00: disconnect OC2B; to send signal set to 10: OC2B non-inverted - // WGM2 = 101: phase-correct PWM with OCRA as top - // CS2 = 000: no prescaling - // The top value for the timer. The modulation frequency will be SYSCLOCK / 2 / OCR2A. - TIMER_CONFIG_KHZ(khz); -} - -//+============================================================================= -IRrecv::IRrecv (int recvpin) -{ - irparams.recvpin = recvpin; - irparams.blinkflag = 0; -} - -//+============================================================================= -// initialization -// -void IRrecv::enableIRIn ( ) -{ - cli(); - // setup pulse clock timer interrupt - //Prescale /8 (16M/8 = 0.5 microseconds per tick) - // Therefore, the timer interval can range from 0.5 to 128 microseconds - // depending on the reset value (255 to 0) - TIMER_CONFIG_NORMAL(); - - //Timer2 Overflow Interrupt Enable - TIMER_ENABLE_INTR; - - TIMER_RESET; - - sei(); // enable interrupts - - // initialize state machine variables - irparams.rcvstate = STATE_IDLE; - irparams.rawlen = 0; - - // set pin modes - pinMode(irparams.recvpin, INPUT); -} - -//+============================================================================= -// enable/disable blinking of pin 13 on IR processing -// -void IRrecv::blink13 (int blinkflag) -{ - irparams.blinkflag = blinkflag; - if (blinkflag) pinMode(BLINKLED, OUTPUT) ; -} - -//+============================================================================= -// TIMER2 interrupt code to collect raw data. -// Widths of alternating SPACE, MARK are recorded in rawbuf. -// Recorded in ticks of 50 microseconds. -// rawlen counts the number of entries recorded so far. -// First entry is the SPACE between transmissions. -// As soon as a SPACE gets long, ready is set, state switches to IDLE, timing of SPACE continues. -// As soon as first MARK arrives, gap width is recorded, ready is cleared, and new logging starts -// -ISR (TIMER_INTR_NAME) -{ - TIMER_RESET; - - uint8_t irdata = (uint8_t)digitalRead(irparams.recvpin); - - irparams.timer++; // One more 50us tick - if (irparams.rawlen >= RAWBUF) irparams.rcvstate = STATE_STOP ; // Buffer overflow - - switch(irparams.rcvstate) { - case STATE_IDLE: // In the middle of a gap - if (irdata == MARK) { - if (irparams.timer < GAP_TICKS) { - // Not big enough to be a gap. - irparams.timer = 0; - } - else { - // gap just ended, record duration and start recording transmission - irparams.rawlen = 0; - irparams.rawbuf[irparams.rawlen++] = irparams.timer; - irparams.timer = 0; - irparams.rcvstate = STATE_MARK; - } - } - break; - - case STATE_MARK: // timing MARK - if (irdata == SPACE) { // MARK ended, record time - irparams.rawbuf[irparams.rawlen++] = irparams.timer; - irparams.timer = 0; - irparams.rcvstate = STATE_SPACE; - } - break; - - case STATE_SPACE: // timing SPACE - if (irdata == MARK) { // SPACE just ended, record it - irparams.rawbuf[irparams.rawlen++] = irparams.timer; - irparams.timer = 0; - irparams.rcvstate = STATE_MARK; - } - else { // SPACE - if (irparams.timer > GAP_TICKS) { - // big SPACE, indicates gap between codes - // Mark current code as ready for processing - // Switch to STOP - // Don't reset timer; keep counting space width - irparams.rcvstate = STATE_STOP; - } - } - break; - - case STATE_STOP: // waiting, measuring gap - if (irdata == MARK) irparams.timer = 0 ; // reset gap timer - break; - } - - if (irparams.blinkflag) { - if (irdata == MARK) BLINKLED_ON() ; // turn pin 13 LED on - else BLINKLED_OFF() ; // turn pin 13 LED off - } -} - -//+============================================================================= -void IRrecv::resume ( ) -{ - irparams.rcvstate = STATE_IDLE; - irparams.rawlen = 0; -} - - - - - - - - - - - - - -//+============================================================================= -// Decodes the received IR message -// Returns 0 if no data ready, 1 if data ready. -// Results of decoding are stored in results -int IRrecv::decode (decode_results *results) -{ - results->rawbuf = irparams.rawbuf; - results->rawlen = irparams.rawlen; - - if (irparams.rcvstate != STATE_STOP) return false ; - -#ifdef DECODE_NEC - DBG_PRINTLN("Attempting NEC decode"); - if (decodeNEC(results)) return true ; -#endif - -#ifdef DECODE_SONY - DBG_PRINTLN("Attempting Sony decode"); - if (decodeSony(results)) return true ; -#endif - -#ifdef DECODE_SANYO - DBG_PRINTLN("Attempting Sanyo decode"); - if (decodeSanyo(results)) return true ; -#endif - -#ifdef DECODE_MITSUBISHI - DBG_PRINTLN("Attempting Mitsubishi decode"); - if (decodeMitsubishi(results)) return true ; -#endif - -#ifdef DECODE_RC5 - DBG_PRINTLN("Attempting RC5 decode"); - if (decodeRC5(results)) return true ; -#endif - -#ifdef DECODE_RC6 - DBG_PRINTLN("Attempting RC6 decode"); - if (decodeRC6(results)) return true ; -#endif - -#ifdef DECODE_PANASONIC - DBG_PRINTLN("Attempting Panasonic decode"); - if (decodePanasonic(results)) return true ; -#endif - -#ifdef DECODE_LG - DBG_PRINTLN("Attempting LG decode"); - if (decodeLG(results)) return true ; -#endif - -#ifdef DECODE_JVC - DBG_PRINTLN("Attempting JVC decode"); - if (decodeJVC(results)) return true ; -#endif - -#ifdef DECODE_SAMSUNG - DBG_PRINTLN("Attempting SAMSUNG decode"); - if (decodeSAMSUNG(results)) return true ; -#endif - -#ifdef DECODE_WHYNTER - DBG_PRINTLN("Attempting Whynter decode"); - if (decodeWhynter(results)) return true ; -#endif - -#ifdef AIWA_RC_T501 - DBG_PRINTLN("Attempting Aiwa RC-T501 decode"); - if (decodeAiwaRCT501(results)) return true ; -#endif - - // decodeHash returns a hash on any input. - // Thus, it needs to be last in the list. - // If you add any decodes, add them before this. - if (decodeHash(results)) return true ; - // Throw away and start over - resume(); - return false; -} - - - - - - - - - - - - -//+============================================================================= -// Looks like Sony except for timings, 48 chars of data and time/space different -// - -#define MITSUBISHI_BITS 16 - -// Mitsubishi RM 75501 -// 14200 7 41 7 42 7 42 7 17 7 17 7 18 7 41 7 18 7 17 7 17 7 18 7 41 8 17 7 17 7 18 7 17 7 -// #define MITSUBISHI_HDR_MARK 250 // seen range 3500 -#define MITSUBISHI_HDR_SPACE 350 // 7*50+100 -#define MITSUBISHI_ONE_MARK 1950 // 41*50-100 -#define MITSUBISHI_ZERO_MARK 750 // 17*50-100 -// #define MITSUBISHI_DOUBLE_SPACE_USECS 800 // usually ssee 713 - not using ticks as get number wrapround -// #define MITSUBISHI_RPT_LENGTH 45000 - -#ifdef DECODE_MITSUBISHI -long IRrecv::decodeMitsubishi (decode_results *results) -{ - // Serial.print("?!? decoding Mitsubishi:");Serial.print(irparams.rawlen); Serial.print(" want "); Serial.println( 2 * MITSUBISHI_BITS + 2); - long data = 0; - if (irparams.rawlen < 2 * MITSUBISHI_BITS + 2) return false ; - int offset = 0; // Skip first space - // Initial space - -#if 0 - // Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay - Serial.print("IR Gap: "); - Serial.println( results->rawbuf[offset]); - Serial.println( "test against:"); - Serial.println(results->rawbuf[offset]); -#endif - -#if 0 - // Not seeing double keys from Mitsubishi - if (results->rawbuf[offset] < MITSUBISHI_DOUBLE_SPACE_USECS) { - // Serial.print("IR Gap found: "); - results->bits = 0; - results->value = REPEAT; - results->decode_type = MITSUBISHI; - return true; - } -#endif - - offset++; - - // Typical - // 14200 7 41 7 42 7 42 7 17 7 17 7 18 7 41 7 18 7 17 7 17 7 18 7 41 8 17 7 17 7 18 7 17 7 - - // Initial Space - if (!MATCH_MARK(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) return false ; - offset++; - - while (offset + 1 < irparams.rawlen) { - if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ONE_MARK)) data = (data << 1) | 1 ; - else if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ZERO_MARK)) data <<= 1 ; - else return false ; - offset++; - - if (!MATCH_SPACE(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) break ; - offset++; - } - - // Success - results->bits = (offset - 1) / 2; - if (results->bits < MITSUBISHI_BITS) { - results->bits = 0; - return false; - } - - results->value = data; - results->decode_type = MITSUBISHI; - return true; -} -#endif - -//+============================================================================= -// Gets one undecoded level at a time from the raw buffer. -// The RC5/6 decoding is easier if the data is broken into time intervals. -// E.g. if the buffer has MARK for 2 time intervals and SPACE for 1, -// successive calls to getRClevel will return MARK, MARK, SPACE. -// offset and used are updated to keep track of the current position. -// t1 is the time interval for a single bit in microseconds. -// Returns -1 for error (measured time interval is not a multiple of t1). -// -int IRrecv::getRClevel (decode_results *results, int *offset, int *used, int t1) -{ - if (*offset >= results->rawlen) return SPACE ; // After end of recorded buffer, assume SPACE. - int width = results->rawbuf[*offset]; - int val = ((*offset) % 2) ? MARK : SPACE; - int correction = (val == MARK) ? MARK_EXCESS : - MARK_EXCESS; - - int avail; - if (MATCH(width, t1 + correction)) avail = 1 ; - else if (MATCH(width, 2*t1 + correction)) avail = 2 ; - else if (MATCH(width, 3*t1 + correction)) avail = 3 ; - else return -1 ; - - (*used)++; - if (*used >= avail) { - *used = 0; - (*offset)++; - } - - DBG_PRINTLN( (val == MARK) ? "MARK" : "SPACE" ); - return val; -} - - -//+============================================================================= -// Aiwa system -// Remote control RC-T501 -// Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 -// -#ifdef DECODE_AIWA_RC_T501 -long IRrecv::decodeAiwaRCT501 (decode_results *results) -{ - int data = 0; - int offset = 1; // skip first garbage read - - // Check SIZE - if (irparams.rawlen < 2 * (AIWA_RC_T501_SUM_BITS) + 4) return false ; - - // Check HDR - if (!MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_HDR_MARK)) return false ; - offset++; - - // Check HDR space - if (!MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_HDR_SPACE)) return false ; - offset++; - - offset += 26; // skip pre-data - optional - while(offset < irparams.rawlen - 4) { - if (MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_BIT_MARK)) offset++ ; - else return false ; - - // ONE & ZERO - if (MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ZERO_SPACE)) data <<= 1 ; - else break ; // End of one & zero detected - offset++; - } - - results->bits = (offset - 1) / 2; - if (results->bits < 42) return false ; - results->value = data; - results->decode_type = AIWA_RC_T501; - return true; -} -#endif - -//+============================================================================= -// hashdecode - decode an arbitrary IR code. -// Instead of decoding using a standard encoding scheme -// (e.g. Sony, NEC, RC5), the code is hashed to a 32-bit value. -// -// The algorithm: look at the sequence of MARK signals, and see if each one -// is shorter (0), the same length (1), or longer (2) than the previous. -// Do the same with the SPACE signals. Hszh the resulting sequence of 0's, -// 1's, and 2's to a 32-bit value. This will give a unique value for each -// different code (probably), for most code systems. -// -// http://arcfn.com/2010/01/using-arbitrary-remotes-with-arduino.html -// -// Compare two tick values, returning 0 if newval is shorter, -// 1 if newval is equal, and 2 if newval is longer -// Use a tolerance of 20% -// -int IRrecv::compare (unsigned int oldval, unsigned int newval) -{ - if (newval < oldval * .8) return 0 ; - else if (oldval < newval * .8) return 2 ; - else return 1 ; -} - -//+============================================================================= -// Use FNV hash algorithm: http://isthe.com/chongo/tech/comp/fnv/#FNV-param -// Converts the raw code values into a 32-bit hash code. -// Hopefully this code is unique for each button. -// This isn't a "real" decoding, just an arbitrary value. -// -#define FNV_PRIME_32 16777619 -#define FNV_BASIS_32 2166136261 - -long IRrecv::decodeHash (decode_results *results) -{ - // Require at least 6 samples to prevent triggering on noise - if (results->rawlen < 6) return false ; - long hash = FNV_BASIS_32; - for (int i = 1; (i + 2) < results->rawlen; i++) { - int value = compare(results->rawbuf[i], results->rawbuf[i+2]); - // Add value into the hash - hash = (hash * FNV_PRIME_32) ^ value; - } - - results->value = hash; - results->bits = 32; - results->decode_type = UNKNOWN; - - return true; -} - -//+============================================================================= -// Sharp and DISH support by Todd Treece ( http://unionbridge.org/design/ircommand ) -// -// The Dish send function needs to be repeated 4 times, and the Sharp function -// has the necessary repeat built in because of the need to invert the signal. -// -// Sharp protocol documentation: -// http://www.sbprojects.com/knowledge/ir/sharp.htm -// -// Here are the LIRC files that I found that seem to match the remote codes -// from the oscilloscope: -// -// Sharp LCD TV: -// http://lirc.sourceforge.net/remotes/sharp/GA538WJSA -// -// DISH NETWORK (echostar 301): -// http://lirc.sourceforge.net/remotes/echostar/301_501_3100_5100_58xx_59xx -// -// For the DISH codes, only send the last for characters of the hex. -// i.e. use 0x1C10 instead of 0x0000000000001C10 which is listed in the -// linked LIRC file. -// - -#define SHARP_BITS 15 - -#define SHARP_BIT_MARK 245 -#define SHARP_ONE_SPACE 1805 -#define SHARP_ZERO_SPACE 795 -#define SHARP_GAP 600000 -#define SHARP_TOGGLE_MASK 0x3FF -#define SHARP_RPT_SPACE 3000 - -#ifdef SEND_SHARP -void IRsend::sendSharpRaw (unsigned long data, int nbits) -{ - unsigned long invertdata = data ^ SHARP_TOGGLE_MASK; - enableIROut(38); - - // Sending codes in bursts of 3 (normal, inverted, normal) makes transmission - // much more reliable. That's the exact behaviour of CD-S6470 remote control. - for (int n = 0; n < 3; n++) { - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(SHARP_BIT_MARK); - space(SHARP_ONE_SPACE); - } else { - mark(SHARP_BIT_MARK); - space(SHARP_ZERO_SPACE); - } - } - - mark(SHARP_BIT_MARK); - space(SHARP_ZERO_SPACE); - delay(40); - - data = data ^ SHARP_TOGGLE_MASK; - } -} - -//+============================================================================= -// Sharp send compatible with data obtained through decodeSharp -// -void IRsend::sendSharp (unsigned int address, unsigned int command) -{ - sendSharpRaw((address << 10) | (command << 2) | 2, 15); -} - -#endif - -//+============================================================================= -#define DISH_BITS 16 - -#define DISH_HDR_MARK 400 -#define DISH_HDR_SPACE 6100 -#define DISH_BIT_MARK 400 -#define DISH_ONE_SPACE 1700 -#define DISH_ZERO_SPACE 2800 -#define DISH_RPT_SPACE 6200 -#define DISH_TOP_BIT 0x8000 - -#ifdef SEND_DISH -void IRsend::sendDISH (unsigned long data, int nbits) -{ - // Set IR carrier frequency - enableIROut(56); - - mark(DISH_HDR_MARK); - space(DISH_HDR_SPACE); - - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(DISH_BIT_MARK); - space(DISH_ONE_SPACE); - } else { - mark(DISH_BIT_MARK); - space(DISH_ZERO_SPACE); - } - } -} -#endif - diff --git a/IRremote.h b/IRremote.h index 13b0d9b..ed9a448 100644 --- a/IRremote.h +++ b/IRremote.h @@ -1,3 +1,49 @@ +#define DEBUG +#undef DEBUG + +//------------------------------------------------------------------------------ +int MATCH_SPACE (int measured_ticks, int desired_us) ; +int MATCH_MARK (int measured_ticks, int desired_us) ; +int MATCH (int measured, int desired) ; + +//------------------------------------------------------------------------------ +// Debug directives +#ifdef DEBUG +# define DBG_PRINT(...) Serial.print(__VA_ARGS__) +# define DBG_PRINTLN(...) Serial.println(__VA_ARGS__) +#else +# define DBG_PRINT(...) +# define DBG_PRINTLN(...) +#endif + +///int MATCH (int measured, int desired); +///int MATCH_MARK (int measured_ticks, int desired_us); +///int MATCH_SPACE (int measured_ticks, int desired_us); + +#define SEND_NEC +#define DECODE_NEC +#define SEND_WHYNTER +#define DECODE_WHYNTER +#define SEND_SONY +#define DECODE_SONY +#define DECODE_SANYO +#define SEND_RC5 +#define DECODE_RC5 +#define SEND_RC6 +#define DECODE_RC6 +#define SEND_PANASONIC +#define DECODE_PANASONIC +#define SEND_JVC +#define DECODE_JVC +#define SEND_SAMSUNG +#define DECODE_SAMSUNG +#define DECODE_LG +#define DECODE_MITSUBISHI +#define SEND_AIWA_RC_T501 +#define DECODE_AIWA_RC_T501 +#define SEND_SHARP +#define SEND_DISH + /* * IRremote * Version 0.1 July, 2009 @@ -42,7 +88,6 @@ enum decode_type_t { LG = 12, WHYNTER = 13, AIWA_RC_T501 = 14, - }; // Results returned from the decoder diff --git a/IRremoteInt.h b/IRremoteInt.h index fa5e31a..af0015b 100644 --- a/IRremoteInt.h +++ b/IRremoteInt.h @@ -17,6 +17,12 @@ #ifndef IRremoteint_h #define IRremoteint_h +#ifdef IR_GLOBAL +# define EXTERN +#else +# define EXTERN extern +#endif + #if defined(ARDUINO) && ARDUINO >= 100 #include #else @@ -141,7 +147,7 @@ typedef struct { irparams_t; // Defined in IRremote.cpp -extern volatile irparams_t irparams; +EXTERN volatile irparams_t irparams; // IR detector output is active low #define MARK 0 diff --git a/irISR.cpp b/irISR.cpp new file mode 100644 index 0000000..8a23c9e --- /dev/null +++ b/irISR.cpp @@ -0,0 +1,76 @@ +#include + +#include "IRremote.h" +#include "IRremoteInt.h" + +//+============================================================================= +// TIMER2 interrupt code to collect raw data. +// Widths of alternating SPACE, MARK are recorded in rawbuf. +// Recorded in ticks of 50 microseconds. +// rawlen counts the number of entries recorded so far. +// First entry is the SPACE between transmissions. +// As soon as a SPACE gets long, ready is set, state switches to IDLE, timing of SPACE continues. +// As soon as first MARK arrives, gap width is recorded, ready is cleared, and new logging starts +// +ISR (TIMER_INTR_NAME) +{ + TIMER_RESET; + + uint8_t irdata = (uint8_t)digitalRead(irparams.recvpin); + + irparams.timer++; // One more 50us tick + if (irparams.rawlen >= RAWBUF) irparams.rcvstate = STATE_STOP ; // Buffer overflow + + switch(irparams.rcvstate) { + case STATE_IDLE: // In the middle of a gap + if (irdata == MARK) { + if (irparams.timer < GAP_TICKS) { + // Not big enough to be a gap. + irparams.timer = 0; + } + else { + // gap just ended, record duration and start recording transmission + irparams.rawlen = 0; + irparams.rawbuf[irparams.rawlen++] = irparams.timer; + irparams.timer = 0; + irparams.rcvstate = STATE_MARK; + } + } + break; + + case STATE_MARK: // timing MARK + if (irdata == SPACE) { // MARK ended, record time + irparams.rawbuf[irparams.rawlen++] = irparams.timer; + irparams.timer = 0; + irparams.rcvstate = STATE_SPACE; + } + break; + + case STATE_SPACE: // timing SPACE + if (irdata == MARK) { // SPACE just ended, record it + irparams.rawbuf[irparams.rawlen++] = irparams.timer; + irparams.timer = 0; + irparams.rcvstate = STATE_MARK; + } + else { // SPACE + if (irparams.timer > GAP_TICKS) { + // big SPACE, indicates gap between codes + // Mark current code as ready for processing + // Switch to STOP + // Don't reset timer; keep counting space width + irparams.rcvstate = STATE_STOP; + } + } + break; + + case STATE_STOP: // waiting, measuring gap + if (irdata == MARK) irparams.timer = 0 ; // reset gap timer + break; + } + + if (irparams.blinkflag) { + if (irdata == MARK) BLINKLED_ON() ; // turn pin 13 LED on + else BLINKLED_OFF() ; // turn pin 13 LED off + } +} + diff --git a/irRecv.cpp b/irRecv.cpp new file mode 100644 index 0000000..4c4e30b --- /dev/null +++ b/irRecv.cpp @@ -0,0 +1,195 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//+============================================================================= +IRrecv::IRrecv (int recvpin) +{ + irparams.recvpin = recvpin; + irparams.blinkflag = 0; +} + +//+============================================================================= +// initialization +// +void IRrecv::enableIRIn ( ) +{ + cli(); + // setup pulse clock timer interrupt + //Prescale /8 (16M/8 = 0.5 microseconds per tick) + // Therefore, the timer interval can range from 0.5 to 128 microseconds + // depending on the reset value (255 to 0) + TIMER_CONFIG_NORMAL(); + + //Timer2 Overflow Interrupt Enable + TIMER_ENABLE_INTR; + + TIMER_RESET; + + sei(); // enable interrupts + + // initialize state machine variables + irparams.rcvstate = STATE_IDLE; + irparams.rawlen = 0; + + // set pin modes + pinMode(irparams.recvpin, INPUT); +} + +//+============================================================================= +// enable/disable blinking of pin 13 on IR processing +// +void IRrecv::blink13 (int blinkflag) +{ + irparams.blinkflag = blinkflag; + if (blinkflag) pinMode(BLINKLED, OUTPUT) ; +} + +//+============================================================================= +void IRrecv::resume ( ) +{ + irparams.rcvstate = STATE_IDLE; + irparams.rawlen = 0; +} + + + + + + + + + + + + + +//+============================================================================= +// Decodes the received IR message +// Returns 0 if no data ready, 1 if data ready. +// Results of decoding are stored in results +int IRrecv::decode (decode_results *results) +{ + results->rawbuf = irparams.rawbuf; + results->rawlen = irparams.rawlen; + + if (irparams.rcvstate != STATE_STOP) return false ; + +#ifdef DECODE_NEC + DBG_PRINTLN("Attempting NEC decode"); + if (decodeNEC(results)) return true ; +#endif + +#ifdef DECODE_SONY + DBG_PRINTLN("Attempting Sony decode"); + if (decodeSony(results)) return true ; +#endif + +#ifdef DECODE_SANYO + DBG_PRINTLN("Attempting Sanyo decode"); + if (decodeSanyo(results)) return true ; +#endif + +#ifdef DECODE_MITSUBISHI + DBG_PRINTLN("Attempting Mitsubishi decode"); + if (decodeMitsubishi(results)) return true ; +#endif + +#ifdef DECODE_RC5 + DBG_PRINTLN("Attempting RC5 decode"); + if (decodeRC5(results)) return true ; +#endif + +#ifdef DECODE_RC6 + DBG_PRINTLN("Attempting RC6 decode"); + if (decodeRC6(results)) return true ; +#endif + +#ifdef DECODE_PANASONIC + DBG_PRINTLN("Attempting Panasonic decode"); + if (decodePanasonic(results)) return true ; +#endif + +#ifdef DECODE_LG + DBG_PRINTLN("Attempting LG decode"); + if (decodeLG(results)) return true ; +#endif + +#ifdef DECODE_JVC + DBG_PRINTLN("Attempting JVC decode"); + if (decodeJVC(results)) return true ; +#endif + +#ifdef DECODE_SAMSUNG + DBG_PRINTLN("Attempting SAMSUNG decode"); + if (decodeSAMSUNG(results)) return true ; +#endif + +#ifdef DECODE_WHYNTER + DBG_PRINTLN("Attempting Whynter decode"); + if (decodeWhynter(results)) return true ; +#endif + +#ifdef AIWA_RC_T501 + DBG_PRINTLN("Attempting Aiwa RC-T501 decode"); + if (decodeAiwaRCT501(results)) return true ; +#endif + + // decodeHash returns a hash on any input. + // Thus, it needs to be last in the list. + // If you add any decodes, add them before this. + if (decodeHash(results)) return true ; + // Throw away and start over + resume(); + return false; +} + +//+============================================================================= +// hashdecode - decode an arbitrary IR code. +// Instead of decoding using a standard encoding scheme +// (e.g. Sony, NEC, RC5), the code is hashed to a 32-bit value. +// +// The algorithm: look at the sequence of MARK signals, and see if each one +// is shorter (0), the same length (1), or longer (2) than the previous. +// Do the same with the SPACE signals. Hszh the resulting sequence of 0's, +// 1's, and 2's to a 32-bit value. This will give a unique value for each +// different code (probably), for most code systems. +// +// http://arcfn.com/2010/01/using-arbitrary-remotes-with-arduino.html +// +// Compare two tick values, returning 0 if newval is shorter, +// 1 if newval is equal, and 2 if newval is longer +// Use a tolerance of 20% +// +int IRrecv::compare (unsigned int oldval, unsigned int newval) +{ + if (newval < oldval * .8) return 0 ; + else if (oldval < newval * .8) return 2 ; + else return 1 ; +} + +//+============================================================================= +// Use FNV hash algorithm: http://isthe.com/chongo/tech/comp/fnv/#FNV-param +// Converts the raw code values into a 32-bit hash code. +// Hopefully this code is unique for each button. +// This isn't a "real" decoding, just an arbitrary value. +// +#define FNV_PRIME_32 16777619 +#define FNV_BASIS_32 2166136261 + +long IRrecv::decodeHash (decode_results *results) +{ + // Require at least 6 samples to prevent triggering on noise + if (results->rawlen < 6) return false ; + long hash = FNV_BASIS_32; + for (int i = 1; (i + 2) < results->rawlen; i++) { + int value = compare(results->rawbuf[i], results->rawbuf[i+2]); + // Add value into the hash + hash = (hash * FNV_PRIME_32) ^ value; + } + + results->value = hash; + results->bits = 32; + results->decode_type = UNKNOWN; + + return true; +} diff --git a/irSend.cpp b/irSend.cpp new file mode 100644 index 0000000..df3b1d9 --- /dev/null +++ b/irSend.cpp @@ -0,0 +1,66 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//+============================================================================= +void IRsend::sendRaw (unsigned int buf[], int len, int hz) +{ + // Set IR carrier frequency + enableIROut(hz); + + for (int i = 0; i < len; i++) { + if (i & 1) space(buf[i]) ; + else mark (buf[i]) ; + } + + space(0); // Always end with the LED off +} + +//+============================================================================= +// Sends an IR mark for the specified number of microseconds. +// The mark output is modulated at the PWM frequency. +// +void IRsend::mark (int time) +{ + TIMER_ENABLE_PWM; // Enable pin 3 PWM output + if (time > 0) delayMicroseconds(time); +} + +//+============================================================================= +// Leave pin off for time (given in microseconds) +// Sends an IR space for the specified number of microseconds. +// A space is no output, so the PWM output is disabled. +// +void IRsend::space (int time) +{ + TIMER_DISABLE_PWM; // Disable pin 3 PWM output + if (time > 0) delayMicroseconds(time); +} + +//+============================================================================= +// Enables IR output. The khz value controls the modulation frequency in kilohertz. +// The IR output will be on pin 3 (OC2B). +// This routine is designed for 36-40KHz; if you use it for other values, it's up to you +// to make sure it gives reasonable results. (Watch out for overflow / underflow / rounding.) +// TIMER2 is used in phase-correct PWM mode, with OCR2A controlling the frequency and OCR2B +// controlling the duty cycle. +// There is no prescaling, so the output frequency is 16MHz / (2 * OCR2A) +// To turn the output on and off, we leave the PWM running, but connect and disconnect the output pin. +// A few hours staring at the ATmega documentation and this will all make sense. +// See my Secrets of Arduino PWM at http://arcfn.com/2009/07/secrets-of-arduino-pwm.html for details. +// +void IRsend::enableIROut (int khz) +{ + // Disable the Timer2 Interrupt (which is used for receiving IR) + TIMER_DISABLE_INTR; //Timer2 Overflow Interrupt + + pinMode(TIMER_PWM_PIN, OUTPUT); + digitalWrite(TIMER_PWM_PIN, LOW); // When not sending PWM, we want it low + + // COM2A = 00: disconnect OC2A + // COM2B = 00: disconnect OC2B; to send signal set to 10: OC2B non-inverted + // WGM2 = 101: phase-correct PWM with OCRA as top + // CS2 = 000: no prescaling + // The top value for the timer. The modulation frequency will be SYSCLOCK / 2 / OCR2A. + TIMER_CONFIG_KHZ(khz); +} + diff --git a/ir_Aiwa.cpp b/ir_Aiwa.cpp new file mode 100644 index 0000000..b34d6f4 --- /dev/null +++ b/ir_Aiwa.cpp @@ -0,0 +1,108 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// AAA IIIII W W AAA +// A A I W W A A +// AAAAA I W W W AAAAA +// A A I W W W A A +// A A IIIII WWW A A +//============================================================================== + +// Baszed off the RC-T501 RCU +// Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501 + +#define AIWA_RC_T501_HZ 38 +#define AIWA_RC_T501_BITS 15 +#define AIWA_RC_T501_PRE_BITS 26 +#define AIWA_RC_T501_POST_BITS 1 +#define AIWA_RC_T501_SUM_BITS (AIWA_RC_T501_PRE_BITS + AIWA_RC_T501_BITS + AIWA_RC_T501_POST_BITS) +#define AIWA_RC_T501_HDR_MARK 8800 +#define AIWA_RC_T501_HDR_SPACE 4500 +#define AIWA_RC_T501_BIT_MARK 500 +#define AIWA_RC_T501_ONE_SPACE 600 +#define AIWA_RC_T501_ZERO_SPACE 1700 + +//+============================================================================= +#ifdef SEND_AIWA_RC_T501 +void IRsend::sendAiwaRCT501 (int code) +{ + unsigned long pre = 0x0227EEC0; // 26-bits + int mask; + + // Set IR carrier frequency + enableIROut(AIWA_RC_T501_HZ); + + // Header + mark(AIWA_RC_T501_HDR_MARK); + space(AIWA_RC_T501_HDR_SPACE); + + // Send "pre" data + for (unsigned long mask = 1 << (26 - 1); mask; mask >>= 1) { + mark(AIWA_RC_T501_BIT_MARK); + if (pre & mask) space(AIWA_RC_T501_ONE_SPACE) ; + else space(AIWA_RC_T501_ZERO_SPACE) ; + } + +//-v- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! +// it only send 15bits and ignores the top bit +// then uses TOPBIT which is bit-31 to check the bit code +// I suspect TOPBIT should be changed to 0x00008000 + // Skip firts code bit + code <<= 1; + // Send code + for (int i = 0; i < 15; i++) { + mark(AIWA_RC_T501_BIT_MARK); + if (code & TOPBIT) space(AIWA_RC_T501_ONE_SPACE) ; + else space(AIWA_RC_T501_ZERO_SPACE) ; + code <<= 1; + } +//-^- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! + + // POST-DATA, 1 bit, 0x0 + mark(AIWA_RC_T501_BIT_MARK); + space(AIWA_RC_T501_ZERO_SPACE); + + mark(AIWA_RC_T501_BIT_MARK); + space(0); +} +#endif + +//+============================================================================= +#ifdef DECODE_AIWA_RC_T501 +long IRrecv::decodeAiwaRCT501 (decode_results *results) +{ + int data = 0; + int offset = 1; // skip first garbage read + + // Check SIZE + if (irparams.rawlen < 2 * (AIWA_RC_T501_SUM_BITS) + 4) return false ; + + // Check HDR + if (!MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_HDR_MARK)) return false ; + offset++; + + // Check HDR space + if (!MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_HDR_SPACE)) return false ; + offset++; + + offset += 26; // skip pre-data - optional + while(offset < irparams.rawlen - 4) { + if (MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_BIT_MARK)) offset++ ; + else return false ; + + // ONE & ZERO + if (MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ZERO_SPACE)) data <<= 1 ; + else break ; // End of one & zero detected + offset++; + } + + results->bits = (offset - 1) / 2; + if (results->bits < 42) return false ; + results->value = data; + results->decode_type = AIWA_RC_T501; + return true; +} +#endif + diff --git a/ir_Dish.cpp b/ir_Dish.cpp new file mode 100644 index 0000000..22e10d0 --- /dev/null +++ b/ir_Dish.cpp @@ -0,0 +1,55 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// DDDD IIIII SSSS H H +// D D I S H H +// D D I SSS HHHHH +// D D I S H H +// DDDD IIIII SSSS H H +//============================================================================== + +// Sharp and DISH support by Todd Treece ( http://unionbridge.org/design/ircommand ) +// +// The sned function needs to be repeated 4 times +// +// Only send the last for characters of the hex. +// I.E. Use 0x1C10 instead of 0x0000000000001C10 as listed in the LIRC file. +// +// Here is the LIRC file I found that seems to match the remote codes from the +// oscilloscope: +// DISH NETWORK (echostar 301): +// http://lirc.sourceforge.net/remotes/echostar/301_501_3100_5100_58xx_59xx + +#define DISH_BITS 16 + +#define DISH_HDR_MARK 400 +#define DISH_HDR_SPACE 6100 +#define DISH_BIT_MARK 400 +#define DISH_ONE_SPACE 1700 +#define DISH_ZERO_SPACE 2800 +#define DISH_RPT_SPACE 6200 +#define DISH_TOP_BIT 0x8000 + +//+============================================================================= +#ifdef SEND_DISH +void IRsend::sendDISH (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(56); + + mark(DISH_HDR_MARK); + space(DISH_HDR_SPACE); + + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(DISH_BIT_MARK); + space(DISH_ONE_SPACE); + } else { + mark(DISH_BIT_MARK); + space(DISH_ZERO_SPACE); + } + } +} +#endif + diff --git a/ir_JVC.cpp b/ir_JVC.cpp new file mode 100644 index 0000000..151820a --- /dev/null +++ b/ir_JVC.cpp @@ -0,0 +1,97 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// JJJJJ V V CCCC +// J V V C +// J V V C +// J J V V C +// J V CCCC +//============================================================================== + +#define JVC_BITS 16 +#define JVC_HDR_MARK 8000 +#define JVC_HDR_SPACE 4000 +#define JVC_BIT_MARK 600 +#define JVC_ONE_SPACE 1600 +#define JVC_ZERO_SPACE 550 +#define JVC_RPT_LENGTH 60000 + +//+============================================================================= +#ifdef SEND_JVC +void IRsend::sendJVC (unsigned long data, int nbits, int repeat) +{ + // Set IR carrier frequency + enableIROut(38); + + // Only send the Header if this is NOT a repeat command + if (!repeat){ + mark(JVC_HDR_MARK); + space(JVC_HDR_SPACE); + } + + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(JVC_BIT_MARK); + space(JVC_ONE_SPACE); + } else { + mark(JVC_BIT_MARK); + space(JVC_ZERO_SPACE); + } + } + + // Footer + mark(JVC_BIT_MARK); + space(0); // Always end with the LED off +} +#endif + +//+============================================================================= +#ifdef DECODE_JVC +long IRrecv::decodeJVC (decode_results *results) +{ + long data = 0; + int offset = 1; // Skip first space + + // Check for repeat + if (irparams.rawlen - 1 == 33 && + MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK) && + MATCH_MARK(results->rawbuf[irparams.rawlen-1], JVC_BIT_MARK)) { + results->bits = 0; + results->value = REPEAT; + results->decode_type = JVC; + return true; + } + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], JVC_HDR_MARK)) return false ; + offset++; + + if (irparams.rawlen < 2 * JVC_BITS + 1 ) return false ; + + // Initial space + if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) return false ; + offset++; + + for (int i = 0; i < JVC_BITS; i++) { + if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return false ; + offset++; + if (MATCH_SPACE(results->rawbuf[offset], JVC_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], JVC_ZERO_SPACE)) data <<= 1 ; + else return false ; + offset++; + } + + // Stop bit + if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return false ; + + // Success + results->bits = JVC_BITS; + results->value = data; + results->decode_type = JVC; + + return true; +} +#endif + diff --git a/ir_LG.cpp b/ir_LG.cpp new file mode 100644 index 0000000..44b1a77 --- /dev/null +++ b/ir_LG.cpp @@ -0,0 +1,54 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// L GGGG +// L G +// L G GG +// L G G +// LLLLL GGG +//============================================================================== + +#define LG_BITS 28 + +#define LG_HDR_MARK 8000 +#define LG_HDR_SPACE 4000 +#define LG_BIT_MARK 600 +#define LG_ONE_SPACE 1600 +#define LG_ZERO_SPACE 550 +#define LG_RPT_LENGTH 60000 + +//+============================================================================= +#ifdef DECODE_LG +long IRrecv::decodeLG (decode_results *results) +{ + long data = 0; + int offset = 1; // Skip first space + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], LG_HDR_MARK)) return false ; + offset++; + if (irparams.rawlen < 2 * LG_BITS + 1 ) return false ; + // Initial space + if (!MATCH_SPACE(results->rawbuf[offset], LG_HDR_SPACE)) return false ; + offset++; + for (int i = 0; i < LG_BITS; i++) { + if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; + offset++; + if (MATCH_SPACE(results->rawbuf[offset], LG_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], LG_ZERO_SPACE)) data <<= 1 ; + else return false ; + offset++; + } + + // Stop bit + if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; + + // Success + results->bits = LG_BITS; + results->value = data; + results->decode_type = LG; + return true; +} +#endif + diff --git a/ir_Mitsubishi.cpp b/ir_Mitsubishi.cpp new file mode 100644 index 0000000..e02b64a --- /dev/null +++ b/ir_Mitsubishi.cpp @@ -0,0 +1,85 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// MMMMM IIIII TTTTT SSSS U U BBBB IIIII SSSS H H IIIII +// M M M I T S U U B B I S H H I +// M M M I T SSS U U BBBB I SSS HHHHH I +// M M I T S U U B B I S H H I +// M M IIIII T SSSS UUU BBBBB IIIII SSSS H H IIIII +//============================================================================== + +// Looks like Sony except for timings, 48 chars of data and time/space different + +#define MITSUBISHI_BITS 16 + +// Mitsubishi RM 75501 +// 14200 7 41 7 42 7 42 7 17 7 17 7 18 7 41 7 18 7 17 7 17 7 18 7 41 8 17 7 17 7 18 7 17 7 +// #define MITSUBISHI_HDR_MARK 250 // seen range 3500 +#define MITSUBISHI_HDR_SPACE 350 // 7*50+100 +#define MITSUBISHI_ONE_MARK 1950 // 41*50-100 +#define MITSUBISHI_ZERO_MARK 750 // 17*50-100 +// #define MITSUBISHI_DOUBLE_SPACE_USECS 800 // usually ssee 713 - not using ticks as get number wrapround +// #define MITSUBISHI_RPT_LENGTH 45000 + +//+============================================================================= +#ifdef DECODE_MITSUBISHI +long IRrecv::decodeMitsubishi (decode_results *results) +{ + // Serial.print("?!? decoding Mitsubishi:");Serial.print(irparams.rawlen); Serial.print(" want "); Serial.println( 2 * MITSUBISHI_BITS + 2); + long data = 0; + if (irparams.rawlen < 2 * MITSUBISHI_BITS + 2) return false ; + int offset = 0; // Skip first space + // Initial space + +#if 0 + // Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay + Serial.print("IR Gap: "); + Serial.println( results->rawbuf[offset]); + Serial.println( "test against:"); + Serial.println(results->rawbuf[offset]); +#endif + +#if 0 + // Not seeing double keys from Mitsubishi + if (results->rawbuf[offset] < MITSUBISHI_DOUBLE_SPACE_USECS) { + // Serial.print("IR Gap found: "); + results->bits = 0; + results->value = REPEAT; + results->decode_type = MITSUBISHI; + return true; + } +#endif + + offset++; + + // Typical + // 14200 7 41 7 42 7 42 7 17 7 17 7 18 7 41 7 18 7 17 7 17 7 18 7 41 8 17 7 17 7 18 7 17 7 + + // Initial Space + if (!MATCH_MARK(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) return false ; + offset++; + + while (offset + 1 < irparams.rawlen) { + if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ONE_MARK)) data = (data << 1) | 1 ; + else if (MATCH_MARK(results->rawbuf[offset], MITSUBISHI_ZERO_MARK)) data <<= 1 ; + else return false ; + offset++; + + if (!MATCH_SPACE(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) break ; + offset++; + } + + // Success + results->bits = (offset - 1) / 2; + if (results->bits < MITSUBISHI_BITS) { + results->bits = 0; + return false; + } + + results->value = data; + results->decode_type = MITSUBISHI; + return true; +} +#endif + diff --git a/ir_NEC.cpp b/ir_NEC.cpp new file mode 100644 index 0000000..cb3b248 --- /dev/null +++ b/ir_NEC.cpp @@ -0,0 +1,98 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// N N EEEEE CCCC +// NN N E C +// N N N EEE C +// N NN E C +// N N EEEEE CCCC +//============================================================================== + +#define NEC_BITS 32 +#define NEC_HDR_MARK 9000 +#define NEC_HDR_SPACE 4500 +#define NEC_BIT_MARK 560 +#define NEC_ONE_SPACE 1690 +#define NEC_ZERO_SPACE 560 +#define NEC_RPT_SPACE 2250 + +//+============================================================================= +#ifdef SEND_NEC +void IRsend::sendNEC (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(38); + + // Header + mark(NEC_HDR_MARK); + space(NEC_HDR_SPACE); + + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(NEC_BIT_MARK); + space(NEC_ONE_SPACE); + } else { + mark(NEC_BIT_MARK); + space(NEC_ZERO_SPACE); + } + } + + // Footer + mark(NEC_BIT_MARK); + space(0); // Always end with the LED off +} +#endif + +//+============================================================================= +// NECs have a repeat only 4 items long +// +#ifdef DECODE_NEC +long IRrecv::decodeNEC (decode_results *results) +{ + long data = 0; // We decode in to here; Start with nothing + int offset = 1; // Index in to results; Skip first entry!? + + // Check header "mark" + if (!MATCH_MARK(results->rawbuf[offset], NEC_HDR_MARK)) return false ; + offset++; + + // Check for repeat + if ( (irparams.rawlen == 4) + && MATCH_SPACE(results->rawbuf[offset ], NEC_RPT_SPACE) + && MATCH_MARK (results->rawbuf[offset+1], NEC_BIT_MARK ) + ) { + results->bits = 0; + results->value = REPEAT; + results->decode_type = NEC; + return true; + } + + // Check we have enough data + if (irparams.rawlen < (2 * NEC_BITS) + 4) return false ; + + // Check header "space" + if (!MATCH_SPACE(results->rawbuf[offset], NEC_HDR_SPACE)) return false ; + offset++; + + // Build the data + for (int i = 0; i < NEC_BITS; i++) { + // Check data "mark" + if (!MATCH_MARK(results->rawbuf[offset], NEC_BIT_MARK)) return false ; + offset++; + // Suppend this bit + if (MATCH_SPACE(results->rawbuf[offset], NEC_ONE_SPACE )) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], NEC_ZERO_SPACE)) data = (data << 1) | 0 ; + else return false ; + offset++; + } + + // Success + results->bits = NEC_BITS; + results->value = data; + results->decode_type = NEC; + + return true; +} +#endif diff --git a/ir_Panasonic.cpp b/ir_Panasonic.cpp new file mode 100644 index 0000000..494c28d --- /dev/null +++ b/ir_Panasonic.cpp @@ -0,0 +1,80 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// PPPP AAA N N AAA SSSS OOO N N IIIII CCCC +// P P A A NN N A A S O O NN N I C +// PPPP AAAAA N N N AAAAA SSS O O N N N I C +// P A A N NN A A S O O N NN I C +// P A A N N A A SSSS OOO N N IIIII CCCC +//============================================================================== + +#define PANASONIC_BITS 48 +#define PANASONIC_HDR_MARK 3502 +#define PANASONIC_HDR_SPACE 1750 +#define PANASONIC_BIT_MARK 502 +#define PANASONIC_ONE_SPACE 1244 +#define PANASONIC_ZERO_SPACE 400 + +//+============================================================================= +#ifdef SEND_PANASONIC +void IRsend::sendPanasonic (unsigned int address, unsigned long data) +{ + // Set IR carrier frequency + enableIROut(35); + + // Header + mark(PANASONIC_HDR_MARK); + space(PANASONIC_HDR_SPACE); + + // Address + for (unsigned long mask = 1 << (16 - 1); mask; mask >>= 1) { + mark(PANASONIC_BIT_MARK); + if (address & mask) space(PANASONIC_ONE_SPACE) ; + else space(PANASONIC_ZERO_SPACE) ; + } + + // Data + for (unsigned long mask = 1 << (32 - 1); mask; mask >>= 1) { + mark(PANASONIC_BIT_MARK); + if (data & mask) space(PANASONIC_ONE_SPACE) ; + else space(PANASONIC_ZERO_SPACE) ; + } + + // Footer + mark(PANASONIC_BIT_MARK); + space(0); // Always end with the LED off +} +#endif + +//+============================================================================= +#ifdef DECODE_PANASONIC +long IRrecv::decodePanasonic (decode_results *results) +{ + unsigned long long data = 0; + int offset = 1; + + if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) return false ; + offset++; + if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_SPACE)) return false ; + offset++; + + // decode address + for (int i = 0; i < PANASONIC_BITS; i++) { + if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_BIT_MARK)) return false ; + + if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ONE_SPACE )) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset],PANASONIC_ZERO_SPACE)) data = (data << 1) | 0 ; + else return false ; + offset++; + } + + results->value = (unsigned long)data; + results->panasonicAddress = (unsigned int)(data >> 32); + results->decode_type = PANASONIC; + results->bits = PANASONIC_BITS; + + return true; +} +#endif + diff --git a/ir_RC5_RC6.cpp b/ir_RC5_RC6.cpp new file mode 100644 index 0000000..16c2bad --- /dev/null +++ b/ir_RC5_RC6.cpp @@ -0,0 +1,196 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//+============================================================================= +// Gets one undecoded level at a time from the raw buffer. +// The RC5/6 decoding is easier if the data is broken into time intervals. +// E.g. if the buffer has MARK for 2 time intervals and SPACE for 1, +// successive calls to getRClevel will return MARK, MARK, SPACE. +// offset and used are updated to keep track of the current position. +// t1 is the time interval for a single bit in microseconds. +// Returns -1 for error (measured time interval is not a multiple of t1). +// +int IRrecv::getRClevel (decode_results *results, int *offset, int *used, int t1) +{ + if (*offset >= results->rawlen) return SPACE ; // After end of recorded buffer, assume SPACE. + int width = results->rawbuf[*offset]; + int val = ((*offset) % 2) ? MARK : SPACE; + int correction = (val == MARK) ? MARK_EXCESS : - MARK_EXCESS; + + int avail; + if (MATCH(width, t1 + correction)) avail = 1 ; + else if (MATCH(width, 2*t1 + correction)) avail = 2 ; + else if (MATCH(width, 3*t1 + correction)) avail = 3 ; + else return -1 ; + + (*used)++; + if (*used >= avail) { + *used = 0; + (*offset)++; + } + + DBG_PRINTLN( (val == MARK) ? "MARK" : "SPACE" ); + return val; +} + +//============================================================================== +// RRRR CCCC 55555 +// R R C 5 +// RRRR C 5555 +// R R C 5 +// R R CCCC 5555 +// +// NB: First bit must be a one (start bit) +// +#define MIN_RC5_SAMPLES 11 +#define RC5_T1 889 +#define RC5_RPT_LENGTH 46000 + +//+============================================================================= +#ifdef SEND_RC5 +void IRsend::sendRC5 (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(36); + + // Start + mark(RC5_T1); + space(RC5_T1); + mark(RC5_T1); + + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + space(RC5_T1); // 1 is space, then mark + mark(RC5_T1); + } else { + mark(RC5_T1); + space(RC5_T1); + } + } + + space(0); // Always end with the LED off +} +#endif + +//+============================================================================= +#ifdef DECODE_RC5 +long IRrecv::decodeRC5 (decode_results *results) +{ + if (irparams.rawlen < MIN_RC5_SAMPLES + 2) return false ; + int offset = 1; // Skip gap space + long data = 0; + int used = 0; + // Get start bits + if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; + if (getRClevel(results, &offset, &used, RC5_T1) != SPACE) return false ; + if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; + int nbits; + for (nbits = 0; offset < irparams.rawlen; nbits++) { + int levelA = getRClevel(results, &offset, &used, RC5_T1); + int levelB = getRClevel(results, &offset, &used, RC5_T1); + + if (levelA == SPACE && levelB == MARK) data = (data << 1) | 1 ; // 1 bit + else if (levelA == MARK && levelB == SPACE) data <<= 1 ; // zero bit + else return false ; + } + + // Success + results->bits = nbits; + results->value = data; + results->decode_type = RC5; + return true; +} +#endif + +//+============================================================================= +// RRRR CCCC 6666 +// R R C 6 +// RRRR C 6666 +// R R C 6 6 +// R R CCCC 666 +// +// NB : Caller needs to take care of flipping the toggle bit +// +#define MIN_RC6_SAMPLES 1 +#define RC6_HDR_MARK 2666 +#define RC6_HDR_SPACE 889 +#define RC6_T1 444 +#define RC6_RPT_LENGTH 46000 + +#ifdef SEND_RC6 +void IRsend::sendRC6 (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(36); + + // Header + mark(RC6_HDR_MARK); + space(RC6_HDR_SPACE); + + // Start bit + mark(RC6_T1); + space(RC6_T1); + + // Data + for (unsigned long i = 1, mask = 1 << (nbits - 1); mask; i++, mask >>= 1) { + // The fourth bit we send is a "double width trailer bit" + int t = (i == 4) ? (RC6_T1 * 2) : (RC6_T1) ; + if (data & mask) { + mark(t); + space(t); + } else { + space(t); + mark(t); + } + } + + space(0); // Always end with the LED off +} +#endif + +//+============================================================================= +#ifdef DECODE_RC6 +long IRrecv::decodeRC6 (decode_results *results) +{ + if (results->rawlen < MIN_RC6_SAMPLES) return false ; + int offset = 1; // Skip first space + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], RC6_HDR_MARK)) return false ; + offset++; + + if (!MATCH_SPACE(results->rawbuf[offset], RC6_HDR_SPACE)) return false ; + offset++; + + long data = 0; + int used = 0; + + // Get start bit (1) + if (getRClevel(results, &offset, &used, RC6_T1) != MARK) return false ; + if (getRClevel(results, &offset, &used, RC6_T1) != SPACE) return false ; + int nbits; + for (nbits = 0; offset < results->rawlen; nbits++) { + int levelA, levelB; // Next two levels + levelA = getRClevel(results, &offset, &used, RC6_T1); + if (nbits == 3) { + // T bit is double wide; make sure second half matches + if (levelA != getRClevel(results, &offset, &used, RC6_T1)) return false; + } + levelB = getRClevel(results, &offset, &used, RC6_T1); + if (nbits == 3) { + // T bit is double wide; make sure second half matches + if (levelB != getRClevel(results, &offset, &used, RC6_T1)) return false; + } + if (levelA == MARK && levelB == SPACE) data = (data << 1) | 1 ; // 1-bit (reversed compared to RC5) + else if (levelA == SPACE && levelB == MARK) data <<= 1 ; // zero bit + else return false ; // Error + } + + // Success + results->bits = nbits; + results->value = data; + results->decode_type = RC6; + return true; +} +#endif diff --git a/ir_Samsung.cpp b/ir_Samsung.cpp new file mode 100644 index 0000000..0773edd --- /dev/null +++ b/ir_Samsung.cpp @@ -0,0 +1,94 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// SSSS AAA MMM SSSS U U N N GGGG +// S A A M M M S U U NN N G +// SSS AAAAA M M M SSS U U N N N G GG +// S A A M M S U U N NN G G +// SSSS A A M M SSSS UUU N N GGG +//============================================================================== + +#define SAMSUNG_BITS 32 +#define SAMSUNG_HDR_MARK 5000 +#define SAMSUNG_HDR_SPACE 5000 +#define SAMSUNG_BIT_MARK 560 +#define SAMSUNG_ONE_SPACE 1600 +#define SAMSUNG_ZERO_SPACE 560 +#define SAMSUNG_RPT_SPACE 2250 + +//+============================================================================= +#ifdef SEND_SAMSUNG +void IRsend::sendSAMSUNG (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(38); + + // Header + mark(SAMSUNG_HDR_MARK); + space(SAMSUNG_HDR_SPACE); + + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(SAMSUNG_BIT_MARK); + space(SAMSUNG_ONE_SPACE); + } else { + mark(SAMSUNG_BIT_MARK); + space(SAMSUNG_ZERO_SPACE); + } + } + + // Footer + mark(SAMSUNG_BIT_MARK); + space(0); // Always end with the LED off +} +#endif + +//+============================================================================= +// SAMSUNGs have a repeat only 4 items long +// +#ifdef DECODE_SAMSUNG +long IRrecv::decodeSAMSUNG (decode_results *results) +{ + long data = 0; + int offset = 1; // Skip first space + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_HDR_MARK)) return false ; + offset++; + + // Check for repeat + if (irparams.rawlen == 4 && + MATCH_SPACE(results->rawbuf[offset], SAMSUNG_RPT_SPACE) && + MATCH_MARK(results->rawbuf[offset+1], SAMSUNG_BIT_MARK)) { + results->bits = 0; + results->value = REPEAT; + results->decode_type = SAMSUNG; + return true; + } + if (irparams.rawlen < 2 * SAMSUNG_BITS + 4) return false ; + + // Initial space + if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) return false ; + offset++; + + for (int i = 0; i < SAMSUNG_BITS; i++) { + if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_BIT_MARK)) return false ; + + offset++; + + if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ZERO_SPACE)) data <<= 1 ; + else return false ; + offset++; + } + + // Success + results->bits = SAMSUNG_BITS; + results->value = data; + results->decode_type = SAMSUNG; + return true; +} +#endif + diff --git a/ir_Sanyo.cpp b/ir_Sanyo.cpp new file mode 100644 index 0000000..ad0e76f --- /dev/null +++ b/ir_Sanyo.cpp @@ -0,0 +1,79 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// SSSS AAA N N Y Y OOO +// S A A NN N Y Y O O +// SSS AAAAA N N N Y O O +// S A A N NN Y O O +// SSSS A A N N Y OOO +//============================================================================== + +// I think this is a Sanyo decoder: Serial = SA 8650B +// Looks like Sony except for timings, 48 chars of data and time/space different + +#define SANYO_BITS 12 + +#define SANYO_HDR_MARK 3500 // seen range 3500 +#define SANYO_HDR_SPACE 950 // seen 950 +#define SANYO_ONE_MARK 2400 // seen 2400 +#define SANYO_ZERO_MARK 700 // seen 700 +#define SANYO_DOUBLE_SPACE_USECS 800 // usually ssee 713 - not using ticks as get number wrapround +#define SANYO_RPT_LENGTH 45000 + +//+============================================================================= +#ifdef DECODE_SANYO +long IRrecv::decodeSanyo (decode_results *results) +{ + long data = 0; + if (irparams.rawlen < 2 * SANYO_BITS + 2) return false ; + int offset = 0; // Skip first space + // Initial space + +#if 0 + // Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay + Serial.print("IR Gap: "); + Serial.println( results->rawbuf[offset]); + Serial.println( "test against:"); + Serial.println(results->rawbuf[offset]); +#endif + + if (results->rawbuf[offset] < SANYO_DOUBLE_SPACE_USECS) { + // Serial.print("IR Gap found: "); + results->bits = 0; + results->value = REPEAT; + results->decode_type = SANYO; + return true; + } + offset++; + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; + offset++; + + // Skip Second Mark + if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; + offset++; + + while (offset + 1 < irparams.rawlen) { + if (!MATCH_SPACE(results->rawbuf[offset], SANYO_HDR_SPACE)) break ; + offset++; + if (MATCH_MARK(results->rawbuf[offset], SANYO_ONE_MARK)) data = (data << 1) | 1 ; + else if (MATCH_MARK(results->rawbuf[offset], SANYO_ZERO_MARK)) data <<= 1 ; + else return false ; + offset++; + } + + // Success + results->bits = (offset - 1) / 2; + if (results->bits < 12) { + results->bits = 0; + return false; + } + + results->value = data; + results->decode_type = SANYO; + return true; +} +#endif + diff --git a/ir_Sharp.cpp b/ir_Sharp.cpp new file mode 100644 index 0000000..ffd77ed --- /dev/null +++ b/ir_Sharp.cpp @@ -0,0 +1,71 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// SSSS H H AAA RRRR PPPP +// S H H A A R R P P +// SSS HHHHH AAAAA RRRR PPPP +// S H H A A R R P +// SSSS H H A A R R P +//============================================================================== + +// Sharp and DISH support by Todd Treece ( http://unionbridge.org/design/ircommand ) +// +// The send function has the necessary repeat built in because of the need to +// invert the signal. +// +// Sharp protocol documentation: +// http://www.sbprojects.com/knowledge/ir/sharp.htm +// +// Here is the LIRC file I found that seems to match the remote codes from the +// oscilloscope: +// Sharp LCD TV: +// http://lirc.sourceforge.net/remotes/sharp/GA538WJSA + +#define SHARP_BITS 15 + +#define SHARP_BIT_MARK 245 +#define SHARP_ONE_SPACE 1805 +#define SHARP_ZERO_SPACE 795 +#define SHARP_GAP 600000 +#define SHARP_TOGGLE_MASK 0x3FF +#define SHARP_RPT_SPACE 3000 + +//+============================================================================= +#ifdef SEND_SHARP +void IRsend::sendSharpRaw (unsigned long data, int nbits) +{ + unsigned long invertdata = data ^ SHARP_TOGGLE_MASK; + enableIROut(38); + + // Sending codes in bursts of 3 (normal, inverted, normal) makes transmission + // much more reliable. That's the exact behaviour of CD-S6470 remote control. + for (int n = 0; n < 3; n++) { + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(SHARP_BIT_MARK); + space(SHARP_ONE_SPACE); + } else { + mark(SHARP_BIT_MARK); + space(SHARP_ZERO_SPACE); + } + } + + mark(SHARP_BIT_MARK); + space(SHARP_ZERO_SPACE); + delay(40); + + data = data ^ SHARP_TOGGLE_MASK; + } +} + +//+============================================================================= +// Sharp send compatible with data obtained through decodeSharp() +// ^^^^^^^^^^^^^ FUNCTION MISSING! +// +void IRsend::sendSharp (unsigned int address, unsigned int command) +{ + sendSharpRaw((address << 10) | (command << 2) | 2, 15); +} + +#endif diff --git a/ir_Sony.cpp b/ir_Sony.cpp new file mode 100644 index 0000000..4446f83 --- /dev/null +++ b/ir_Sony.cpp @@ -0,0 +1,95 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// SSSS OOO N N Y Y +// S O O NN N Y Y +// SSS O O N N N Y +// S O O N NN Y +// SSSS OOO N N Y +//============================================================================== + +#define SONY_BITS 12 +#define SONY_HDR_MARK 2400 +#define SONY_HDR_SPACE 600 +#define SONY_ONE_MARK 1200 +#define SONY_ZERO_MARK 600 +#define SONY_RPT_LENGTH 45000 +#define SONY_DOUBLE_SPACE_USECS 500 // usually ssee 713 - not using ticks as get number wrapround + +//+============================================================================= +#ifdef SEND_SONY +void IRsend::sendSony (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(40); + + // Header + mark(SONY_HDR_MARK); + space(SONY_HDR_SPACE); + + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(SONY_ONE_MARK); + space(SONY_HDR_SPACE); + } else { + mark(SONY_ZERO_MARK); + space(SONY_HDR_SPACE); + } + } + + // We will have ended with LED off +} +#endif + +//+============================================================================= +#ifdef DECODE_SONY +long IRrecv::decodeSony (decode_results *results) +{ + long data = 0; + if (irparams.rawlen < 2 * SONY_BITS + 2) return false ; + int offset = 0; // Dont skip first space, check its size + + // Some Sony's deliver repeats fast after first + // unfortunately can't spot difference from of repeat from two fast clicks + if (results->rawbuf[offset] < SONY_DOUBLE_SPACE_USECS) { + // Serial.print("IR Gap found: "); + results->bits = 0; + results->value = REPEAT; + +# ifdef DECODE_SANYO + results->decode_type = SANYO; +# else + results->decode_type = UNKNOWN; +# endif + + return true; + } + offset++; + + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset], SONY_HDR_MARK)) return false ; + offset++; + + while (offset + 1 < irparams.rawlen) { + if (!MATCH_SPACE(results->rawbuf[offset], SONY_HDR_SPACE)) break ; + offset++; + if (MATCH_MARK(results->rawbuf[offset], SONY_ONE_MARK)) data = (data << 1) | 1 ; + else if (MATCH_MARK(results->rawbuf[offset], SONY_ZERO_MARK)) data <<= 1 ; + else return false ; + offset++; + } + + // Success + results->bits = (offset - 1) / 2; + if (results->bits < 12) { + results->bits = 0; + return false; + } + results->value = data; + results->decode_type = SONY; + return true; +} +#endif + diff --git a/ir_Whynter.cpp b/ir_Whynter.cpp new file mode 100644 index 0000000..c97732a --- /dev/null +++ b/ir_Whynter.cpp @@ -0,0 +1,96 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// W W H H Y Y N N TTTTT EEEEE RRRRR +// W W H H Y Y NN N T E R R +// W W W HHHHH Y N N N T EEE RRRR +// W W W H H Y N NN T E R R +// WWW H H Y N N T EEEEE R R +//============================================================================== + +#define WHYNTER_BITS 32 +#define WHYNTER_HDR_MARK 2850 +#define WHYNTER_HDR_SPACE 2850 +#define WHYNTER_BIT_MARK 750 +#define WHYNTER_ONE_MARK 750 +#define WHYNTER_ONE_SPACE 2150 +#define WHYNTER_ZERO_MARK 750 +#define WHYNTER_ZERO_SPACE 750 + +//+============================================================================= +#ifdef SEND_WHYNTER +void IRsend::sendWhynter (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(38); + + // Start + mark(WHYNTER_ZERO_MARK); + space(WHYNTER_ZERO_SPACE); + + // Header + mark(WHYNTER_HDR_MARK); + space(WHYNTER_HDR_SPACE); + + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(WHYNTER_ONE_MARK); + space(WHYNTER_ONE_SPACE); + } else { + mark(WHYNTER_ZERO_MARK); + space(WHYNTER_ZERO_SPACE); + } + } + + // Footer + mark(WHYNTER_ZERO_MARK); + space(WHYNTER_ZERO_SPACE); // Always end with the LED off +} +#endif + +//+============================================================================= +#ifdef DECODE_WHYNTER +long IRrecv::decodeWhynter (decode_results *results) +{ + long data = 0; + + if (irparams.rawlen < 2 * WHYNTER_BITS + 6) return false ; + + int offset = 1; // skip initial space + + // sequence begins with a bit mark and a zero space + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; + offset++; + if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_ZERO_SPACE)) return false ; + offset++; + + // header mark and space + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_HDR_MARK)) return false ; + offset++; + if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_HDR_SPACE)) return false ; + offset++; + + // data bits + for (int i = 0; i < WHYNTER_BITS; i++) { + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; + offset++; + + if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset],WHYNTER_ZERO_SPACE)) data <<= 1 ; + else return false ; + offset++; + } + + // trailing mark + if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; + + // Success + results->bits = WHYNTER_BITS; + results->value = data; + results->decode_type = WHYNTER; + return true; +} +#endif + From a1cf782c44f62e4774bfc7852111bed2a1687e44 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 14:42:59 +0100 Subject: [PATCH 12/31] Bit more code cleanup --- IRremote.cpp | 82 ++++++++++++++++++++++++----------------- IRremote.h | 18 +++++---- IRremoteInt.h | 10 +++-- irISR.cpp | 100 +++++++++++++++++++++++++------------------------- irRecv.cpp | 42 ++++++++------------- 5 files changed, 131 insertions(+), 121 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index 534ae66..ad01643 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -31,50 +31,66 @@ // ...but every time i reduce these functions down to macros, the decoders stop working!!?? //+============================================================================= +// The match functions were (apparently) originally MACROs to improve code speed +// (although this would have bloated the code size) hence the names being CAPS +// A later release implemented debug output and so they needed to be converted +// to functions. +// I tried to implement a dual-compile mode (DEBUG/non-DEBUG) but for some +// reason, no matter what I did I could not get them to function as macros again. +// I have found a *lot* of bugs in the Arduino compiler over the last few weeks, +// and I am currently assuming that one of these bugs is my problem. +// I may revisit this code at a later date and look at the assembler produced +// in a hope of finding out what is going on, but for now they will remain as +// functions even in non-DEBUG mode +// int MATCH (int measured, int desired) { - DBG_PRINT("Testing: "); - DBG_PRINT(TICKS_LOW(desired), DEC); - DBG_PRINT(" <= "); - DBG_PRINT(measured, DEC); - DBG_PRINT(" <= "); - DBG_PRINTLN(TICKS_HIGH(desired), DEC); + DBG_PRINT("Testing: "); + DBG_PRINT(TICKS_LOW(desired), DEC); + DBG_PRINT(" <= "); + DBG_PRINT(measured, DEC); + DBG_PRINT(" <= "); + DBG_PRINTLN(TICKS_HIGH(desired), DEC); - return ((measured >= TICKS_LOW(desired)) && (measured <= TICKS_HIGH(desired))); + return ((measured >= TICKS_LOW(desired)) && (measured <= TICKS_HIGH(desired))); } -//+============================================================================= +//+======================================================== +// Marks tend to be 100us too long when received due to sensor lag. +// int MATCH_MARK (int measured_ticks, int desired_us) { - DBG_PRINT("Testing mark "); - DBG_PRINT(measured_ticks * USECPERTICK, DEC); - DBG_PRINT(" vs "); - DBG_PRINT(desired_us, DEC); - DBG_PRINT(": "); - DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS), DEC); - DBG_PRINT(" <= "); - DBG_PRINT(measured_ticks, DEC); - DBG_PRINT(" <= "); - DBG_PRINTLN(TICKS_HIGH(desired_us + MARK_EXCESS), DEC); + DBG_PRINT("Testing mark "); + DBG_PRINT(measured_ticks * USECPERTICK, DEC); + DBG_PRINT(" vs "); + DBG_PRINT(desired_us, DEC); + DBG_PRINT(": "); + DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS), DEC); + DBG_PRINT(" <= "); + DBG_PRINT(measured_ticks, DEC); + DBG_PRINT(" <= "); + DBG_PRINTLN(TICKS_HIGH(desired_us + MARK_EXCESS), DEC); - return ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS)) - && (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS))); + return ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS)) + && (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS))); } -//+============================================================================= +//+======================================================== +// Spaces tend to be 100us too short when received due to sensor lag. +// int MATCH_SPACE (int measured_ticks, int desired_us) { - DBG_PRINT("Testing space "); - DBG_PRINT(measured_ticks * USECPERTICK, DEC); - DBG_PRINT(" vs "); - DBG_PRINT(desired_us, DEC); - DBG_PRINT(": "); - DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS), DEC); - DBG_PRINT(" <= "); - DBG_PRINT(measured_ticks, DEC); - DBG_PRINT(" <= "); - DBG_PRINTLN(TICKS_HIGH(desired_us - MARK_EXCESS), DEC); + DBG_PRINT("Testing space "); + DBG_PRINT(measured_ticks * USECPERTICK, DEC); + DBG_PRINT(" vs "); + DBG_PRINT(desired_us, DEC); + DBG_PRINT(": "); + DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS), DEC); + DBG_PRINT(" <= "); + DBG_PRINT(measured_ticks, DEC); + DBG_PRINT(" <= "); + DBG_PRINTLN(TICKS_HIGH(desired_us - MARK_EXCESS), DEC); - return ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS)) - && (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS))); + return ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS)) + && (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS))); } diff --git a/IRremote.h b/IRremote.h index ed9a448..2bb3388 100644 --- a/IRremote.h +++ b/IRremote.h @@ -1,3 +1,6 @@ +#ifndef IRremote_h +#define IRremote_h + #define DEBUG #undef DEBUG @@ -16,10 +19,7 @@ int MATCH (int measured, int desired) ; # define DBG_PRINTLN(...) #endif -///int MATCH (int measured, int desired); -///int MATCH_MARK (int measured_ticks, int desired_us); -///int MATCH_SPACE (int measured_ticks, int desired_us); - +//------------------------------------------------------------------------------ #define SEND_NEC #define DECODE_NEC #define SEND_WHYNTER @@ -60,9 +60,6 @@ int MATCH (int measured, int desired) ; * Whynter A/C ARC-110WD added by Francesco Meschia */ -#ifndef IRremote_h -#define IRremote_h - // The following are compile-time library options. // If you change them, recompile the library. // If DEBUG is defined, a lot of debugging output will be printed during decoding. @@ -71,6 +68,7 @@ int MATCH (int measured, int desired) ; //#define DEBUG // #define TEST +//------------------------------------------------------------------------------ enum decode_type_t { UNKNOWN = -1, UNUSED = 0, @@ -90,6 +88,7 @@ enum decode_type_t { AIWA_RC_T501 = 14, }; +//------------------------------------------------------------------------------ // Results returned from the decoder class decode_results { public: @@ -104,9 +103,11 @@ public: int rawlen; // Number of records in rawbuf. }; +//------------------------------------------------------------------------------ // Decoded value for NEC when a repeat code is received #define REPEAT 0xffffffff +//------------------------------------------------------------------------------ // main class for receiving IR class IRrecv { @@ -163,6 +164,7 @@ private: } ; +//------------------------------------------------------------------------------ // Only used for testing; can remove virtual for shorter code #ifdef TEST #define VIRTUAL virtual @@ -170,6 +172,7 @@ private: #define VIRTUAL #endif +//------------------------------------------------------------------------------ class IRsend { public: @@ -217,6 +220,7 @@ public: VIRTUAL void space(int usec); } ; +//------------------------------------------------------------------------------ // Some useful constants #define USECPERTICK 50 // microseconds per clock interrupt tick diff --git a/IRremoteInt.h b/IRremoteInt.h index af0015b..21a0c8d 100644 --- a/IRremoteInt.h +++ b/IRremoteInt.h @@ -17,18 +17,21 @@ #ifndef IRremoteint_h #define IRremoteint_h +//------------------------------------------------------------------------------ #ifdef IR_GLOBAL # define EXTERN #else # define EXTERN extern #endif +//------------------------------------------------------------------------------ #if defined(ARDUINO) && ARDUINO >= 100 #include #else #include #endif +//------------------------------------------------------------------------------ // define which timer to use // // Uncomment the timer you wish to use on your board. If you @@ -78,18 +81,18 @@ #define IR_USE_TIMER2 // tx = pin 3 #endif - - +//------------------------------------------------------------------------------ #ifdef F_CPU #define SYSCLOCK F_CPU // main Arduino clock #else #define SYSCLOCK 16000000 // main Arduino clock #endif +//------------------------------------------------------------------------------ #define ERR 0 #define DECODED 1 - +//------------------------------------------------------------------------------ // defines for setting and clearing register bits #ifndef cbi #define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) @@ -98,6 +101,7 @@ #define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) #endif +//------------------------------------------------------------------------------ // Pulse parms are *50-100 for the Mark and *50+100 for the space // First MARK is the one after the long gap // pulse parameters in usec diff --git a/irISR.cpp b/irISR.cpp index 8a23c9e..5e1d98d 100644 --- a/irISR.cpp +++ b/irISR.cpp @@ -14,63 +14,61 @@ // ISR (TIMER_INTR_NAME) { - TIMER_RESET; + TIMER_RESET; - uint8_t irdata = (uint8_t)digitalRead(irparams.recvpin); + uint8_t irdata = (uint8_t)digitalRead(irparams.recvpin); - irparams.timer++; // One more 50us tick - if (irparams.rawlen >= RAWBUF) irparams.rcvstate = STATE_STOP ; // Buffer overflow + irparams.timer++; // One more 50us tick + if (irparams.rawlen >= RAWBUF) irparams.rcvstate = STATE_STOP ; // Buffer overflow - switch(irparams.rcvstate) { - case STATE_IDLE: // In the middle of a gap - if (irdata == MARK) { - if (irparams.timer < GAP_TICKS) { - // Not big enough to be a gap. - irparams.timer = 0; - } - else { - // gap just ended, record duration and start recording transmission - irparams.rawlen = 0; - irparams.rawbuf[irparams.rawlen++] = irparams.timer; - irparams.timer = 0; - irparams.rcvstate = STATE_MARK; - } - } - break; + switch(irparams.rcvstate) { + case STATE_IDLE: // In the middle of a gap + if (irdata == MARK) { + if (irparams.timer < GAP_TICKS) { + // Not big enough to be a gap. + irparams.timer = 0; - case STATE_MARK: // timing MARK - if (irdata == SPACE) { // MARK ended, record time - irparams.rawbuf[irparams.rawlen++] = irparams.timer; - irparams.timer = 0; - irparams.rcvstate = STATE_SPACE; - } - break; + } else { + // gap just ended, record duration and start recording transmission + irparams.rawlen = 0; + irparams.rawbuf[irparams.rawlen++] = irparams.timer; + irparams.timer = 0; + irparams.rcvstate = STATE_MARK; + } + } + break; - case STATE_SPACE: // timing SPACE - if (irdata == MARK) { // SPACE just ended, record it - irparams.rawbuf[irparams.rawlen++] = irparams.timer; - irparams.timer = 0; - irparams.rcvstate = STATE_MARK; - } - else { // SPACE - if (irparams.timer > GAP_TICKS) { - // big SPACE, indicates gap between codes - // Mark current code as ready for processing - // Switch to STOP - // Don't reset timer; keep counting space width - irparams.rcvstate = STATE_STOP; - } - } - break; + case STATE_MARK: // timing MARK + if (irdata == SPACE) { // MARK ended, record time + irparams.rawbuf[irparams.rawlen++] = irparams.timer; + irparams.timer = 0; + irparams.rcvstate = STATE_SPACE; + } + break; - case STATE_STOP: // waiting, measuring gap - if (irdata == MARK) irparams.timer = 0 ; // reset gap timer - break; - } + case STATE_SPACE: // timing SPACE + if (irdata == MARK) { // SPACE just ended, record it + irparams.rawbuf[irparams.rawlen++] = irparams.timer; + irparams.timer = 0; + irparams.rcvstate = STATE_MARK; - if (irparams.blinkflag) { - if (irdata == MARK) BLINKLED_ON() ; // turn pin 13 LED on - else BLINKLED_OFF() ; // turn pin 13 LED off - } + } else if (irparams.timer > GAP_TICKS) { // SPACE + // big SPACE, indicates gap between codes + // Mark current code as ready for processing + // Switch to STOP + // Don't reset timer; keep counting space width + irparams.rcvstate = STATE_STOP; + } + break; + + case STATE_STOP: // waiting, measuring gap + if (irdata == MARK) irparams.timer = 0 ; // reset gap timer + break; + } + + if (irparams.blinkflag) { + if (irdata == MARK) BLINKLED_ON() ; // turn pin 13 LED on + else BLINKLED_OFF() ; // turn pin 13 LED off + } } diff --git a/irRecv.cpp b/irRecv.cpp index 4c4e30b..8328319 100644 --- a/irRecv.cpp +++ b/irRecv.cpp @@ -51,18 +51,6 @@ void IRrecv::resume ( ) irparams.rawlen = 0; } - - - - - - - - - - - - //+============================================================================= // Decodes the received IR message // Returns 0 if no data ready, 1 if data ready. @@ -162,9 +150,9 @@ int IRrecv::decode (decode_results *results) // int IRrecv::compare (unsigned int oldval, unsigned int newval) { - if (newval < oldval * .8) return 0 ; - else if (oldval < newval * .8) return 2 ; - else return 1 ; + if (newval < oldval * .8) return 0 ; + else if (oldval < newval * .8) return 2 ; + else return 1 ; } //+============================================================================= @@ -178,18 +166,18 @@ int IRrecv::compare (unsigned int oldval, unsigned int newval) long IRrecv::decodeHash (decode_results *results) { - // Require at least 6 samples to prevent triggering on noise - if (results->rawlen < 6) return false ; - long hash = FNV_BASIS_32; - for (int i = 1; (i + 2) < results->rawlen; i++) { - int value = compare(results->rawbuf[i], results->rawbuf[i+2]); - // Add value into the hash - hash = (hash * FNV_PRIME_32) ^ value; - } + // Require at least 6 samples to prevent triggering on noise + if (results->rawlen < 6) return false ; + long hash = FNV_BASIS_32; + for (int i = 1; (i + 2) < results->rawlen; i++) { + int value = compare(results->rawbuf[i], results->rawbuf[i+2]); + // Add value into the hash + hash = (hash * FNV_PRIME_32) ^ value; + } - results->value = hash; - results->bits = 32; - results->decode_type = UNKNOWN; + results->value = hash; + results->bits = 32; + results->decode_type = UNKNOWN; - return true; + return true; } From 813a3038ab2e56bf72bfd797ccde0219509684fc Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 17:51:10 +0100 Subject: [PATCH 13/31] Commenting --- IRremote.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/IRremote.cpp b/IRremote.cpp index ad01643..e4fb94b 100644 --- a/IRremote.cpp +++ b/IRremote.cpp @@ -24,24 +24,18 @@ # include "IRremoteInt.h" #undef IR_GLOBAL -//------------------------------------------------------------------------------ -// These versions of MATCH, MATCH_MARK, and MATCH_SPACE are only for debugging. -// To use them, set DEBUG to 1 in IRremoteInt.h -// (Normally macros are used for efficiency) -// ...but every time i reduce these functions down to macros, the decoders stop working!!?? - //+============================================================================= // The match functions were (apparently) originally MACROs to improve code speed -// (although this would have bloated the code size) hence the names being CAPS +// (although this would have bloated the code) hence the names being CAPS // A later release implemented debug output and so they needed to be converted -// to functions. +// to functions. // I tried to implement a dual-compile mode (DEBUG/non-DEBUG) but for some -// reason, no matter what I did I could not get them to function as macros again. +// reason, no matter what I did I could not get them to function as macros again. // I have found a *lot* of bugs in the Arduino compiler over the last few weeks, -// and I am currently assuming that one of these bugs is my problem. +// and I am currently assuming that one of these bugs is my problem. // I may revisit this code at a later date and look at the assembler produced -// in a hope of finding out what is going on, but for now they will remain as -// functions even in non-DEBUG mode +// in a hope of finding out what is going on, but for now they will remain as +// functions even in non-DEBUG mode // int MATCH (int measured, int desired) { @@ -56,7 +50,7 @@ int MATCH (int measured, int desired) } //+======================================================== -// Marks tend to be 100us too long when received due to sensor lag. +// Due to sensor lag, when received, Marks tend to be 100us too long // int MATCH_MARK (int measured_ticks, int desired_us) { @@ -76,7 +70,7 @@ int MATCH_MARK (int measured_ticks, int desired_us) } //+======================================================== -// Spaces tend to be 100us too short when received due to sensor lag. +// Due to sensor lag, when received, Spaces tend to be 100us too short // int MATCH_SPACE (int measured_ticks, int desired_us) { From 7b8444a30579790c94816868bcb3d0f4d33a5d5f Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 17:51:40 +0100 Subject: [PATCH 14/31] Remove use of macro TOPBIT --- ir_Aiwa.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ir_Aiwa.cpp b/ir_Aiwa.cpp index b34d6f4..b4049ca 100644 --- a/ir_Aiwa.cpp +++ b/ir_Aiwa.cpp @@ -46,15 +46,15 @@ void IRsend::sendAiwaRCT501 (int code) //-v- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! // it only send 15bits and ignores the top bit -// then uses TOPBIT which is bit-31 to check the bit code +// then uses TOPBIT which is 0x80000000 to check the bit code // I suspect TOPBIT should be changed to 0x00008000 // Skip firts code bit code <<= 1; // Send code for (int i = 0; i < 15; i++) { mark(AIWA_RC_T501_BIT_MARK); - if (code & TOPBIT) space(AIWA_RC_T501_ONE_SPACE) ; - else space(AIWA_RC_T501_ZERO_SPACE) ; + if (code & 0x80000000) space(AIWA_RC_T501_ONE_SPACE) ; + else space(AIWA_RC_T501_ZERO_SPACE) ; code <<= 1; } //-^- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! From 5d994880b90c2b1f3ecab79f317512fe895226e4 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 17:54:18 +0100 Subject: [PATCH 15/31] Commenting formatting move ISR macros to ISR header --- IRremote.h | 10 - IRremoteInt.h | 646 ++++++++++++++++++++++++++++---------------------- 2 files changed, 362 insertions(+), 294 deletions(-) diff --git a/IRremote.h b/IRremote.h index 2bb3388..a45605c 100644 --- a/IRremote.h +++ b/IRremote.h @@ -220,14 +220,4 @@ public: VIRTUAL void space(int usec); } ; -//------------------------------------------------------------------------------ -// Some useful constants - -#define USECPERTICK 50 // microseconds per clock interrupt tick -#define RAWBUF 100 // Length of raw duration buffer - -// Marks tend to be 100us too long, and spaces 100us too short -// when received due to sensor lag. -#define MARK_EXCESS 100 - #endif diff --git a/IRremoteInt.h b/IRremoteInt.h index 21a0c8d..393b502 100644 --- a/IRremoteInt.h +++ b/IRremoteInt.h @@ -1,23 +1,34 @@ -/* - * IRremote - * Version 0.1 July, 2009 - * Copyright 2009 Ken Shirriff - * For details, see http://arcfn.com/2009/08/multi-protocol-infrared-remote-library.html - * - * Modified by Paul Stoffregen to support other boards and timers - * - * Interrupt code based on NECIRrcv by Joe Knapp - * http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1210243556 - * Also influenced by http://zovirl.com/2008/11/12/building-a-universal-remote-with-an-arduino/ - * - * JVC and Panasonic protocol added by Kristian Lauszus (Thanks to zenwheel and other people at the original blog post) - * Whynter A/C ARC-110WD added by Francesco Meschia - */ +//****************************************************************************** +// IRremote +// Version 0.1 July, 2009 +// Copyright 2009 Ken Shirriff +// For details, see http://arcfn.com/2009/08/multi-protocol-infrared-remote-library.html +// +// Modified by Paul Stoffregen to support other boards and timers +// +// Interrupt code based on NECIRrcv by Joe Knapp +// http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1210243556 +// Also influenced by http://zovirl.com/2008/11/12/building-a-universal-remote-with-an-arduino/ +// +// JVC and Panasonic protocol added by Kristian Lauszus (Thanks to zenwheel and other people at the original blog post) +// Whynter A/C ARC-110WD added by Francesco Meschia +//****************************************************************************** #ifndef IRremoteint_h #define IRremoteint_h //------------------------------------------------------------------------------ +// Include the right Arduino header +// +#if defined(ARDUINO) && (ARDUINO >= 100) +# include +#else +# include +#endif + +//------------------------------------------------------------------------------ +// This handles definition and access to global variables +// #ifdef IR_GLOBAL # define EXTERN #else @@ -25,227 +36,274 @@ #endif //------------------------------------------------------------------------------ -#if defined(ARDUINO) && ARDUINO >= 100 -#include +// Information for the Interrupt Service Routine +// +#define RAWBUF 100 // Maximum length of raw duration buffer + +typedef + struct { + // The fields are ordered to reduce memory over caused by struct-padding + uint8_t rcvstate; // State Machine state + uint8_t recvpin; // Pin connected to IR data from detector + uint8_t blinkflag; // true -> enable blinking of pin 13 on IR processing + uint8_t rawlen; // counter of entries in rawbuf + unsigned int timer; // State timer, counts 50uS ticks. + unsigned int rawbuf[RAWBUF]; // raw data + uint8_t overflow; // Raw buffer overflow occurred + } +irparams_t; + +// ISR State-Machine : Receiver States +#define STATE_IDLE 2 +#define STATE_MARK 3 +#define STATE_SPACE 4 +#define STATE_STOP 5 +#define STATE_OVERFLOW 6 + +// Allow all parts of the code access to the ISR data +// NB. The data can be changed by the ISR at any time, even mid-function +// Therefore we declare it as "volatile" to stop the compiler/CPU caching it +EXTERN volatile irparams_t irparams; + +//------------------------------------------------------------------------------ +// Defines for blinking the LED +// +#if defined(CORE_LED0_PIN) +# define BLINKLED CORE_LED0_PIN +# define BLINKLED_ON() (digitalWrite(CORE_LED0_PIN, HIGH)) +# define BLINKLED_OFF() (digitalWrite(CORE_LED0_PIN, LOW)) + +#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) +# define BLINKLED 13 +# define BLINKLED_ON() (PORTB |= B10000000) +# define BLINKLED_OFF() (PORTB &= B01111111) + +#elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__) +# define BLINKLED 0 +# define BLINKLED_ON() (PORTD |= B00000001) +# define BLINKLED_OFF() (PORTD &= B11111110) + #else -#include +# define BLINKLED 13 + #define BLINKLED_ON() (PORTB |= B00100000) +# define BLINKLED_OFF() (PORTB &= B11011111) #endif //------------------------------------------------------------------------------ -// define which timer to use +// CPU Frequency +// +#ifdef F_CPU +# define SYSCLOCK F_CPU // main Arduino clock +#else +# define SYSCLOCK 16000000 // main Arduino clock +#endif + +//------------------------------------------------------------------------------ +// Defines for setting and clearing register bits +// +#ifndef cbi +# define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) +#endif + +#ifndef sbi +# define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) +#endif + +//------------------------------------------------------------------------------ +// Pulse parms are ((X*50)-100) for the Mark and ((X*50)+100) for the Space. +// First MARK is the one after the long gap +// Pulse parameters in uSec +// + +// Due to sensor lag, when received, Marks tend to be 100us too long and +// Spaces tend to be 100us too short +#define MARK_EXCESS 100 + +// microseconds per clock interrupt tick +#define USECPERTICK 50 + +// Upper and Lower percentage tolerances in measurements +#define TOLERANCE 25 +#define LTOL (1.0 - (TOLERANCE/100.)) +#define UTOL (1.0 + (TOLERANCE/100.)) + +// Minimum gap between IR transmissions +#define _GAP 5000 +#define GAP_TICKS (_GAP/USECPERTICK) + +#define TICKS_LOW(us) ((int)(((us)*LTOL/USECPERTICK))) +#define TICKS_HIGH(us) ((int)(((us)*UTOL/USECPERTICK + 1))) + +//------------------------------------------------------------------------------ +// IR detector output is active low +// +#define MARK 0 +#define SPACE 1 + +//------------------------------------------------------------------------------ +// Define which timer to use +// +// Uncomment the timer you wish to use on your board. +// If you are using another library which uses timer2, you have options to +// switch IRremote to use a different timer. // -// Uncomment the timer you wish to use on your board. If you -// are using another library which uses timer2, you have options -// to switch IRremote to use a different timer. // Arduino Mega #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) - //#define IR_USE_TIMER1 // tx = pin 11 - #define IR_USE_TIMER2 // tx = pin 9 - //#define IR_USE_TIMER3 // tx = pin 5 - //#define IR_USE_TIMER4 // tx = pin 6 - //#define IR_USE_TIMER5 // tx = pin 46 + //#define IR_USE_TIMER1 // tx = pin 11 + #define IR_USE_TIMER2 // tx = pin 9 + //#define IR_USE_TIMER3 // tx = pin 5 + //#define IR_USE_TIMER4 // tx = pin 6 + //#define IR_USE_TIMER5 // tx = pin 46 // Teensy 1.0 #elif defined(__AVR_AT90USB162__) - #define IR_USE_TIMER1 // tx = pin 17 + #define IR_USE_TIMER1 // tx = pin 17 // Teensy 2.0 #elif defined(__AVR_ATmega32U4__) - //#define IR_USE_TIMER1 // tx = pin 14 - //#define IR_USE_TIMER3 // tx = pin 9 - #define IR_USE_TIMER4_HS // tx = pin 10 + //#define IR_USE_TIMER1 // tx = pin 14 + //#define IR_USE_TIMER3 // tx = pin 9 + #define IR_USE_TIMER4_HS // tx = pin 10 // Teensy 3.0 #elif defined(__MK20DX128__) - #define IR_USE_TIMER_CMT // tx = pin 5 + #define IR_USE_TIMER_CMT // tx = pin 5 // Teensy++ 1.0 & 2.0 #elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__) - //#define IR_USE_TIMER1 // tx = pin 25 - #define IR_USE_TIMER2 // tx = pin 1 - //#define IR_USE_TIMER3 // tx = pin 16 + //#define IR_USE_TIMER1 // tx = pin 25 + #define IR_USE_TIMER2 // tx = pin 1 + //#define IR_USE_TIMER3 // tx = pin 16 // Sanguino #elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__) - //#define IR_USE_TIMER1 // tx = pin 13 - #define IR_USE_TIMER2 // tx = pin 14 + //#define IR_USE_TIMER1 // tx = pin 13 + #define IR_USE_TIMER2 // tx = pin 14 // Atmega8 #elif defined(__AVR_ATmega8P__) || defined(__AVR_ATmega8__) - #define IR_USE_TIMER1 // tx = pin 9 + #define IR_USE_TIMER1 // tx = pin 9 -// Arduino Duemilanove, Diecimila, LilyPad, Mini, Fio, etc +// Arduino Duemilanove, Diecimila, LilyPad, Mini, Fio, Nano, etc #else - //#define IR_USE_TIMER1 // tx = pin 9 - #define IR_USE_TIMER2 // tx = pin 3 + //#define IR_USE_TIMER1 // tx = pin 9 + #define IR_USE_TIMER2 // tx = pin 3 + #endif //------------------------------------------------------------------------------ -#ifdef F_CPU -#define SYSCLOCK F_CPU // main Arduino clock -#else -#define SYSCLOCK 16000000 // main Arduino clock -#endif +// Defines for Timer -//------------------------------------------------------------------------------ -#define ERR 0 -#define DECODED 1 - -//------------------------------------------------------------------------------ -// defines for setting and clearing register bits -#ifndef cbi -#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) -#endif -#ifndef sbi -#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) -#endif - -//------------------------------------------------------------------------------ -// Pulse parms are *50-100 for the Mark and *50+100 for the space -// First MARK is the one after the long gap -// pulse parameters in usec - - - - - - - - - - - - - - - - - - -#define TOLERANCE 25 // percent tolerance in measurements -#define LTOL (1.0 - TOLERANCE/100.) -#define UTOL (1.0 + TOLERANCE/100.) - -#define _GAP 5000 // Minimum map between transmissions -#define GAP_TICKS (_GAP/USECPERTICK) - -#define TICKS_LOW(us) (int) (((us)*LTOL/USECPERTICK)) -#define TICKS_HIGH(us) (int) (((us)*UTOL/USECPERTICK + 1)) - -// receiver states -#define STATE_IDLE 2 -#define STATE_MARK 3 -#define STATE_SPACE 4 -#define STATE_STOP 5 - -// information for the interrupt handler -typedef struct { - uint8_t recvpin; // pin for IR data from detector - uint8_t rcvstate; // state machine - uint8_t blinkflag; // TRUE to enable blinking of pin 13 on IR processing - unsigned int timer; // state timer, counts 50uS ticks. - unsigned int rawbuf[RAWBUF]; // raw data - uint8_t rawlen; // counter of entries in rawbuf -} -irparams_t; - -// Defined in IRremote.cpp -EXTERN volatile irparams_t irparams; - -// IR detector output is active low -#define MARK 0 -#define SPACE 1 - -#define TOPBIT 0x80000000 - -// defines for timer2 (8 bits) +//--------------------------------------------------------- +// Timer2 (8 bits) +// #if defined(IR_USE_TIMER2) + #define TIMER_RESET -#define TIMER_ENABLE_PWM (TCCR2A |= _BV(COM2B1)) -#define TIMER_DISABLE_PWM (TCCR2A &= ~(_BV(COM2B1))) -#define TIMER_ENABLE_INTR (TIMSK2 = _BV(OCIE2A)) -#define TIMER_DISABLE_INTR (TIMSK2 = 0) -#define TIMER_INTR_NAME TIMER2_COMPA_vect +#define TIMER_ENABLE_PWM (TCCR2A |= _BV(COM2B1)) +#define TIMER_DISABLE_PWM (TCCR2A &= ~(_BV(COM2B1))) +#define TIMER_ENABLE_INTR (TIMSK2 = _BV(OCIE2A)) +#define TIMER_DISABLE_INTR (TIMSK2 = 0) +#define TIMER_INTR_NAME TIMER2_COMPA_vect + #define TIMER_CONFIG_KHZ(val) ({ \ - const uint8_t pwmval = SYSCLOCK / 2000 / (val); \ - TCCR2A = _BV(WGM20); \ - TCCR2B = _BV(WGM22) | _BV(CS20); \ - OCR2A = pwmval; \ - OCR2B = pwmval / 3; \ + const uint8_t pwmval = SYSCLOCK / 2000 / (val); \ + TCCR2A = _BV(WGM20); \ + TCCR2B = _BV(WGM22) | _BV(CS20); \ + OCR2A = pwmval; \ + OCR2B = pwmval / 3; \ }) -#define TIMER_COUNT_TOP (SYSCLOCK * USECPERTICK / 1000000) + +#define TIMER_COUNT_TOP (SYSCLOCK * USECPERTICK / 1000000) + +//----------------- #if (TIMER_COUNT_TOP < 256) -#define TIMER_CONFIG_NORMAL() ({ \ - TCCR2A = _BV(WGM21); \ - TCCR2B = _BV(CS20); \ - OCR2A = TIMER_COUNT_TOP; \ - TCNT2 = 0; \ -}) +# define TIMER_CONFIG_NORMAL() ({ \ + TCCR2A = _BV(WGM21); \ + TCCR2B = _BV(CS20); \ + OCR2A = TIMER_COUNT_TOP; \ + TCNT2 = 0; \ + }) #else -#define TIMER_CONFIG_NORMAL() ({ \ - TCCR2A = _BV(WGM21); \ - TCCR2B = _BV(CS21); \ - OCR2A = TIMER_COUNT_TOP / 8; \ - TCNT2 = 0; \ -}) +# define TIMER_CONFIG_NORMAL() ({ \ + TCCR2A = _BV(WGM21); \ + TCCR2B = _BV(CS21); \ + OCR2A = TIMER_COUNT_TOP / 8; \ + TCNT2 = 0; \ + }) #endif + +//----------------- #if defined(CORE_OC2B_PIN) -#define TIMER_PWM_PIN CORE_OC2B_PIN /* Teensy */ +# define TIMER_PWM_PIN CORE_OC2B_PIN // Teensy #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) -#define TIMER_PWM_PIN 9 /* Arduino Mega */ +# define TIMER_PWM_PIN 9 // Arduino Mega #elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__) -#define TIMER_PWM_PIN 14 /* Sanguino */ +# define TIMER_PWM_PIN 14 // Sanguino #else -#define TIMER_PWM_PIN 3 /* Arduino Duemilanove, Diecimila, LilyPad, etc */ +# define TIMER_PWM_PIN 3 // Arduino Duemilanove, Diecimila, LilyPad, etc #endif - -// defines for timer1 (16 bits) +//--------------------------------------------------------- +// Timer1 (16 bits) +// #elif defined(IR_USE_TIMER1) + #define TIMER_RESET -#define TIMER_ENABLE_PWM (TCCR1A |= _BV(COM1A1)) -#define TIMER_DISABLE_PWM (TCCR1A &= ~(_BV(COM1A1))) +#define TIMER_ENABLE_PWM (TCCR1A |= _BV(COM1A1)) +#define TIMER_DISABLE_PWM (TCCR1A &= ~(_BV(COM1A1))) + +//----------------- #if defined(__AVR_ATmega8P__) || defined(__AVR_ATmega8__) - #define TIMER_ENABLE_INTR (TIMSK |= _BV(OCIE1A)) - #define TIMER_DISABLE_INTR (TIMSK &= ~_BV(OCIE1A)) +# define TIMER_ENABLE_INTR (TIMSK |= _BV(OCIE1A)) +# define TIMER_DISABLE_INTR (TIMSK &= ~_BV(OCIE1A)) #else - #define TIMER_ENABLE_INTR (TIMSK1 = _BV(OCIE1A)) - #define TIMER_DISABLE_INTR (TIMSK1 = 0) +# define TIMER_ENABLE_INTR (TIMSK1 = _BV(OCIE1A)) +# define TIMER_DISABLE_INTR (TIMSK1 = 0) #endif -#define TIMER_INTR_NAME TIMER1_COMPA_vect + +//----------------- +#define TIMER_INTR_NAME TIMER1_COMPA_vect + #define TIMER_CONFIG_KHZ(val) ({ \ - const uint16_t pwmval = SYSCLOCK / 2000 / (val); \ - TCCR1A = _BV(WGM11); \ - TCCR1B = _BV(WGM13) | _BV(CS10); \ - ICR1 = pwmval; \ - OCR1A = pwmval / 3; \ + const uint16_t pwmval = SYSCLOCK / 2000 / (val); \ + TCCR1A = _BV(WGM11); \ + TCCR1B = _BV(WGM13) | _BV(CS10); \ + ICR1 = pwmval; \ + OCR1A = pwmval / 3; \ }) + #define TIMER_CONFIG_NORMAL() ({ \ - TCCR1A = 0; \ - TCCR1B = _BV(WGM12) | _BV(CS10); \ - OCR1A = SYSCLOCK * USECPERTICK / 1000000; \ - TCNT1 = 0; \ + TCCR1A = 0; \ + TCCR1B = _BV(WGM12) | _BV(CS10); \ + OCR1A = SYSCLOCK * USECPERTICK / 1000000; \ + TCNT1 = 0; \ }) + +//----------------- #if defined(CORE_OC1A_PIN) -#define TIMER_PWM_PIN CORE_OC1A_PIN /* Teensy */ +# define TIMER_PWM_PIN CORE_OC1A_PIN // Teensy #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) -#define TIMER_PWM_PIN 11 /* Arduino Mega */ +# define TIMER_PWM_PIN 11 // Arduino Mega #elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__) -#define TIMER_PWM_PIN 13 /* Sanguino */ +# define TIMER_PWM_PIN 13 // Sanguino #else -#define TIMER_PWM_PIN 9 /* Arduino Duemilanove, Diecimila, LilyPad, etc */ +# define TIMER_PWM_PIN 9 // Arduino Duemilanove, Diecimila, LilyPad, etc #endif - -// defines for timer3 (16 bits) +//--------------------------------------------------------- +// Timer3 (16 bits) +// #elif defined(IR_USE_TIMER3) + #define TIMER_RESET #define TIMER_ENABLE_PWM (TCCR3A |= _BV(COM3A1)) #define TIMER_DISABLE_PWM (TCCR3A &= ~(_BV(COM3A1))) #define TIMER_ENABLE_INTR (TIMSK3 = _BV(OCIE3A)) #define TIMER_DISABLE_INTR (TIMSK3 = 0) #define TIMER_INTR_NAME TIMER3_COMPA_vect + #define TIMER_CONFIG_KHZ(val) ({ \ const uint16_t pwmval = SYSCLOCK / 2000 / (val); \ TCCR3A = _BV(WGM31); \ @@ -253,69 +311,81 @@ EXTERN volatile irparams_t irparams; ICR3 = pwmval; \ OCR3A = pwmval / 3; \ }) + #define TIMER_CONFIG_NORMAL() ({ \ TCCR3A = 0; \ TCCR3B = _BV(WGM32) | _BV(CS30); \ OCR3A = SYSCLOCK * USECPERTICK / 1000000; \ TCNT3 = 0; \ }) + +//----------------- #if defined(CORE_OC3A_PIN) -#define TIMER_PWM_PIN CORE_OC3A_PIN /* Teensy */ +# define TIMER_PWM_PIN CORE_OC3A_PIN // Teensy #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) -#define TIMER_PWM_PIN 5 /* Arduino Mega */ +# define TIMER_PWM_PIN 5 // Arduino Mega #else -#error "Please add OC3A pin number here\n" +# error "Please add OC3A pin number here\n" #endif - -// defines for timer4 (10 bits, high speed option) +//--------------------------------------------------------- +// Timer4 (10 bits, high speed option) +// #elif defined(IR_USE_TIMER4_HS) + #define TIMER_RESET -#define TIMER_ENABLE_PWM (TCCR4A |= _BV(COM4A1)) -#define TIMER_DISABLE_PWM (TCCR4A &= ~(_BV(COM4A1))) -#define TIMER_ENABLE_INTR (TIMSK4 = _BV(TOIE4)) -#define TIMER_DISABLE_INTR (TIMSK4 = 0) -#define TIMER_INTR_NAME TIMER4_OVF_vect +#define TIMER_ENABLE_PWM (TCCR4A |= _BV(COM4A1)) +#define TIMER_DISABLE_PWM (TCCR4A &= ~(_BV(COM4A1))) +#define TIMER_ENABLE_INTR (TIMSK4 = _BV(TOIE4)) +#define TIMER_DISABLE_INTR (TIMSK4 = 0) +#define TIMER_INTR_NAME TIMER4_OVF_vect + #define TIMER_CONFIG_KHZ(val) ({ \ - const uint16_t pwmval = SYSCLOCK / 2000 / (val); \ - TCCR4A = (1<> 8; \ - OCR4C = pwmval; \ - TC4H = (pwmval / 3) >> 8; \ - OCR4A = (pwmval / 3) & 255; \ + const uint16_t pwmval = SYSCLOCK / 2000 / (val); \ + TCCR4A = (1<> 8; \ + OCR4C = pwmval; \ + TC4H = (pwmval / 3) >> 8; \ + OCR4A = (pwmval / 3) & 255; \ }) + #define TIMER_CONFIG_NORMAL() ({ \ - TCCR4A = 0; \ - TCCR4B = _BV(CS40); \ - TCCR4C = 0; \ - TCCR4D = 0; \ - TCCR4E = 0; \ - TC4H = (SYSCLOCK * USECPERTICK / 1000000) >> 8; \ - OCR4C = (SYSCLOCK * USECPERTICK / 1000000) & 255; \ - TC4H = 0; \ - TCNT4 = 0; \ + TCCR4A = 0; \ + TCCR4B = _BV(CS40); \ + TCCR4C = 0; \ + TCCR4D = 0; \ + TCCR4E = 0; \ + TC4H = (SYSCLOCK * USECPERTICK / 1000000) >> 8; \ + OCR4C = (SYSCLOCK * USECPERTICK / 1000000) & 255; \ + TC4H = 0; \ + TCNT4 = 0; \ }) + +//----------------- #if defined(CORE_OC4A_PIN) -#define TIMER_PWM_PIN CORE_OC4A_PIN /* Teensy */ +# define TIMER_PWM_PIN CORE_OC4A_PIN // Teensy #elif defined(__AVR_ATmega32U4__) -#define TIMER_PWM_PIN 13 /* Leonardo */ +# define TIMER_PWM_PIN 13 // Leonardo #else -#error "Please add OC4A pin number here\n" +# error "Please add OC4A pin number here\n" #endif - -// defines for timer4 (16 bits) +//--------------------------------------------------------- +// Timer4 (16 bits) +// #elif defined(IR_USE_TIMER4) + #define TIMER_RESET -#define TIMER_ENABLE_PWM (TCCR4A |= _BV(COM4A1)) -#define TIMER_DISABLE_PWM (TCCR4A &= ~(_BV(COM4A1))) -#define TIMER_ENABLE_INTR (TIMSK4 = _BV(OCIE4A)) -#define TIMER_DISABLE_INTR (TIMSK4 = 0) -#define TIMER_INTR_NAME TIMER4_COMPA_vect +#define TIMER_ENABLE_PWM (TCCR4A |= _BV(COM4A1)) +#define TIMER_DISABLE_PWM (TCCR4A &= ~(_BV(COM4A1))) +#define TIMER_ENABLE_INTR (TIMSK4 = _BV(OCIE4A)) +#define TIMER_DISABLE_INTR (TIMSK4 = 0) +#define TIMER_INTR_NAME TIMER4_COMPA_vect + #define TIMER_CONFIG_KHZ(val) ({ \ const uint16_t pwmval = SYSCLOCK / 2000 / (val); \ TCCR4A = _BV(WGM41); \ @@ -323,29 +393,35 @@ EXTERN volatile irparams_t irparams; ICR4 = pwmval; \ OCR4A = pwmval / 3; \ }) + #define TIMER_CONFIG_NORMAL() ({ \ TCCR4A = 0; \ TCCR4B = _BV(WGM42) | _BV(CS40); \ OCR4A = SYSCLOCK * USECPERTICK / 1000000; \ TCNT4 = 0; \ }) + +//----------------- #if defined(CORE_OC4A_PIN) -#define TIMER_PWM_PIN CORE_OC4A_PIN +# define TIMER_PWM_PIN CORE_OC4A_PIN #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) -#define TIMER_PWM_PIN 6 /* Arduino Mega */ +# define TIMER_PWM_PIN 6 // Arduino Mega #else -#error "Please add OC4A pin number here\n" +# error "Please add OC4A pin number here\n" #endif - -// defines for timer5 (16 bits) +//--------------------------------------------------------- +// Timer5 (16 bits) +// #elif defined(IR_USE_TIMER5) + #define TIMER_RESET -#define TIMER_ENABLE_PWM (TCCR5A |= _BV(COM5A1)) -#define TIMER_DISABLE_PWM (TCCR5A &= ~(_BV(COM5A1))) -#define TIMER_ENABLE_INTR (TIMSK5 = _BV(OCIE5A)) -#define TIMER_DISABLE_INTR (TIMSK5 = 0) -#define TIMER_INTR_NAME TIMER5_COMPA_vect +#define TIMER_ENABLE_PWM (TCCR5A |= _BV(COM5A1)) +#define TIMER_DISABLE_PWM (TCCR5A &= ~(_BV(COM5A1))) +#define TIMER_ENABLE_INTR (TIMSK5 = _BV(OCIE5A)) +#define TIMER_DISABLE_INTR (TIMSK5 = 0) +#define TIMER_INTR_NAME TIMER5_COMPA_vect + #define TIMER_CONFIG_KHZ(val) ({ \ const uint16_t pwmval = SYSCLOCK / 2000 / (val); \ TCCR5A = _BV(WGM51); \ @@ -353,91 +429,93 @@ EXTERN volatile irparams_t irparams; ICR5 = pwmval; \ OCR5A = pwmval / 3; \ }) + #define TIMER_CONFIG_NORMAL() ({ \ TCCR5A = 0; \ TCCR5B = _BV(WGM52) | _BV(CS50); \ OCR5A = SYSCLOCK * USECPERTICK / 1000000; \ TCNT5 = 0; \ }) + +//----------------- #if defined(CORE_OC5A_PIN) -#define TIMER_PWM_PIN CORE_OC5A_PIN +# define TIMER_PWM_PIN CORE_OC5A_PIN #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) -#define TIMER_PWM_PIN 46 /* Arduino Mega */ +# define TIMER_PWM_PIN 46 // Arduino Mega #else -#error "Please add OC5A pin number here\n" +# error "Please add OC5A pin number here\n" #endif - -// defines for special carrier modulator timer +//--------------------------------------------------------- +// Special carrier modulator timer +// #elif defined(IR_USE_TIMER_CMT) -#define TIMER_RESET ({ \ - uint8_t tmp = CMT_MSC; \ - CMT_CMD2 = 30; \ + +#define TIMER_RESET ({ \ + uint8_t tmp = CMT_MSC; \ + CMT_CMD2 = 30; \ }) -#define TIMER_ENABLE_PWM CORE_PIN5_CONFIG = PORT_PCR_MUX(2)|PORT_PCR_DSE|PORT_PCR_SRE -#define TIMER_DISABLE_PWM CORE_PIN5_CONFIG = PORT_PCR_MUX(1)|PORT_PCR_DSE|PORT_PCR_SRE -#define TIMER_ENABLE_INTR NVIC_ENABLE_IRQ(IRQ_CMT) -#define TIMER_DISABLE_INTR NVIC_DISABLE_IRQ(IRQ_CMT) -#define TIMER_INTR_NAME cmt_isr + +#define TIMER_ENABLE_PWM do { \ + CORE_PIN5_CONFIG = PORT_PCR_MUX(2) | PORT_PCR_DSE | PORT_PCR_SRE; \ +} while(0) + +#define TIMER_DISABLE_PWM do { \ + CORE_PIN5_CONFIG = PORT_PCR_MUX(1) | PORT_PCR_DSE | PORT_PCR_SRE; \ +} while(0) + +#define TIMER_ENABLE_INTR NVIC_ENABLE_IRQ(IRQ_CMT) +#define TIMER_DISABLE_INTR NVIC_DISABLE_IRQ(IRQ_CMT) +#define TIMER_INTR_NAME cmt_isr + +//----------------- #ifdef ISR -#undef ISR +# undef ISR #endif -#define ISR(f) void f(void) -#if F_BUS == 48000000 -#define CMT_PPS_VAL 5 +#define ISR(f) void f(void) + +//----------------- +#if (F_BUS == 48000000) +# define CMT_PPS_VAL 5 #else -#define CMT_PPS_VAL 2 -#endif -#define TIMER_CONFIG_KHZ(val) ({ \ - SIM_SCGC4 |= SIM_SCGC4_CMT; \ - SIM_SOPT2 |= SIM_SOPT2_PTD7PAD; \ - CMT_PPS = CMT_PPS_VAL; \ - CMT_CGH1 = 2667 / val; \ - CMT_CGL1 = 5333 / val; \ - CMT_CMD1 = 0; \ - CMT_CMD2 = 30; \ - CMT_CMD3 = 0; \ - CMT_CMD4 = 0; \ - CMT_OC = 0x60; \ - CMT_MSC = 0x01; \ -}) -#define TIMER_CONFIG_NORMAL() ({ \ - SIM_SCGC4 |= SIM_SCGC4_CMT; \ - CMT_PPS = CMT_PPS_VAL; \ - CMT_CGH1 = 1; \ - CMT_CGL1 = 1; \ - CMT_CMD1 = 0; \ - CMT_CMD2 = 30; \ - CMT_CMD3 = 0; \ - CMT_CMD4 = 19; \ - CMT_OC = 0; \ - CMT_MSC = 0x03; \ -}) -#define TIMER_PWM_PIN 5 - - -#else // unknown timer -#error "Internal code configuration error, no known IR_USE_TIMER# defined\n" +# define CMT_PPS_VAL 2 #endif +//----------------- +#define TIMER_CONFIG_KHZ(val) ({ \ + SIM_SCGC4 |= SIM_SCGC4_CMT; \ + SIM_SOPT2 |= SIM_SOPT2_PTD7PAD; \ + CMT_PPS = CMT_PPS_VAL; \ + CMT_CGH1 = 2667 / val; \ + CMT_CGL1 = 5333 / val; \ + CMT_CMD1 = 0; \ + CMT_CMD2 = 30; \ + CMT_CMD3 = 0; \ + CMT_CMD4 = 0; \ + CMT_OC = 0x60; \ + CMT_MSC = 0x01; \ +}) -// defines for blinking the LED -#if defined(CORE_LED0_PIN) -#define BLINKLED CORE_LED0_PIN -#define BLINKLED_ON() (digitalWrite(CORE_LED0_PIN, HIGH)) -#define BLINKLED_OFF() (digitalWrite(CORE_LED0_PIN, LOW)) -#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) -#define BLINKLED 13 -#define BLINKLED_ON() (PORTB |= B10000000) -#define BLINKLED_OFF() (PORTB &= B01111111) -#elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__) -#define BLINKLED 0 -#define BLINKLED_ON() (PORTD |= B00000001) -#define BLINKLED_OFF() (PORTD &= B11111110) +#define TIMER_CONFIG_NORMAL() ({ \ + SIM_SCGC4 |= SIM_SCGC4_CMT; \ + CMT_PPS = CMT_PPS_VAL; \ + CMT_CGH1 = 1; \ + CMT_CGL1 = 1; \ + CMT_CMD1 = 0; \ + CMT_CMD2 = 30 \ + CMT_CMD3 = 0; \ + CMT_CMD4 = 19; \ + CMT_OC = 0; \ + CMT_MSC = 0x03; \ +}) + +#define TIMER_PWM_PIN 5 + +//--------------------------------------------------------- +// Unknown Timer +// #else -#define BLINKLED 13 -#define BLINKLED_ON() (PORTB |= B00100000) -#define BLINKLED_OFF() (PORTB &= B11011111) +# error "Internal code configuration error, no known IR_USE_TIMER# defined\n" #endif -#endif +#endif // IRremoteint_h From dfd14d437cf23d65b6d97fb0611f879cee9a63b5 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 18:24:50 +0100 Subject: [PATCH 16/31] Increased RAWLEN to 101 to stop Panasonic codes overflowing --- IRremoteInt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRremoteInt.h b/IRremoteInt.h index 393b502..486e0cf 100644 --- a/IRremoteInt.h +++ b/IRremoteInt.h @@ -38,7 +38,7 @@ //------------------------------------------------------------------------------ // Information for the Interrupt Service Routine // -#define RAWBUF 100 // Maximum length of raw duration buffer +#define RAWBUF 101 // Maximum length of raw duration buffer typedef struct { From 8afb3e73a6196b4a7b1f4d9631e83500b58aeedb Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 18:26:23 +0100 Subject: [PATCH 17/31] Introduced overflow detection code to the ISR State Machine --- irISR.cpp | 25 ++++++++++++++++++------- irRecv.cpp | 6 ++++-- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/irISR.cpp b/irISR.cpp index 5e1d98d..479e984 100644 --- a/irISR.cpp +++ b/irISR.cpp @@ -4,22 +4,27 @@ #include "IRremoteInt.h" //+============================================================================= +// Interrupt Service Routine - Fires every 50uS // TIMER2 interrupt code to collect raw data. // Widths of alternating SPACE, MARK are recorded in rawbuf. -// Recorded in ticks of 50 microseconds. -// rawlen counts the number of entries recorded so far. +// Recorded in ticks of 50uS [microseconds, 0.000050 seconds] +// 'rawlen' counts the number of entries recorded so far. // First entry is the SPACE between transmissions. -// As soon as a SPACE gets long, ready is set, state switches to IDLE, timing of SPACE continues. -// As soon as first MARK arrives, gap width is recorded, ready is cleared, and new logging starts +// As soon as a the first [SPACE] entry gets long: +// Ready is set; State switches to IDLE; Timing of SPACE continues. +// As soon as first MARK arrives: +// Gap width is recorded; Ready is cleared; New logging starts // ISR (TIMER_INTR_NAME) { TIMER_RESET; - uint8_t irdata = (uint8_t)digitalRead(irparams.recvpin); + // Read if IR Receiver -> SPACE [xmt LED off] or a MARK [xmt LED on] + // digitalRead() is very slow. Optimisation is possible, but makes the code unportable + uint8_t irdata = (uint8_t)digitalRead(irparams.recvpin); - irparams.timer++; // One more 50us tick - if (irparams.rawlen >= RAWBUF) irparams.rcvstate = STATE_STOP ; // Buffer overflow + irparams.timer++; // One more 50uS tick + if (irparams.rawlen >= RAWBUF) irparams.rcvstate = STATE_OVERFLOW ; // Buffer overflow switch(irparams.rcvstate) { case STATE_IDLE: // In the middle of a gap @@ -30,6 +35,7 @@ ISR (TIMER_INTR_NAME) } else { // gap just ended, record duration and start recording transmission + irparams.overflow = false; irparams.rawlen = 0; irparams.rawbuf[irparams.rawlen++] = irparams.timer; irparams.timer = 0; @@ -64,6 +70,11 @@ ISR (TIMER_INTR_NAME) case STATE_STOP: // waiting, measuring gap if (irdata == MARK) irparams.timer = 0 ; // reset gap timer break; + + case STATE_OVERFLOW: // Flag up a read overflow + irparams.overflow = true; + irparams.rcvstate = STATE_STOP; + break; } if (irparams.blinkflag) { diff --git a/irRecv.cpp b/irRecv.cpp index 8328319..8bcb0bf 100644 --- a/irRecv.cpp +++ b/irRecv.cpp @@ -57,8 +57,10 @@ void IRrecv::resume ( ) // Results of decoding are stored in results int IRrecv::decode (decode_results *results) { - results->rawbuf = irparams.rawbuf; - results->rawlen = irparams.rawlen; + results->rawbuf = irparams.rawbuf; + results->rawlen = irparams.rawlen; + + results->overflow = irparams.overflow; if (irparams.rcvstate != STATE_STOP) return false ; From 5e7a1c1f12560f8dc745ce717ea955b154f3475a Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 18:27:10 +0100 Subject: [PATCH 18/31] Abbreviated (Panasonic) address handling --- IRremote.h | 63 ++++++++++++++++++++++++++---------------------- ir_Panasonic.cpp | 8 +++--- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/IRremote.h b/IRremote.h index a45605c..6507f9d 100644 --- a/IRremote.h +++ b/IRremote.h @@ -69,42 +69,47 @@ int MATCH (int measured, int desired) ; // #define TEST //------------------------------------------------------------------------------ -enum decode_type_t { - UNKNOWN = -1, - UNUSED = 0, - NEC = 1, - SONY = 2, - RC5 = 3, - RC6 = 4, - DISH = 5, - SHARP = 6, - PANASONIC = 7, - JVC = 8, - SANYO = 9, - MITSUBISHI = 10, - SAMSUNG = 11, - LG = 12, - WHYNTER = 13, - AIWA_RC_T501 = 14, -}; +// An enumerated list of all supported formats +// +typedef + enum { + UNKNOWN = -1, + UNUSED = 0, + NEC = 1, + SONY = 2, + RC5 = 3, + RC6 = 4, + DISH = 5, + SHARP = 6, + PANASONIC = 7, + JVC = 8, + SANYO = 9, + MITSUBISHI = 10, + SAMSUNG = 11, + LG = 12, + WHYNTER = 13, + AIWA_RC_T501 = 14, + } +decode_type_t; //------------------------------------------------------------------------------ // Results returned from the decoder -class decode_results { -public: - decode_type_t decode_type; // NEC, SONY, RC5, UNKNOWN - union { // This is used for decoding Panasonic and Sharp data - unsigned int panasonicAddress; - unsigned int sharpAddress; - }; - unsigned long value; // Decoded value - int bits; // Number of bits in decoded value - volatile unsigned int *rawbuf; // Raw intervals in .5 us ticks - int rawlen; // Number of records in rawbuf. +// +class decode_results +{ + public: + decode_type_t decode_type; // UNKNOWN, NEC, SONY, RC5, ... + unsigned int address; // Used by Panasonic & Sharp + unsigned long value; // Decoded value + int bits; // Number of bits in decoded value + volatile unsigned int *rawbuf; // Raw intervals in 50uS ticks + int rawlen; // Number of records in rawbuf. + int overflow; // true iff IR raw code too long }; //------------------------------------------------------------------------------ // Decoded value for NEC when a repeat code is received +// #define REPEAT 0xffffffff //------------------------------------------------------------------------------ diff --git a/ir_Panasonic.cpp b/ir_Panasonic.cpp index 494c28d..8d88ade 100644 --- a/ir_Panasonic.cpp +++ b/ir_Panasonic.cpp @@ -69,10 +69,10 @@ long IRrecv::decodePanasonic (decode_results *results) offset++; } - results->value = (unsigned long)data; - results->panasonicAddress = (unsigned int)(data >> 32); - results->decode_type = PANASONIC; - results->bits = PANASONIC_BITS; + results->value = (unsigned long)data; + results->address = (unsigned int)(data >> 32); + results->decode_type = PANASONIC; + results->bits = PANASONIC_BITS; return true; } From 66dee2fa169968e1a7be0ea1b7300d17177140e8 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 18:33:00 +0100 Subject: [PATCH 19/31] ISR Commenting --- irISR.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/irISR.cpp b/irISR.cpp index 479e984..acafafb 100644 --- a/irISR.cpp +++ b/irISR.cpp @@ -27,14 +27,14 @@ ISR (TIMER_INTR_NAME) if (irparams.rawlen >= RAWBUF) irparams.rcvstate = STATE_OVERFLOW ; // Buffer overflow switch(irparams.rcvstate) { + //...................................................................... case STATE_IDLE: // In the middle of a gap if (irdata == MARK) { - if (irparams.timer < GAP_TICKS) { - // Not big enough to be a gap. + if (irparams.timer < GAP_TICKS) { // Not big enough to be a gap. irparams.timer = 0; } else { - // gap just ended, record duration and start recording transmission + // Gap just ended; Record duration; Start recording transmission irparams.overflow = false; irparams.rawlen = 0; irparams.rawbuf[irparams.rawlen++] = irparams.timer; @@ -43,43 +43,43 @@ ISR (TIMER_INTR_NAME) } } break; - - case STATE_MARK: // timing MARK - if (irdata == SPACE) { // MARK ended, record time + //...................................................................... + case STATE_MARK: // Timing Mark + if (irdata == SPACE) { // Mark ended; Record time irparams.rawbuf[irparams.rawlen++] = irparams.timer; irparams.timer = 0; irparams.rcvstate = STATE_SPACE; } break; - - case STATE_SPACE: // timing SPACE - if (irdata == MARK) { // SPACE just ended, record it + //...................................................................... + case STATE_SPACE: // Timing Space + if (irdata == MARK) { // Space just ended; Record time irparams.rawbuf[irparams.rawlen++] = irparams.timer; irparams.timer = 0; irparams.rcvstate = STATE_MARK; - } else if (irparams.timer > GAP_TICKS) { // SPACE - // big SPACE, indicates gap between codes - // Mark current code as ready for processing + } else if (irparams.timer > GAP_TICKS) { // Space + // A long Space, indicates gap between codes + // Flag the current code as ready for processing // Switch to STOP - // Don't reset timer; keep counting space width + // Don't reset timer; keep counting Space width irparams.rcvstate = STATE_STOP; } break; - - case STATE_STOP: // waiting, measuring gap - if (irdata == MARK) irparams.timer = 0 ; // reset gap timer + //...................................................................... + case STATE_STOP: // Waiting; Measuring Gap + if (irdata == MARK) irparams.timer = 0 ; // Reset gap timer break; - - case STATE_OVERFLOW: // Flag up a read overflow + //...................................................................... + case STATE_OVERFLOW: // Flag up a read overflow; Stop the State Machine irparams.overflow = true; irparams.rcvstate = STATE_STOP; break; } + // If requested, flash LED L (D13) while receiving IR data if (irparams.blinkflag) { if (irdata == MARK) BLINKLED_ON() ; // turn pin 13 LED on else BLINKLED_OFF() ; // turn pin 13 LED off } } - From eb0360e75888b8491bb2e0a6883fca8ea360135a Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 20:27:59 +0100 Subject: [PATCH 20/31] More cleanup and a few minor optimisations --- IRremote.h | 419 ++++++++++++++++++++++++++-------------------- ir_Aiwa.cpp | 58 ++++--- ir_Dish.cpp | 44 +++-- ir_JVC.cpp | 38 +++-- ir_LG.cpp | 28 ++-- ir_Mitsubishi.cpp | 4 +- ir_NEC.cpp | 6 +- ir_Panasonic.cpp | 28 ++-- ir_RC5_RC6.cpp | 121 ++++++------- ir_Samsung.cpp | 30 ++-- ir_Sanyo.cpp | 99 ++++++----- ir_Sharp.cpp | 62 +++---- ir_Sony.cpp | 22 +-- ir_Whynter.cpp | 37 ++-- 14 files changed, 526 insertions(+), 470 deletions(-) diff --git a/IRremote.h b/IRremote.h index 6507f9d..8882fa8 100644 --- a/IRremote.h +++ b/IRremote.h @@ -1,17 +1,104 @@ + +//****************************************************************************** +// IRremote +// Version 0.1 July, 2009 +// Copyright 2009 Ken Shirriff +// For details, see http://arcfn.com/2009/08/multi-protocol-infrared-remote-library.htm http://arcfn.com +// Edited by Mitra to add new controller SANYO +// +// Interrupt code based on NECIRrcv by Joe Knapp +// http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1210243556 +// Also influenced by http://zovirl.com/2008/11/12/building-a-universal-remote-with-an-arduino/ +// +// JVC and Panasonic protocol added by Kristian Lauszus (Thanks to zenwheel and other people at the original blog post) +// LG added by Darryl Smith (based on the JVC protocol) +// Whynter A/C ARC-110WD added by Francesco Meschia +//****************************************************************************** + #ifndef IRremote_h #define IRremote_h -#define DEBUG -#undef DEBUG +//------------------------------------------------------------------------------ +// Supported IR protocols +// Each protocol you include costs memory and, during decode, costs time +// Disable (set to 0) all the protocols you do not need/want! +// +#define DECODE_RC5 1 +#define SEND_RC5 1 + +#define DECODE_RC6 1 +#define SEND_RC6 1 + +#define DECODE_NEC 1 +#define SEND_NEC 1 + +#define DECODE_SONY 1 +#define SEND_SONY 1 + +#define DECODE_PANASONIC 1 +#define SEND_PANASONIC 1 + +#define DECODE_JVC 1 +#define SEND_JVC 1 + +#define DECODE_SAMSUNG 1 +#define SEND_SAMSUNG 1 + +#define DECODE_WHYNTER 1 +#define SEND_WHYNTER 1 + +#define DECODE_AIWA_RC_T501 1 +#define SEND_AIWA_RC_T501 1 + +#define DECODE_LG 1 +#define SEND_LG 0 // NOT WRITTEN + +#define DECODE_SANYO 1 +#define SEND_SANYO 0 // NOT WRITTEN + +#define DECODE_MITSUBISHI 1 +#define SEND_MITSUBISHI 0 // NOT WRITTEN + +#define DECODE_DISH 0 // NOT WRITTEN +#define SEND_DISH 1 + +#define DECODE_SHARP 0 // NOT WRITTEN +#define SEND_SHARP 1 //------------------------------------------------------------------------------ -int MATCH_SPACE (int measured_ticks, int desired_us) ; -int MATCH_MARK (int measured_ticks, int desired_us) ; -int MATCH (int measured, int desired) ; +// An enumerated list of all supported formats +// You do NOT need to remove entries from this list when disabling protocols! +// +typedef + enum { + UNKNOWN = -1, + UNUSED = 0, + RC5 = 1, + RC6 = 2, + NEC = 3, + SONY = 4, + PANASONIC = 5, + JVC = 6, + SAMSUNG = 7, + WHYNTER = 8, + AIWA_RC_T501 = 9, + LG = 10, + SANYO = 11, + MITSUBISHI = 12, + DISH = 13, + SHARP = 14, + } +decode_type_t; + +//------------------------------------------------------------------------------ +// Set DEBUG to 1 for lots of lovely debug output +// +#define DEBUG 0 //------------------------------------------------------------------------------ // Debug directives -#ifdef DEBUG +// +#if DEBUG # define DBG_PRINT(...) Serial.print(__VA_ARGS__) # define DBG_PRINTLN(...) Serial.println(__VA_ARGS__) #else @@ -20,77 +107,11 @@ int MATCH (int measured, int desired) ; #endif //------------------------------------------------------------------------------ -#define SEND_NEC -#define DECODE_NEC -#define SEND_WHYNTER -#define DECODE_WHYNTER -#define SEND_SONY -#define DECODE_SONY -#define DECODE_SANYO -#define SEND_RC5 -#define DECODE_RC5 -#define SEND_RC6 -#define DECODE_RC6 -#define SEND_PANASONIC -#define DECODE_PANASONIC -#define SEND_JVC -#define DECODE_JVC -#define SEND_SAMSUNG -#define DECODE_SAMSUNG -#define DECODE_LG -#define DECODE_MITSUBISHI -#define SEND_AIWA_RC_T501 -#define DECODE_AIWA_RC_T501 -#define SEND_SHARP -#define SEND_DISH - -/* - * IRremote - * Version 0.1 July, 2009 - * Copyright 2009 Ken Shirriff - * For details, see http://arcfn.com/2009/08/multi-protocol-infrared-remote-library.htm http://arcfn.com - * Edited by Mitra to add new controller SANYO - * - * Interrupt code based on NECIRrcv by Joe Knapp - * http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1210243556 - * Also influenced by http://zovirl.com/2008/11/12/building-a-universal-remote-with-an-arduino/ - * - * JVC and Panasonic protocol added by Kristian Lauszus (Thanks to zenwheel and other people at the original blog post) - * LG added by Darryl Smith (based on the JVC protocol) - * Whynter A/C ARC-110WD added by Francesco Meschia - */ - -// The following are compile-time library options. -// If you change them, recompile the library. -// If DEBUG is defined, a lot of debugging output will be printed during decoding. -// TEST must be defined for the IRtest unittests to work. It will make some -// methods virtual, which will be slightly slower, which is why it is optional. -//#define DEBUG -// #define TEST - -//------------------------------------------------------------------------------ -// An enumerated list of all supported formats +// Mark & Space matching functions // -typedef - enum { - UNKNOWN = -1, - UNUSED = 0, - NEC = 1, - SONY = 2, - RC5 = 3, - RC6 = 4, - DISH = 5, - SHARP = 6, - PANASONIC = 7, - JVC = 8, - SANYO = 9, - MITSUBISHI = 10, - SAMSUNG = 11, - LG = 12, - WHYNTER = 13, - AIWA_RC_T501 = 14, - } -decode_type_t; +int MATCH (int measured, int desired) ; +int MATCH_MARK (int measured_ticks, int desired_us) ; +int MATCH_SPACE (int measured_ticks, int desired_us) ; //------------------------------------------------------------------------------ // Results returned from the decoder @@ -99,130 +120,168 @@ class decode_results { public: decode_type_t decode_type; // UNKNOWN, NEC, SONY, RC5, ... - unsigned int address; // Used by Panasonic & Sharp - unsigned long value; // Decoded value + unsigned int address; // Used by Panasonic & Sharp [16-bits] + unsigned long value; // Decoded value [max 32-bits] int bits; // Number of bits in decoded value volatile unsigned int *rawbuf; // Raw intervals in 50uS ticks - int rawlen; // Number of records in rawbuf. + int rawlen; // Number of records in rawbuf int overflow; // true iff IR raw code too long }; //------------------------------------------------------------------------------ // Decoded value for NEC when a repeat code is received // -#define REPEAT 0xffffffff +#define REPEAT 0xFFFFFFFF //------------------------------------------------------------------------------ -// main class for receiving IR +// Main class for receiving IR +// class IRrecv { -public: - IRrecv(int recvpin); - void blink13(int blinkflag); - int decode(decode_results *results); - void enableIRIn(); - void resume(); -private: - // These are called by decode - int getRClevel(decode_results *results, int *offset, int *used, int t1); -#ifdef DECODE_NEC - long decodeNEC(decode_results *results); -#endif -#ifdef DECODE_SONY - long decodeSony(decode_results *results); -#endif -#ifdef DECODE_SANYO - long decodeSanyo(decode_results *results); -#endif -#ifdef DECODE_MITSUBISHI - long decodeMitsubishi(decode_results *results); -#endif -#ifdef DECODE_RC5 - long decodeRC5(decode_results *results); -#endif -#ifdef DECODE_RC6 - long decodeRC6(decode_results *results); -#endif -#ifdef DECODE_PANASONIC - long decodePanasonic(decode_results *results); -#endif -#ifdef DECODE_LG - long decodeLG(decode_results *results); -#endif -#ifdef DECODE_JVC - long decodeJVC(decode_results *results); -#endif -#ifdef DECODE_SAMSUNG - long decodeSAMSUNG(decode_results *results); -#endif + public: + IRrecv (int recvpin) ; -#ifdef DECODE_WHYNTER - long decodeWhynter(decode_results *results); -#endif + void blink13 (int blinkflag) ; + int decode (decode_results *results) ; + void enableIRIn ( ) ; + void resume ( ) ; -#ifdef DECODE_AIWA_RC_T501 - long decodeAiwaRCT501(decode_results *results); -#endif - - long decodeHash(decode_results *results); - int compare(unsigned int oldval, unsigned int newval); + private: + long decodeHash (decode_results *results) ; + int compare (unsigned int oldval, unsigned int newval) ; + //...................................................................... +# if (DECODE_RC5 || DECODE_RC6) + // This helper function is shared by RC5 and RC6 + int getRClevel (decode_results *results, int *offset, int *used, int t1) ; +# endif +# if DECODE_RC5 + bool decodeRC5 (decode_results *results) ; +# endif +# if DECODE_RC6 + bool decodeRC6 (decode_results *results) ; +# endif + //...................................................................... +# if DECODE_NEC + bool decodeNEC (decode_results *results) ; +# endif + //...................................................................... +# if DECODE_SONY + bool decodeSony (decode_results *results) ; +# endif + //...................................................................... +# if DECODE_PANASONIC + bool decodePanasonic (decode_results *results) ; +# endif + //...................................................................... +# if DECODE_JVC + bool decodeJVC (decode_results *results) ; +# endif + //...................................................................... +# if DECODE_SAMSUNG + bool decodeSAMSUNG (decode_results *results) ; +# endif + //...................................................................... +# if DECODE_WHYNTER + bool decodeWhynter (decode_results *results) ; +# endif + //...................................................................... +# if DECODE_AIWA_RC_T501 + bool decodeAiwaRCT501 (decode_results *results) ; +# endif + //...................................................................... +# if DECODE_LG + bool decodeLG (decode_results *results) ; +# endif + //...................................................................... +# if DECODE_SANYO + bool decodeSanyo (decode_results *results) ; +# endif + //...................................................................... +# if DECODE_MITSUBISHI + bool decodeMitsubishi (decode_results *results) ; +# endif + //...................................................................... +# if DECODE_DISH + bool decodeDish (decode_results *results) ; // NOT WRITTEN +# endif + //...................................................................... +# if DECODE_SHARP + bool decodeSharp (decode_results *results) ; // NOT WRITTEN +# endif } ; -//------------------------------------------------------------------------------ -// Only used for testing; can remove virtual for shorter code -#ifdef TEST -#define VIRTUAL virtual -#else -#define VIRTUAL -#endif - //------------------------------------------------------------------------------ class IRsend { -public: - IRsend() {} - void sendRaw(unsigned int buf[], int len, int hz); -#ifdef SEND_RC5 - void sendRC5(unsigned long data, int nbits); -#endif -#ifdef SEND_RC6 - void sendRC6(unsigned long data, int nbits); -#endif -#ifdef SEND_WHYNTER - void sendWhynter(unsigned long data, int nbits); -#endif -#ifdef SEND_NEC - void sendNEC(unsigned long data, int nbits); -#endif -#ifdef SEND_SONY - void sendSony(unsigned long data, int nbits); - // Neither Sanyo nor Mitsubishi send is implemented yet - // void sendSanyo(unsigned long data, int nbits); - // void sendMitsubishi(unsigned long data, int nbits); -#endif -#ifdef SEND_DISH - void sendDISH(unsigned long data, int nbits); -#endif -#ifdef SEND_SHARP - void sendSharpRaw(unsigned long data, int nbits); - void sendSharp(unsigned int address, unsigned int command); -#endif -#ifdef SEND_PANASONIC - void sendPanasonic(unsigned int address, unsigned long data); -#endif -#ifdef SEND_JVC - void sendJVC(unsigned long data, int nbits, int repeat); // *Note instead of sending the REPEAT constant if you want the JVC repeat signal sent, send the original code value and change the repeat argument from 0 to 1. JVC protocol repeats by skipping the header NOT by sending a separate code value like NEC does. -#endif -#ifdef SEND_AIWA_RC_T501 - void sendAiwaRCT501(int code); -#endif -#ifdef SEND_SAMSUNG - void sendSAMSUNG(unsigned long data, int nbits); -#endif - void enableIROut(int khz); - VIRTUAL void mark(int usec); - VIRTUAL void space(int usec); + public: + IRsend () { } + + void enableIROut (int khz) ; + void mark (int usec) ; + void space (int usec) ; + void sendRaw (unsigned int buf[], int len, int hz) ; + + //...................................................................... +# if SEND_RC5 + void sendRC5 (unsigned long data, int nbits) ; +# endif +# if SEND_RC6 + void sendRC6 (unsigned long data, int nbits) ; +# endif + //...................................................................... +# if SEND_NEC + void sendNEC (unsigned long data, int nbits) ; +# endif + //...................................................................... +# if SEND_SONY + void sendSony (unsigned long data, int nbits) ; +# endif + //...................................................................... +# if SEND_PANASONIC + void sendPanasonic (unsigned int address, unsigned long data) ; +# endif + //...................................................................... +# if SEND_JVC + // JVC does NOT repeat by sending a separate code (like NEC does). + // The JVC protocol repeats by skipping the header. + // To send a JVC repeat signal, send the original code value + // and set 'repeat' to true + void sendJVC (unsigned long data, int nbits, bool repeat) ; +# endif + //...................................................................... +# if SEND_SAMSUNG + void sendSAMSUNG (unsigned long data, int nbits) ; +# endif + //...................................................................... +# if SEND_WHYNTER + void sendWhynter (unsigned long data, int nbits) ; +# endif + //...................................................................... +# if SEND_AIWA_RC_T501 + void sendAiwaRCT501 (int code) ; +# endif + //...................................................................... +# if SEND_LG + void sendLG ( ) ; // NOT WRITTEN +# endif + //...................................................................... +# if SEND_SANYO + void sendSanyo ( ) ; // NOT WRITTEN +# endif + //...................................................................... +# if SEND_MISUBISHI + void sendMitsubishi ( ) ; // NOT WRITTEN +# endif + //...................................................................... +# if SEND_DISH + void sendDISH (unsigned long data, int nbits) ; +# endif + //...................................................................... +# if SEND_SHARP + void sendSharpRaw (unsigned long data, int nbits) ; + void sendSharp (unsigned int address, unsigned int command) ; +# endif } ; #endif diff --git a/ir_Aiwa.cpp b/ir_Aiwa.cpp index b4049ca..f56aa99 100644 --- a/ir_Aiwa.cpp +++ b/ir_Aiwa.cpp @@ -24,7 +24,7 @@ #define AIWA_RC_T501_ZERO_SPACE 1700 //+============================================================================= -#ifdef SEND_AIWA_RC_T501 +#if SEND_AIWA_RC_T501 void IRsend::sendAiwaRCT501 (int code) { unsigned long pre = 0x0227EEC0; // 26-bits @@ -48,7 +48,8 @@ void IRsend::sendAiwaRCT501 (int code) // it only send 15bits and ignores the top bit // then uses TOPBIT which is 0x80000000 to check the bit code // I suspect TOPBIT should be changed to 0x00008000 - // Skip firts code bit + + // Skip first code bit code <<= 1; // Send code for (int i = 0; i < 15; i++) { @@ -57,6 +58,7 @@ void IRsend::sendAiwaRCT501 (int code) else space(AIWA_RC_T501_ZERO_SPACE) ; code <<= 1; } + //-^- THIS CODE LOOKS LIKE IT MIGHT BE WRONG - CHECK! // POST-DATA, 1 bit, 0x0 @@ -69,40 +71,36 @@ void IRsend::sendAiwaRCT501 (int code) #endif //+============================================================================= -#ifdef DECODE_AIWA_RC_T501 -long IRrecv::decodeAiwaRCT501 (decode_results *results) +#if DECODE_AIWA_RC_T501 +bool IRrecv::decodeAiwaRCT501 (decode_results *results) { - int data = 0; - int offset = 1; // skip first garbage read + int data = 0; + int offset = 1; - // Check SIZE - if (irparams.rawlen < 2 * (AIWA_RC_T501_SUM_BITS) + 4) return false ; + // Check SIZE + if (irparams.rawlen < 2 * (AIWA_RC_T501_SUM_BITS) + 4) return false ; - // Check HDR - if (!MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_HDR_MARK)) return false ; - offset++; + // Check HDR Mark/Space + if (!MATCH_MARK (results->rawbuf[offset++], AIWA_RC_T501_HDR_MARK )) return false ; + if (!MATCH_SPACE(results->rawbuf[offset++], AIWA_RC_T501_HDR_SPACE)) return false ; - // Check HDR space - if (!MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_HDR_SPACE)) return false ; - offset++; + offset += 26; // skip pre-data - optional + while(offset < irparams.rawlen - 4) { + if (MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_BIT_MARK)) offset++ ; + else return false ; - offset += 26; // skip pre-data - optional - while(offset < irparams.rawlen - 4) { - if (MATCH_MARK(results->rawbuf[offset], AIWA_RC_T501_BIT_MARK)) offset++ ; - else return false ; + // ONE & ZERO + if (MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ZERO_SPACE)) data = (data << 1) | 0 ; + else break ; // End of one & zero detected + offset++; + } - // ONE & ZERO - if (MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], AIWA_RC_T501_ZERO_SPACE)) data <<= 1 ; - else break ; // End of one & zero detected - offset++; - } + results->bits = (offset - 1) / 2; + if (results->bits < 42) return false ; - results->bits = (offset - 1) / 2; - if (results->bits < 42) return false ; - results->value = data; - results->decode_type = AIWA_RC_T501; - return true; + results->value = data; + results->decode_type = AIWA_RC_T501; + return true; } #endif - diff --git a/ir_Dish.cpp b/ir_Dish.cpp index 22e10d0..387b163 100644 --- a/ir_Dish.cpp +++ b/ir_Dish.cpp @@ -21,35 +21,33 @@ // DISH NETWORK (echostar 301): // http://lirc.sourceforge.net/remotes/echostar/301_501_3100_5100_58xx_59xx -#define DISH_BITS 16 - -#define DISH_HDR_MARK 400 -#define DISH_HDR_SPACE 6100 -#define DISH_BIT_MARK 400 -#define DISH_ONE_SPACE 1700 -#define DISH_ZERO_SPACE 2800 -#define DISH_RPT_SPACE 6200 -#define DISH_TOP_BIT 0x8000 +#define DISH_BITS 16 +#define DISH_HDR_MARK 400 +#define DISH_HDR_SPACE 6100 +#define DISH_BIT_MARK 400 +#define DISH_ONE_SPACE 1700 +#define DISH_ZERO_SPACE 2800 +#define DISH_RPT_SPACE 6200 //+============================================================================= -#ifdef SEND_DISH +#if SEND_DISH void IRsend::sendDISH (unsigned long data, int nbits) { - // Set IR carrier frequency - enableIROut(56); + // Set IR carrier frequency + enableIROut(56); - mark(DISH_HDR_MARK); - space(DISH_HDR_SPACE); + mark(DISH_HDR_MARK); + space(DISH_HDR_SPACE); - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(DISH_BIT_MARK); - space(DISH_ONE_SPACE); - } else { - mark(DISH_BIT_MARK); - space(DISH_ZERO_SPACE); - } - } + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(DISH_BIT_MARK); + space(DISH_ONE_SPACE); + } else { + mark(DISH_BIT_MARK); + space(DISH_ZERO_SPACE); + } + } } #endif diff --git a/ir_JVC.cpp b/ir_JVC.cpp index 151820a..123c20e 100644 --- a/ir_JVC.cpp +++ b/ir_JVC.cpp @@ -18,8 +18,13 @@ #define JVC_RPT_LENGTH 60000 //+============================================================================= -#ifdef SEND_JVC -void IRsend::sendJVC (unsigned long data, int nbits, int repeat) +// JVC does NOT repeat by sending a separate code (like NEC does). +// The JVC protocol repeats by skipping the header. +// To send a JVC repeat signal, send the original code value +// and set 'repeat' to true +// +#if SEND_JVC +void IRsend::sendJVC (unsigned long data, int nbits, bool repeat) { // Set IR carrier frequency enableIROut(38); @@ -48,37 +53,36 @@ void IRsend::sendJVC (unsigned long data, int nbits, int repeat) #endif //+============================================================================= -#ifdef DECODE_JVC -long IRrecv::decodeJVC (decode_results *results) +#if DECODE_JVC +bool IRrecv::decodeJVC (decode_results *results) { long data = 0; int offset = 1; // Skip first space // Check for repeat - if (irparams.rawlen - 1 == 33 && - MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK) && - MATCH_MARK(results->rawbuf[irparams.rawlen-1], JVC_BIT_MARK)) { - results->bits = 0; - results->value = REPEAT; + if ( (irparams.rawlen - 1 == 33) + && MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK) + && MATCH_MARK(results->rawbuf[irparams.rawlen-1], JVC_BIT_MARK) + ) { + results->bits = 0; + results->value = REPEAT; results->decode_type = JVC; return true; } // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], JVC_HDR_MARK)) return false ; - offset++; + if (!MATCH_MARK(results->rawbuf[offset++], JVC_HDR_MARK)) return false ; - if (irparams.rawlen < 2 * JVC_BITS + 1 ) return false ; + if (irparams.rawlen < (2 * JVC_BITS) + 1 ) return false ; // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], JVC_HDR_SPACE)) return false ; - offset++; + if (!MATCH_SPACE(results->rawbuf[offset++], JVC_HDR_SPACE)) return false ; for (int i = 0; i < JVC_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], JVC_BIT_MARK)) return false ; - offset++; + if (!MATCH_MARK(results->rawbuf[offset++], JVC_BIT_MARK)) return false ; + if (MATCH_SPACE(results->rawbuf[offset], JVC_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], JVC_ZERO_SPACE)) data <<= 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], JVC_ZERO_SPACE)) data = (data << 1) | 0 ; else return false ; offset++; } diff --git a/ir_LG.cpp b/ir_LG.cpp index 44b1a77..4e8dd82 100644 --- a/ir_LG.cpp +++ b/ir_LG.cpp @@ -19,24 +19,24 @@ #define LG_RPT_LENGTH 60000 //+============================================================================= -#ifdef DECODE_LG -long IRrecv::decodeLG (decode_results *results) +#if DECODE_LG +bool IRrecv::decodeLG (decode_results *results) { long data = 0; int offset = 1; // Skip first space - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], LG_HDR_MARK)) return false ; - offset++; - if (irparams.rawlen < 2 * LG_BITS + 1 ) return false ; - // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], LG_HDR_SPACE)) return false ; - offset++; + // Check we have the right amount of data + if (irparams.rawlen < (2 * LG_BITS) + 1 ) return false ; + + // Initial mark/space + if (!MATCH_MARK(results->rawbuf[offset++], LG_HDR_MARK)) return false ; + if (!MATCH_SPACE(results->rawbuf[offset++], LG_HDR_SPACE)) return false ; + for (int i = 0; i < LG_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; - offset++; + if (!MATCH_MARK(results->rawbuf[offset++], LG_BIT_MARK)) return false ; + if (MATCH_SPACE(results->rawbuf[offset], LG_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], LG_ZERO_SPACE)) data <<= 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], LG_ZERO_SPACE)) data = (data << 1) | 0 ; else return false ; offset++; } @@ -45,8 +45,8 @@ long IRrecv::decodeLG (decode_results *results) if (!MATCH_MARK(results->rawbuf[offset], LG_BIT_MARK)) return false ; // Success - results->bits = LG_BITS; - results->value = data; + results->bits = LG_BITS; + results->value = data; results->decode_type = LG; return true; } diff --git a/ir_Mitsubishi.cpp b/ir_Mitsubishi.cpp index e02b64a..7f83e53 100644 --- a/ir_Mitsubishi.cpp +++ b/ir_Mitsubishi.cpp @@ -23,8 +23,8 @@ // #define MITSUBISHI_RPT_LENGTH 45000 //+============================================================================= -#ifdef DECODE_MITSUBISHI -long IRrecv::decodeMitsubishi (decode_results *results) +#if DECODE_MITSUBISHI +bool IRrecv::decodeMitsubishi (decode_results *results) { // Serial.print("?!? decoding Mitsubishi:");Serial.print(irparams.rawlen); Serial.print(" want "); Serial.println( 2 * MITSUBISHI_BITS + 2); long data = 0; diff --git a/ir_NEC.cpp b/ir_NEC.cpp index cb3b248..8da46e8 100644 --- a/ir_NEC.cpp +++ b/ir_NEC.cpp @@ -18,7 +18,7 @@ #define NEC_RPT_SPACE 2250 //+============================================================================= -#ifdef SEND_NEC +#if SEND_NEC void IRsend::sendNEC (unsigned long data, int nbits) { // Set IR carrier frequency @@ -48,8 +48,8 @@ void IRsend::sendNEC (unsigned long data, int nbits) //+============================================================================= // NECs have a repeat only 4 items long // -#ifdef DECODE_NEC -long IRrecv::decodeNEC (decode_results *results) +#if DECODE_NEC +bool IRrecv::decodeNEC (decode_results *results) { long data = 0; // We decode in to here; Start with nothing int offset = 1; // Index in to results; Skip first entry!? diff --git a/ir_Panasonic.cpp b/ir_Panasonic.cpp index 8d88ade..d3b471a 100644 --- a/ir_Panasonic.cpp +++ b/ir_Panasonic.cpp @@ -9,15 +9,15 @@ // P A A N N A A SSSS OOO N N IIIII CCCC //============================================================================== -#define PANASONIC_BITS 48 -#define PANASONIC_HDR_MARK 3502 -#define PANASONIC_HDR_SPACE 1750 -#define PANASONIC_BIT_MARK 502 -#define PANASONIC_ONE_SPACE 1244 -#define PANASONIC_ZERO_SPACE 400 +#define PANASONIC_BITS 48 +#define PANASONIC_HDR_MARK 3502 +#define PANASONIC_HDR_SPACE 1750 +#define PANASONIC_BIT_MARK 502 +#define PANASONIC_ONE_SPACE 1244 +#define PANASONIC_ZERO_SPACE 400 //+============================================================================= -#ifdef SEND_PANASONIC +#if SEND_PANASONIC void IRsend::sendPanasonic (unsigned int address, unsigned long data) { // Set IR carrier frequency @@ -48,16 +48,14 @@ void IRsend::sendPanasonic (unsigned int address, unsigned long data) #endif //+============================================================================= -#ifdef DECODE_PANASONIC -long IRrecv::decodePanasonic (decode_results *results) +#if DECODE_PANASONIC +bool IRrecv::decodePanasonic (decode_results *results) { - unsigned long long data = 0; - int offset = 1; + unsigned long long data = 0; + int offset = 1; - if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) return false ; - offset++; - if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_SPACE)) return false ; - offset++; + if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_HDR_MARK )) return false ; + if (!MATCH_MARK(results->rawbuf[offset++], PANASONIC_HDR_SPACE)) return false ; // decode address for (int i = 0; i < PANASONIC_BITS; i++) { diff --git a/ir_RC5_RC6.cpp b/ir_RC5_RC6.cpp index 16c2bad..1a9576d 100644 --- a/ir_RC5_RC6.cpp +++ b/ir_RC5_RC6.cpp @@ -12,25 +12,30 @@ // int IRrecv::getRClevel (decode_results *results, int *offset, int *used, int t1) { - if (*offset >= results->rawlen) return SPACE ; // After end of recorded buffer, assume SPACE. - int width = results->rawbuf[*offset]; - int val = ((*offset) % 2) ? MARK : SPACE; - int correction = (val == MARK) ? MARK_EXCESS : - MARK_EXCESS; + int width; + int val; + int correction; + int avail; - int avail; - if (MATCH(width, t1 + correction)) avail = 1 ; - else if (MATCH(width, 2*t1 + correction)) avail = 2 ; - else if (MATCH(width, 3*t1 + correction)) avail = 3 ; - else return -1 ; + if (*offset >= results->rawlen) return SPACE ; // After end of recorded buffer, assume SPACE. + width = results->rawbuf[*offset]; + val = ((*offset) % 2) ? MARK : SPACE; + correction = (val == MARK) ? MARK_EXCESS : - MARK_EXCESS; - (*used)++; - if (*used >= avail) { - *used = 0; - (*offset)++; - } + if (MATCH(width, ( t1) + correction)) avail = 1 ; + else if (MATCH(width, (2*t1) + correction)) avail = 2 ; + else if (MATCH(width, (3*t1) + correction)) avail = 3 ; + else return -1 ; - DBG_PRINTLN( (val == MARK) ? "MARK" : "SPACE" ); - return val; + (*used)++; + if (*used >= avail) { + *used = 0; + (*offset)++; + } + + DBG_PRINTLN( (val == MARK) ? "MARK" : "SPACE" ); + + return val; } //============================================================================== @@ -42,12 +47,12 @@ int IRrecv::getRClevel (decode_results *results, int *offset, int *used, int // // NB: First bit must be a one (start bit) // -#define MIN_RC5_SAMPLES 11 -#define RC5_T1 889 -#define RC5_RPT_LENGTH 46000 +#define MIN_RC5_SAMPLES 11 +#define RC5_T1 889 +#define RC5_RPT_LENGTH 46000 //+============================================================================= -#ifdef SEND_RC5 +#if SEND_RC5 void IRsend::sendRC5 (unsigned long data, int nbits) { // Set IR carrier frequency @@ -74,25 +79,28 @@ void IRsend::sendRC5 (unsigned long data, int nbits) #endif //+============================================================================= -#ifdef DECODE_RC5 -long IRrecv::decodeRC5 (decode_results *results) +#if DECODE_RC5 +bool IRrecv::decodeRC5 (decode_results *results) { + int nbits; + long data = 0; + int used = 0; + int offset = 1; // Skip gap space + if (irparams.rawlen < MIN_RC5_SAMPLES + 2) return false ; - int offset = 1; // Skip gap space - long data = 0; - int used = 0; + // Get start bits if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; if (getRClevel(results, &offset, &used, RC5_T1) != SPACE) return false ; if (getRClevel(results, &offset, &used, RC5_T1) != MARK) return false ; - int nbits; - for (nbits = 0; offset < irparams.rawlen; nbits++) { - int levelA = getRClevel(results, &offset, &used, RC5_T1); - int levelB = getRClevel(results, &offset, &used, RC5_T1); - if (levelA == SPACE && levelB == MARK) data = (data << 1) | 1 ; // 1 bit - else if (levelA == MARK && levelB == SPACE) data <<= 1 ; // zero bit - else return false ; + for (nbits = 0; offset < irparams.rawlen; nbits++) { + int levelA = getRClevel(results, &offset, &used, RC5_T1); + int levelB = getRClevel(results, &offset, &used, RC5_T1); + + if ((levelA == SPACE) && (levelB == MARK )) data = (data << 1) | 1 ; + else if ((levelA == MARK ) && (levelB == SPACE)) data = (data << 1) | 0 ; + else return false ; } // Success @@ -112,13 +120,13 @@ long IRrecv::decodeRC5 (decode_results *results) // // NB : Caller needs to take care of flipping the toggle bit // -#define MIN_RC6_SAMPLES 1 -#define RC6_HDR_MARK 2666 -#define RC6_HDR_SPACE 889 -#define RC6_T1 444 -#define RC6_RPT_LENGTH 46000 +#define MIN_RC6_SAMPLES 1 +#define RC6_HDR_MARK 2666 +#define RC6_HDR_SPACE 889 +#define RC6_T1 444 +#define RC6_RPT_LENGTH 46000 -#ifdef SEND_RC6 +#if SEND_RC6 void IRsend::sendRC6 (unsigned long data, int nbits) { // Set IR carrier frequency @@ -150,46 +158,47 @@ void IRsend::sendRC6 (unsigned long data, int nbits) #endif //+============================================================================= -#ifdef DECODE_RC6 -long IRrecv::decodeRC6 (decode_results *results) +#if DECODE_RC6 +bool IRrecv::decodeRC6 (decode_results *results) { + int nbits; + long data = 0; + int used = 0; + int offset = 1; // Skip first space + if (results->rawlen < MIN_RC6_SAMPLES) return false ; - int offset = 1; // Skip first space // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], RC6_HDR_MARK)) return false ; - offset++; - - if (!MATCH_SPACE(results->rawbuf[offset], RC6_HDR_SPACE)) return false ; - offset++; - - long data = 0; - int used = 0; + if (!MATCH_MARK(results->rawbuf[offset++], RC6_HDR_MARK)) return false ; + if (!MATCH_SPACE(results->rawbuf[offset++], RC6_HDR_SPACE)) return false ; // Get start bit (1) if (getRClevel(results, &offset, &used, RC6_T1) != MARK) return false ; if (getRClevel(results, &offset, &used, RC6_T1) != SPACE) return false ; - int nbits; + for (nbits = 0; offset < results->rawlen; nbits++) { - int levelA, levelB; // Next two levels + int levelA, levelB; // Next two levels + levelA = getRClevel(results, &offset, &used, RC6_T1); if (nbits == 3) { // T bit is double wide; make sure second half matches if (levelA != getRClevel(results, &offset, &used, RC6_T1)) return false; } + levelB = getRClevel(results, &offset, &used, RC6_T1); if (nbits == 3) { // T bit is double wide; make sure second half matches if (levelB != getRClevel(results, &offset, &used, RC6_T1)) return false; } - if (levelA == MARK && levelB == SPACE) data = (data << 1) | 1 ; // 1-bit (reversed compared to RC5) - else if (levelA == SPACE && levelB == MARK) data <<= 1 ; // zero bit - else return false ; // Error + + if ((levelA == MARK ) && (levelB == SPACE)) data = (data << 1) | 1 ; // inverted compared to RC5 + else if ((levelA == SPACE) && (levelB == MARK )) data = (data << 1) | 0 ; // ... + else return false ; // Error } // Success - results->bits = nbits; - results->value = data; + results->bits = nbits; + results->value = data; results->decode_type = RC6; return true; } diff --git a/ir_Samsung.cpp b/ir_Samsung.cpp index 0773edd..65452f2 100644 --- a/ir_Samsung.cpp +++ b/ir_Samsung.cpp @@ -18,7 +18,7 @@ #define SAMSUNG_RPT_SPACE 2250 //+============================================================================= -#ifdef SEND_SAMSUNG +#if SEND_SAMSUNG void IRsend::sendSAMSUNG (unsigned long data, int nbits) { // Set IR carrier frequency @@ -48,38 +48,36 @@ void IRsend::sendSAMSUNG (unsigned long data, int nbits) //+============================================================================= // SAMSUNGs have a repeat only 4 items long // -#ifdef DECODE_SAMSUNG -long IRrecv::decodeSAMSUNG (decode_results *results) +#if DECODE_SAMSUNG +bool IRrecv::decodeSAMSUNG (decode_results *results) { long data = 0; - int offset = 1; // Skip first space + int offset = 1; // Skip first space // Initial mark if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_HDR_MARK)) return false ; offset++; // Check for repeat - if (irparams.rawlen == 4 && - MATCH_SPACE(results->rawbuf[offset], SAMSUNG_RPT_SPACE) && - MATCH_MARK(results->rawbuf[offset+1], SAMSUNG_BIT_MARK)) { - results->bits = 0; - results->value = REPEAT; + if ( (irparams.rawlen == 4) + && MATCH_SPACE(results->rawbuf[offset], SAMSUNG_RPT_SPACE) + && MATCH_MARK(results->rawbuf[offset+1], SAMSUNG_BIT_MARK) + ) { + results->bits = 0; + results->value = REPEAT; results->decode_type = SAMSUNG; return true; } - if (irparams.rawlen < 2 * SAMSUNG_BITS + 4) return false ; + if (irparams.rawlen < (2 * SAMSUNG_BITS) + 4) return false ; // Initial space - if (!MATCH_SPACE(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) return false ; - offset++; + if (!MATCH_SPACE(results->rawbuf[offset++], SAMSUNG_HDR_SPACE)) return false ; for (int i = 0; i < SAMSUNG_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_BIT_MARK)) return false ; - - offset++; + if (!MATCH_MARK(results->rawbuf[offset++], SAMSUNG_BIT_MARK)) return false ; if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ZERO_SPACE)) data <<= 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], SAMSUNG_ZERO_SPACE)) data = (data << 1) | 0 ; else return false ; offset++; } diff --git a/ir_Sanyo.cpp b/ir_Sanyo.cpp index ad0e76f..c775d61 100644 --- a/ir_Sanyo.cpp +++ b/ir_Sanyo.cpp @@ -12,68 +12,65 @@ // I think this is a Sanyo decoder: Serial = SA 8650B // Looks like Sony except for timings, 48 chars of data and time/space different -#define SANYO_BITS 12 - -#define SANYO_HDR_MARK 3500 // seen range 3500 -#define SANYO_HDR_SPACE 950 // seen 950 -#define SANYO_ONE_MARK 2400 // seen 2400 -#define SANYO_ZERO_MARK 700 // seen 700 -#define SANYO_DOUBLE_SPACE_USECS 800 // usually ssee 713 - not using ticks as get number wrapround -#define SANYO_RPT_LENGTH 45000 +#define SANYO_BITS 12 +#define SANYO_HDR_MARK 3500 // seen range 3500 +#define SANYO_HDR_SPACE 950 // seen 950 +#define SANYO_ONE_MARK 2400 // seen 2400 +#define SANYO_ZERO_MARK 700 // seen 700 +#define SANYO_DOUBLE_SPACE_USECS 800 // usually ssee 713 - not using ticks as get number wrapround +#define SANYO_RPT_LENGTH 45000 //+============================================================================= -#ifdef DECODE_SANYO -long IRrecv::decodeSanyo (decode_results *results) +#if DECODE_SANYO +bool IRrecv::decodeSanyo (decode_results *results) { - long data = 0; - if (irparams.rawlen < 2 * SANYO_BITS + 2) return false ; - int offset = 0; // Skip first space - // Initial space + long data = 0; + int offset = 0; // Skip first space <-- CHECK THIS! + + if (irparams.rawlen < (2 * SANYO_BITS) + 2) return false ; #if 0 - // Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay - Serial.print("IR Gap: "); - Serial.println( results->rawbuf[offset]); - Serial.println( "test against:"); - Serial.println(results->rawbuf[offset]); + // Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay + Serial.print("IR Gap: "); + Serial.println( results->rawbuf[offset]); + Serial.println( "test against:"); + Serial.println(results->rawbuf[offset]); #endif - if (results->rawbuf[offset] < SANYO_DOUBLE_SPACE_USECS) { - // Serial.print("IR Gap found: "); - results->bits = 0; - results->value = REPEAT; - results->decode_type = SANYO; - return true; - } - offset++; + // Initial space + if (results->rawbuf[offset] < SANYO_DOUBLE_SPACE_USECS) { + //Serial.print("IR Gap found: "); + results->bits = 0; + results->value = REPEAT; + results->decode_type = SANYO; + return true; + } + offset++; - // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; - offset++; + // Initial mark + if (!MATCH_MARK(results->rawbuf[offset++], SANYO_HDR_MARK)) return false ; - // Skip Second Mark - if (!MATCH_MARK(results->rawbuf[offset], SANYO_HDR_MARK)) return false ; - offset++; + // Skip Second Mark + if (!MATCH_MARK(results->rawbuf[offset++], SANYO_HDR_MARK)) return false ; - while (offset + 1 < irparams.rawlen) { - if (!MATCH_SPACE(results->rawbuf[offset], SANYO_HDR_SPACE)) break ; - offset++; - if (MATCH_MARK(results->rawbuf[offset], SANYO_ONE_MARK)) data = (data << 1) | 1 ; - else if (MATCH_MARK(results->rawbuf[offset], SANYO_ZERO_MARK)) data <<= 1 ; - else return false ; - offset++; - } + while (offset + 1 < irparams.rawlen) { + if (!MATCH_SPACE(results->rawbuf[offset++], SANYO_HDR_SPACE)) break ; - // Success - results->bits = (offset - 1) / 2; - if (results->bits < 12) { - results->bits = 0; - return false; - } + if (MATCH_MARK(results->rawbuf[offset], SANYO_ONE_MARK)) data = (data << 1) | 1 ; + else if (MATCH_MARK(results->rawbuf[offset], SANYO_ZERO_MARK)) data = (data << 1) | 0 ; + else return false ; + offset++; + } - results->value = data; - results->decode_type = SANYO; - return true; + // Success + results->bits = (offset - 1) / 2; + if (results->bits < 12) { + results->bits = 0; + return false; + } + + results->value = data; + results->decode_type = SANYO; + return true; } #endif - diff --git a/ir_Sharp.cpp b/ir_Sharp.cpp index ffd77ed..13f8a53 100644 --- a/ir_Sharp.cpp +++ b/ir_Sharp.cpp @@ -9,63 +9,63 @@ // SSSS H H A A R R P //============================================================================== -// Sharp and DISH support by Todd Treece ( http://unionbridge.org/design/ircommand ) +// Sharp and DISH support by Todd Treece: http://unionbridge.org/design/ircommand // // The send function has the necessary repeat built in because of the need to // invert the signal. // // Sharp protocol documentation: -// http://www.sbprojects.com/knowledge/ir/sharp.htm +// http://www.sbprojects.com/knowledge/ir/sharp.htm // // Here is the LIRC file I found that seems to match the remote codes from the // oscilloscope: // Sharp LCD TV: // http://lirc.sourceforge.net/remotes/sharp/GA538WJSA -#define SHARP_BITS 15 +#define SHARP_BITS 15 +#define SHARP_BIT_MARK 245 +#define SHARP_ONE_SPACE 1805 +#define SHARP_ZERO_SPACE 795 +#define SHARP_GAP 600000 +#define SHARP_RPT_SPACE 3000 -#define SHARP_BIT_MARK 245 -#define SHARP_ONE_SPACE 1805 -#define SHARP_ZERO_SPACE 795 -#define SHARP_GAP 600000 -#define SHARP_TOGGLE_MASK 0x3FF -#define SHARP_RPT_SPACE 3000 +#define SHARP_TOGGLE_MASK 0x3FF //+============================================================================= -#ifdef SEND_SHARP +#if SEND_SHARP void IRsend::sendSharpRaw (unsigned long data, int nbits) { - unsigned long invertdata = data ^ SHARP_TOGGLE_MASK; - enableIROut(38); + enableIROut(38); - // Sending codes in bursts of 3 (normal, inverted, normal) makes transmission - // much more reliable. That's the exact behaviour of CD-S6470 remote control. - for (int n = 0; n < 3; n++) { - for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { - if (data & mask) { - mark(SHARP_BIT_MARK); - space(SHARP_ONE_SPACE); - } else { - mark(SHARP_BIT_MARK); - space(SHARP_ZERO_SPACE); - } - } + // Sending codes in bursts of 3 (normal, inverted, normal) makes transmission + // much more reliable. That's the exact behaviour of CD-S6470 remote control. + for (int n = 0; n < 3; n++) { + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark(SHARP_BIT_MARK); + space(SHARP_ONE_SPACE); + } else { + mark(SHARP_BIT_MARK); + space(SHARP_ZERO_SPACE); + } + } - mark(SHARP_BIT_MARK); - space(SHARP_ZERO_SPACE); - delay(40); + mark(SHARP_BIT_MARK); + space(SHARP_ZERO_SPACE); + delay(40); - data = data ^ SHARP_TOGGLE_MASK; - } + data = data ^ SHARP_TOGGLE_MASK; + } } +#endif //+============================================================================= // Sharp send compatible with data obtained through decodeSharp() // ^^^^^^^^^^^^^ FUNCTION MISSING! // +#if SEND_SHARP void IRsend::sendSharp (unsigned int address, unsigned int command) { - sendSharpRaw((address << 10) | (command << 2) | 2, 15); + sendSharpRaw((address << 10) | (command << 2) | 2, SHARP_BITS); } - #endif diff --git a/ir_Sony.cpp b/ir_Sony.cpp index 4446f83..e01df55 100644 --- a/ir_Sony.cpp +++ b/ir_Sony.cpp @@ -18,7 +18,7 @@ #define SONY_DOUBLE_SPACE_USECS 500 // usually ssee 713 - not using ticks as get number wrapround //+============================================================================= -#ifdef SEND_SONY +#if SEND_SONY void IRsend::sendSony (unsigned long data, int nbits) { // Set IR carrier frequency @@ -44,12 +44,13 @@ void IRsend::sendSony (unsigned long data, int nbits) #endif //+============================================================================= -#ifdef DECODE_SONY -long IRrecv::decodeSony (decode_results *results) +#if DECODE_SONY +bool IRrecv::decodeSony (decode_results *results) { - long data = 0; - if (irparams.rawlen < 2 * SONY_BITS + 2) return false ; - int offset = 0; // Dont skip first space, check its size + long data = 0; + int offset = 0; // Dont skip first space, check its size + + if (irparams.rawlen < (2 * SONY_BITS) + 2) return false ; // Some Sony's deliver repeats fast after first // unfortunately can't spot difference from of repeat from two fast clicks @@ -69,14 +70,13 @@ long IRrecv::decodeSony (decode_results *results) offset++; // Initial mark - if (!MATCH_MARK(results->rawbuf[offset], SONY_HDR_MARK)) return false ; - offset++; + if (!MATCH_MARK(results->rawbuf[offset++], SONY_HDR_MARK)) return false ; while (offset + 1 < irparams.rawlen) { - if (!MATCH_SPACE(results->rawbuf[offset], SONY_HDR_SPACE)) break ; - offset++; + if (!MATCH_SPACE(results->rawbuf[offset++], SONY_HDR_SPACE)) break ; + if (MATCH_MARK(results->rawbuf[offset], SONY_ONE_MARK)) data = (data << 1) | 1 ; - else if (MATCH_MARK(results->rawbuf[offset], SONY_ZERO_MARK)) data <<= 1 ; + else if (MATCH_MARK(results->rawbuf[offset], SONY_ZERO_MARK)) data = (data << 1) | 0 ; else return false ; offset++; } diff --git a/ir_Whynter.cpp b/ir_Whynter.cpp index c97732a..2165cb7 100644 --- a/ir_Whynter.cpp +++ b/ir_Whynter.cpp @@ -19,7 +19,7 @@ #define WHYNTER_ZERO_SPACE 750 //+============================================================================= -#ifdef SEND_WHYNTER +#if SEND_WHYNTER void IRsend::sendWhynter (unsigned long data, int nbits) { // Set IR carrier frequency @@ -51,35 +51,30 @@ void IRsend::sendWhynter (unsigned long data, int nbits) #endif //+============================================================================= -#ifdef DECODE_WHYNTER -long IRrecv::decodeWhynter (decode_results *results) +#if DECODE_WHYNTER +bool IRrecv::decodeWhynter (decode_results *results) { - long data = 0; + long data = 0; + int offset = 1; // skip initial space - if (irparams.rawlen < 2 * WHYNTER_BITS + 6) return false ; + // Check we have the right amount of data + if (irparams.rawlen < (2 * WHYNTER_BITS) + 6) return false ; - int offset = 1; // skip initial space - - // sequence begins with a bit mark and a zero space - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; - offset++; - if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_ZERO_SPACE)) return false ; - offset++; + // Sequence begins with a bit mark and a zero space + if (!MATCH_MARK (results->rawbuf[offset++], WHYNTER_BIT_MARK )) return false ; + if (!MATCH_SPACE(results->rawbuf[offset++], WHYNTER_ZERO_SPACE)) return false ; // header mark and space - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_HDR_MARK)) return false ; - offset++; - if (!MATCH_SPACE(results->rawbuf[offset], WHYNTER_HDR_SPACE)) return false ; - offset++; + if (!MATCH_MARK (results->rawbuf[offset++], WHYNTER_HDR_MARK )) return false ; + if (!MATCH_SPACE(results->rawbuf[offset++], WHYNTER_HDR_SPACE)) return false ; // data bits for (int i = 0; i < WHYNTER_BITS; i++) { - if (!MATCH_MARK(results->rawbuf[offset], WHYNTER_BIT_MARK)) return false ; - offset++; + if (!MATCH_MARK(results->rawbuf[offset++], WHYNTER_BIT_MARK)) return false ; - if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset],WHYNTER_ZERO_SPACE)) data <<= 1 ; - else return false ; + if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ONE_SPACE )) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], WHYNTER_ZERO_SPACE)) data = (data << 1) | 0 ; + else return false ; offset++; } From aa32e8f048459620484c1fdd68a945bfe9df6815 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 21:07:40 +0100 Subject: [PATCH 21/31] Removed explicit values in enumeration --- IRremote.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/IRremote.h b/IRremote.h index 8882fa8..086da75 100644 --- a/IRremote.h +++ b/IRremote.h @@ -73,20 +73,20 @@ typedef enum { UNKNOWN = -1, UNUSED = 0, - RC5 = 1, - RC6 = 2, - NEC = 3, - SONY = 4, - PANASONIC = 5, - JVC = 6, - SAMSUNG = 7, - WHYNTER = 8, - AIWA_RC_T501 = 9, - LG = 10, - SANYO = 11, - MITSUBISHI = 12, - DISH = 13, - SHARP = 14, + RC5, + RC6 + NEC, + SONY, + PANASONIC, + JVC, + SAMSUNG, + WHYNTER, + AIWA_RC_T501, + LG, + SANYO, + MITSUBISHI, + DISH, + SHARP, } decode_type_t; @@ -212,6 +212,8 @@ class IRrecv } ; //------------------------------------------------------------------------------ +// Main class for sending IR +// class IRsend { public: From 05e688a9617239a9cbbf840ab34a0145fb345c69 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 21:08:21 +0100 Subject: [PATCH 22/31] Added a template for new protocols with full instructions in a big comment at the top --- ir_Template.cpp | 172 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 ir_Template.cpp diff --git a/ir_Template.cpp b/ir_Template.cpp new file mode 100644 index 0000000..9aa33ae --- /dev/null +++ b/ir_Template.cpp @@ -0,0 +1,172 @@ +/* +Assuming the protocol we are adding is for the (imaginary) manufacturer: Shuzu + +Our fantasy protocol is a standard protocol, so we can use this standard +template without too much work. Some protocols are quite unique and will require +considerably more work in this file! It is way beyond the scope of this text to +explain how to reverse engineer "unusual" IR protocols. But, unless you own an +oscilloscope, the starting point is probably to use the rawDump.ino sketch and +try to spot the pattern! + +Before you start, make sure the IR library is working OK: + # Open up the Arduino IDE + # Load up the rawDump.ino example sketch + # Run it + +Now we can start to add our new protocol... + +1. Copy this file to : ir_Shuzu.cpp + +2. Replace all occurrences of "Shuzu" with the name of your protocol. + +3. Tweak the #defines to suit your protocol. + +4. If you're lucky, tweaking the #defines will make the default send() function + work. + +5. Again, if you're lucky, tweaking the #defines will have made the default + decode() function work. + +You have written the code to support your new protocol! + +Now you must do a few things to add it to the IRremote system: + +1. Open IRremote.h and make the following changes: + REMEMEBER to change occurences of "SHUZU" with the name of your protocol + + A. At the top, in the section "Supported Protocols", add: + #define DECODE_SHUZU 1 + #define SEND_SHUZU 1 + + B. In the section "enumerated list of all supported formats", add: + SHUZU, + to the end of the list (notice there is a comma after the protocol name) + + C. Further down in "Main class for receiving IR", add: + //...................................................................... + #if DECODE_SHUZU + bool decodeShuzu (decode_results *results) ; + #endif + + D. Further down in "Main class for sending IR", add: + //...................................................................... + #if SEND_SHUZU + void sendShuzu (unsigned long data, int nbits) ; + #endif + + E. Save your changes and close the file + +2. Now open irRecv.cpp and make the following change: + + A. In the function IRrecv::decode(), add: + #ifdef DECODE_NEC + DBG_PRINTLN("Attempting Shuzu decode"); + if (decodeShuzu(results)) return true ; + #endif + + B. Save your changes and close the file + +Now open the Arduino IDE, load up the rawDump.ino sketch, and run it. +Hopefully it will compile and upload. +If it doesn't, you've done something wrong. Check your work. +If you can't get it to work - seek help from somewhere. + +If you get this far, I will assume you have successfully added your new protocol +There is one last thing to do. + +1. Delete this giant instructional comment. + +2. Send a copy of your work to us so we can include it in the library and + others may benefit from your hard work and maybe even write a song about how + great you are for helping them! :) + +Regards, + BlueChip +*/ + +#include "IRremote.h" +#include "IRremoteInt.h" + +//============================================================================== +// +// +// S H U Z U +// +// +//============================================================================== + +#define SHUZU_BITS 32 // The number of bits in the command + +#define SHUZU_HDR_MARK 1000 // The length of the Header:Mark +#define SHUZU_HDR_SPACE 2000 // The lenght of the Header:Space + +#define SHUZU_BIT_MARK 3000 // The length of a Bit:Mark +#define SHUZU_ONE_SPACE 4000 // The length of a Bit:Space for 1's +#define SHUZU_ZERO_SPACE 5000 // The length of a Bit:Space for 0's + +#define SHUZU_OTHER 1234 // Other things you may need to define + +//+============================================================================= +// +#if SEND_SHUZU +void IRsend::sendShuzu (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(38); + + // Header + mark (SHUZU_HDR_MARK); + space(SHUZU_HDR_SPACE); + + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark (SHUZU_BIT_MARK); + space(SHUZU_ONE_SPACE); + } else { + mark (SHUZU_BIT_MARK); + space(SHUZU_ZERO_SPACE); + } + } + + // Footer + mark(SHUZU_BIT_MARK); + space(0); // Always end with the LED off +} +#endif + +//+============================================================================= +// +#if DECODE_SHUZU +bool IRrecv::decodeShuzu (decode_results *results) +{ + unsigned long data = 0; // Somewhere to build our code + int offset = 1; // Skip the Gap reading + + // Check we have the right amount of data + if (irparams.rawlen != 1 + 2 + (2 * SHUZU_BITS) + 1) return false ; + + // Check initial Mark+Space match + if (!MATCH_MARK (results->rawbuf[offset++], SHUZU_HDR_MARK )) return false ; + if (!MATCH_SPACE(results->rawbuf[offset++], SHUZU_HDR_SPACE)) return false ; + + // Read the bits in + for (int i = 0; i < SHUZU_BITS; i++) { + // Each bit looks like: MARK + SPACE_1 -> 1 + // or : MARK + SPACE_0 -> 0 + if (!MATCH_MARK(results->rawbuf[offset++], SAMSUNG_BIT_MARK)) return false ; + + // IR data is big-endian, so we shuffle it in from the right: + if (MATCH_SPACE(results->rawbuf[offset], SHUZU_ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], SHUZU_ZERO_SPACE)) data = (data << 1) | 0 ; + else return false ; + offset++; + } + + // Success + results->bits = SHUZU_BITS; + results->value = data; + results->decode_type = SHUZU; + return true; +} +#endif From 07df68af9d7964748b6627c62d59b7529e0aa884 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 21:09:44 +0100 Subject: [PATCH 23/31] correct typo --- IRremote.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRremote.h b/IRremote.h index 086da75..f5f433a 100644 --- a/IRremote.h +++ b/IRremote.h @@ -74,7 +74,7 @@ typedef UNKNOWN = -1, UNUSED = 0, RC5, - RC6 + RC6, NEC, SONY, PANASONIC, From ae477413dea8e99325bdea616a9227a388a9d30c Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 22:03:00 +0100 Subject: [PATCH 24/31] Fixup old examples Add new example --- IRremote.h | 5 + examples/IRrecvDump/IRrecvDump.ino | 16 +-- examples/IRrecvDumpV2/IRrecvDumpV2.ino | 162 +++++++++++++++++++++++++ 3 files changed, 175 insertions(+), 8 deletions(-) create mode 100644 examples/IRrecvDumpV2/IRrecvDumpV2.ino diff --git a/IRremote.h b/IRremote.h index f5f433a..47a0e06 100644 --- a/IRremote.h +++ b/IRremote.h @@ -18,6 +18,11 @@ #ifndef IRremote_h #define IRremote_h +//------------------------------------------------------------------------------ +// The ISR header contains several useful macros the user may wish to use +// +#include "IRremoteInt.h" + //------------------------------------------------------------------------------ // Supported IR protocols // Each protocol you include costs memory and, during decode, costs time diff --git a/examples/IRrecvDump/IRrecvDump.ino b/examples/IRrecvDump/IRrecvDump.ino index a1ba3b2..abfef54 100644 --- a/examples/IRrecvDump/IRrecvDump.ino +++ b/examples/IRrecvDump/IRrecvDump.ino @@ -31,22 +31,22 @@ void dump(decode_results *results) { int count = results->rawlen; if (results->decode_type == UNKNOWN) { Serial.print("Unknown encoding: "); - } + } else if (results->decode_type == NEC) { Serial.print("Decoded NEC: "); - } + } else if (results->decode_type == SONY) { Serial.print("Decoded SONY: "); - } + } else if (results->decode_type == RC5) { Serial.print("Decoded RC5: "); - } + } else if (results->decode_type == RC6) { Serial.print("Decoded RC6: "); } - else if (results->decode_type == PANASONIC) { + else if (results->decode_type == PANASONIC) { Serial.print("Decoded PANASONIC - Address: "); - Serial.print(results->panasonicAddress,HEX); + Serial.print(results->address,HEX); Serial.print(" Value: "); } else if (results->decode_type == LG) { @@ -54,7 +54,7 @@ void dump(decode_results *results) { } else if (results->decode_type == JVC) { Serial.print("Decoded JVC: "); - + } else if (results->decode_type == AIWA_RC_T501) { Serial.print("Decoded AIWA RC T501: "); @@ -73,7 +73,7 @@ void dump(decode_results *results) { for (int i = 0; i < count; i++) { if ((i % 2) == 1) { Serial.print(results->rawbuf[i]*USECPERTICK, DEC); - } + } else { Serial.print(-(int)results->rawbuf[i]*USECPERTICK, DEC); } diff --git a/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/examples/IRrecvDumpV2/IRrecvDumpV2.ino new file mode 100644 index 0000000..c6f070c --- /dev/null +++ b/examples/IRrecvDumpV2/IRrecvDumpV2.ino @@ -0,0 +1,162 @@ +//------------------------------------------------------------------------------ +// Include the IRremote library headers +// +#include +#include + +//------------------------------------------------------------------------------ +// Tell IRremote which Arduino pin is connected to the IR Receiver (TSOP4838) +// +IRrecv irrecv(6); + +//+============================================================================= +// Configure the Arduino +// +void setup ( ) +{ + Serial.begin(9600); // Status message will be sent to PC at 9600 baud + irrecv.enableIRIn(); // Start the receiver +} + +//+============================================================================= +// Display IR code +// +void ircode (decode_results *results) +{ + // Panasonic has an Address + if (results->decode_type == PANASONIC) { + Serial.print(results->address, HEX); + Serial.print(":"); + } + + // Print Code + Serial.print(results->value, HEX); +} + +//+============================================================================= +// Display encoding type +// +void encoding (decode_results *results) +{ + switch (results->decode_type) { + default: + case UNKNOWN: Serial.print("UNKNOWN"); break ; + case NEC: Serial.print("NEC"); break ; + case SONY: Serial.print("SONY"); break ; + case RC5: Serial.print("RC5"); break ; + case RC6: Serial.print("RC6"); break ; + case DISH: Serial.print("DISH"); break ; + case SHARP: Serial.print("SHARP"); break ; + case JVC: Serial.print("JVC"); break ; + case SANYO: Serial.print("SANYO"); break ; + case MITSUBISHI: Serial.print("MITSUBISHI"); break ; + case SAMSUNG: Serial.print("SAMSUNG"); break ; + case LG: Serial.print("LG"); break ; + case WHYNTER: Serial.print("WHYNTER"); break ; + case AIWA_RC_T501: Serial.print("AIWA_RC_T501"); break ; + case PANASONIC: Serial.print("PANASONIC"); break ; + } +} + +//+============================================================================= +// Dump out the decode_results structure. +// +void dumpInfo (decode_results *results) +{ + // Check if the buffer overflowed + if (results->overflow) { + Serial.println("IR code too long. Edit IRremoteInt.h and increase RAWLEN"); + return; + } + + // Show Encoding standard + Serial.print("Encoding : "); + encoding(results); + Serial.println(""); + + // Show Code & length + Serial.print("Code : "); + ircode(results); + Serial.print(" ("); + Serial.print(results->bits, DEC); + Serial.println(" bits)"); +} + +//+============================================================================= +// Dump out the decode_results structure. +// +void dumpRaw (decode_results *results) +{ + // Print Raw data + Serial.print("Timing["); + Serial.print(results->rawlen, DEC); + Serial.println("]: "); + Serial.print(" -"); + Serial.println(results->rawbuf[0] * USECPERTICK, DEC); + for (int i = 1; i < results->rawlen; i++) { + int x = results->rawbuf[i] * USECPERTICK; + if (!(i & 1)) { // even + Serial.print("-"); + if (x < 1000) Serial.print(" ") ; + if (x < 100) Serial.print(" ") ; + Serial.print(x, DEC); + } else { // odd + Serial.print(" "); + Serial.print("+"); + if (x < 1000) Serial.print(" ") ; + if (x < 100) Serial.print(" ") ; + Serial.print(x, DEC); + Serial.print(", "); + } + if (!(i%8)) Serial.println(""); + } + Serial.println(""); // Newline +} + +//+============================================================================= +// Dump out the decode_results structure. +// +void dumpCode (decode_results *results) +{ + // Start declaration + Serial.print("unsigned int "); // variable type + Serial.print("rawData["); // array name + Serial.print(results->rawlen + 1, DEC); // array size + Serial.print("] = {"); // Start declaration + + // Dump data + for (int i = 0; i < results->rawlen; i++) { + Serial.print(results->rawbuf[i], DEC); + Serial.print(","); + if (!(i&1)) Serial.print(" "); + } + + // End declaration + Serial.print("0};"); // Turn LED off at the end + + // Comment + Serial.print(" // "); + encoding(results); + Serial.print(" "); + ircode(results); + + // Newline + Serial.println(""); +} + +//+============================================================================= +// The repeating section of the code +// +void loop ( ) +{ + decode_results results; // Somewhere to store the results + + if (irrecv.decode(&results)) { // Grab an IR code + dumpInfo(&results); // Output the results + dumpRaw(&results); // Output the results in RAW format + dumpCode(&results); // Output the results as source code + Serial.println(""); // Blank line between entries + irrecv.resume(); // Prepare for the next value + } +} + From 593e0a3ee3c5c2e2b7c17be590b794f4002f8dd2 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sat, 20 Jun 2015 22:08:13 +0100 Subject: [PATCH 25/31] Improve documentation and fixup IRrecvDumpV2.ino --- examples/IRrecvDumpV2/IRrecvDumpV2.ino | 23 +++++++++++------------ ir_Template.cpp | 7 +++++++ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/examples/IRrecvDumpV2/IRrecvDumpV2.ino index c6f070c..c9b7ff4 100644 --- a/examples/IRrecvDumpV2/IRrecvDumpV2.ino +++ b/examples/IRrecvDumpV2/IRrecvDumpV2.ino @@ -1,8 +1,7 @@ //------------------------------------------------------------------------------ -// Include the IRremote library headers +// Include the IRremote library header // #include -#include //------------------------------------------------------------------------------ // Tell IRremote which Arduino pin is connected to the IR Receiver (TSOP4838) @@ -28,7 +27,7 @@ void ircode (decode_results *results) Serial.print(results->address, HEX); Serial.print(":"); } - + // Print Code Serial.print(results->value, HEX); } @@ -68,12 +67,12 @@ void dumpInfo (decode_results *results) Serial.println("IR code too long. Edit IRremoteInt.h and increase RAWLEN"); return; } - + // Show Encoding standard Serial.print("Encoding : "); encoding(results); Serial.println(""); - + // Show Code & length Serial.print("Code : "); ircode(results); @@ -123,25 +122,25 @@ void dumpCode (decode_results *results) Serial.print("rawData["); // array name Serial.print(results->rawlen + 1, DEC); // array size Serial.print("] = {"); // Start declaration - + // Dump data for (int i = 0; i < results->rawlen; i++) { Serial.print(results->rawbuf[i], DEC); Serial.print(","); if (!(i&1)) Serial.print(" "); } - + // End declaration Serial.print("0};"); // Turn LED off at the end - + // Comment - Serial.print(" // "); + Serial.print(" // "); encoding(results); Serial.print(" "); ircode(results); - + // Newline - Serial.println(""); + Serial.println(""); } //+============================================================================= @@ -159,4 +158,4 @@ void loop ( ) irrecv.resume(); // Prepare for the next value } } - + diff --git a/ir_Template.cpp b/ir_Template.cpp index 9aa33ae..c0f9606 100644 --- a/ir_Template.cpp +++ b/ir_Template.cpp @@ -66,6 +66,13 @@ Now you must do a few things to add it to the IRremote system: B. Save your changes and close the file +You will probably want to add your new protocol to the example sketch + +3. Open MyDocuments\Arduino\libraries\IRremote\examples\IRrecvDumpV2.ino + + A. In the encoding() function, add: + case SHUZU: Serial.print("SHUZU"); break ; + Now open the Arduino IDE, load up the rawDump.ino sketch, and run it. Hopefully it will compile and upload. If it doesn't, you've done something wrong. Check your work. From 78e9b87a3425815552e73c29133ce5296196d1cd Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sun, 21 Jun 2015 01:20:44 +0100 Subject: [PATCH 26/31] Add Denon support Improve comments Fixup DECODE_AIWA_RC_T50 Simplify template --- IRremote.h | 12 ++++ examples/IRrecvDumpV2/IRrecvDumpV2.ino | 1 + irRecv.cpp | 17 ++++- ir_Denon.cpp | 86 ++++++++++++++++++++++++++ ir_Template.cpp | 44 ++++++------- 5 files changed, 135 insertions(+), 25 deletions(-) create mode 100644 ir_Denon.cpp diff --git a/IRremote.h b/IRremote.h index 47a0e06..cb8d958 100644 --- a/IRremote.h +++ b/IRremote.h @@ -70,6 +70,9 @@ #define DECODE_SHARP 0 // NOT WRITTEN #define SEND_SHARP 1 +#define DECODE_DENON 1 +#define SEND_DENON 1 + //------------------------------------------------------------------------------ // An enumerated list of all supported formats // You do NOT need to remove entries from this list when disabling protocols! @@ -92,6 +95,7 @@ typedef MITSUBISHI, DISH, SHARP, + DENON, } decode_type_t; @@ -213,6 +217,10 @@ class IRrecv //...................................................................... # if DECODE_SHARP bool decodeSharp (decode_results *results) ; // NOT WRITTEN +# endif + //...................................................................... +# if DECODE_DENON + bool decodeDenon (decode_results *results) ; # endif } ; @@ -288,6 +296,10 @@ class IRsend # if SEND_SHARP void sendSharpRaw (unsigned long data, int nbits) ; void sendSharp (unsigned int address, unsigned int command) ; +# endif + //...................................................................... +# if SEND_DENON + void sendDenon (unsigned long data, int nbits) ; # endif } ; diff --git a/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/examples/IRrecvDumpV2/IRrecvDumpV2.ino index c9b7ff4..a610bff 100644 --- a/examples/IRrecvDumpV2/IRrecvDumpV2.ino +++ b/examples/IRrecvDumpV2/IRrecvDumpV2.ino @@ -54,6 +54,7 @@ void encoding (decode_results *results) case WHYNTER: Serial.print("WHYNTER"); break ; case AIWA_RC_T501: Serial.print("AIWA_RC_T501"); break ; case PANASONIC: Serial.print("PANASONIC"); break ; + case DENON: Serial.print("Denon"); break ; } } diff --git a/irRecv.cpp b/irRecv.cpp index 8bcb0bf..d3a7060 100644 --- a/irRecv.cpp +++ b/irRecv.cpp @@ -45,6 +45,8 @@ void IRrecv::blink13 (int blinkflag) } //+============================================================================= +// Restart the ISR state machine +// void IRrecv::resume ( ) { irparams.rcvstate = STATE_IDLE; @@ -55,6 +57,7 @@ void IRrecv::resume ( ) // Decodes the received IR message // Returns 0 if no data ready, 1 if data ready. // Results of decoding are stored in results +// int IRrecv::decode (decode_results *results) { results->rawbuf = irparams.rawbuf; @@ -119,15 +122,21 @@ int IRrecv::decode (decode_results *results) if (decodeWhynter(results)) return true ; #endif -#ifdef AIWA_RC_T501 +#ifdef DECODE_AIWA_RC_T501 DBG_PRINTLN("Attempting Aiwa RC-T501 decode"); if (decodeAiwaRCT501(results)) return true ; #endif +#ifdef DECODE_DENON + DBG_PRINTLN("Attempting Denon decode"); + if (decodeDenon(results)) return true ; +#endif + // decodeHash returns a hash on any input. // Thus, it needs to be last in the list. // If you add any decodes, add them before this. if (decodeHash(results)) return true ; + // Throw away and start over resume(); return false; @@ -140,7 +149,7 @@ int IRrecv::decode (decode_results *results) // // The algorithm: look at the sequence of MARK signals, and see if each one // is shorter (0), the same length (1), or longer (2) than the previous. -// Do the same with the SPACE signals. Hszh the resulting sequence of 0's, +// Do the same with the SPACE signals. Hash the resulting sequence of 0's, // 1's, and 2's to a 32-bit value. This will give a unique value for each // different code (probably), for most code systems. // @@ -168,9 +177,11 @@ int IRrecv::compare (unsigned int oldval, unsigned int newval) long IRrecv::decodeHash (decode_results *results) { + long hash = FNV_BASIS_32; + // Require at least 6 samples to prevent triggering on noise if (results->rawlen < 6) return false ; - long hash = FNV_BASIS_32; + for (int i = 1; (i + 2) < results->rawlen; i++) { int value = compare(results->rawbuf[i], results->rawbuf[i+2]); // Add value into the hash diff --git a/ir_Denon.cpp b/ir_Denon.cpp new file mode 100644 index 0000000..4ce6862 --- /dev/null +++ b/ir_Denon.cpp @@ -0,0 +1,86 @@ +#include "IRremote.h" +#include "IRremoteInt.h" + +// Reverse Engineerd by looking at RAW dumps generated by IRremote + +//============================================================================== +// DDDD EEEEE N N OOO N N +// D D E NN N O O NN N +// D D EEE N N N O O N N N +// D D E N NN O O N NN +// DDDD EEEEE N N OOO N N +//============================================================================== + +#define BITS 14 // The number of bits in the command + +#define HDR_MARK 300 // The length of the Header:Mark +#define HDR_SPACE 750 // The lenght of the Header:Space + +#define BIT_MARK 300 // The length of a Bit:Mark +#define ONE_SPACE 1800 // The length of a Bit:Space for 1's +#define ZERO_SPACE 750 // The length of a Bit:Space for 0's + +//+============================================================================= +// +#if SEND_DENON +void IRsend::sendDenon (unsigned long data, int nbits) +{ + // Set IR carrier frequency + enableIROut(38); + + // Header + mark (HDR_MARK); + space(HDR_SPACE); + + // Data + for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { + if (data & mask) { + mark (BIT_MARK); + space(ONE_SPACE); + } else { + mark (BIT_MARK); + space(ZERO_SPACE); + } + } + + // Footer + mark(BIT_MARK); + space(0); // Always end with the LED off +} +#endif + +//+============================================================================= +// +#if DECODE_DENON +bool IRrecv::decodeDenon (decode_results *results) +{ + unsigned long data = 0; // Somewhere to build our code + int offset = 1; // Skip the Gap reading + + // Check we have the right amount of data + if (irparams.rawlen != 1 + 2 + (2 * BITS) + 1) return false ; + + // Check initial Mark+Space match + if (!MATCH_MARK (results->rawbuf[offset++], HDR_MARK )) return false ; + if (!MATCH_SPACE(results->rawbuf[offset++], HDR_SPACE)) return false ; + + // Read the bits in + for (int i = 0; i < BITS; i++) { + // Each bit looks like: MARK + SPACE_1 -> 1 + // or : MARK + SPACE_0 -> 0 + if (!MATCH_MARK(results->rawbuf[offset++], BIT_MARK)) return false ; + + // IR data is big-endian, so we shuffle it in from the right: + if (MATCH_SPACE(results->rawbuf[offset], ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], ZERO_SPACE)) data = (data << 1) | 0 ; + else return false ; + offset++; + } + + // Success + results->bits = BITS; + results->value = data; + results->decode_type = DENON; + return true; +} +#endif diff --git a/ir_Template.cpp b/ir_Template.cpp index c0f9606..474d777 100644 --- a/ir_Template.cpp +++ b/ir_Template.cpp @@ -102,16 +102,16 @@ Regards, // //============================================================================== -#define SHUZU_BITS 32 // The number of bits in the command +#define BITS 32 // The number of bits in the command -#define SHUZU_HDR_MARK 1000 // The length of the Header:Mark -#define SHUZU_HDR_SPACE 2000 // The lenght of the Header:Space +#define HDR_MARK 1000 // The length of the Header:Mark +#define HDR_SPACE 2000 // The lenght of the Header:Space -#define SHUZU_BIT_MARK 3000 // The length of a Bit:Mark -#define SHUZU_ONE_SPACE 4000 // The length of a Bit:Space for 1's -#define SHUZU_ZERO_SPACE 5000 // The length of a Bit:Space for 0's +#define BIT_MARK 3000 // The length of a Bit:Mark +#define ONE_SPACE 4000 // The length of a Bit:Space for 1's +#define ZERO_SPACE 5000 // The length of a Bit:Space for 0's -#define SHUZU_OTHER 1234 // Other things you may need to define +#define OTHER 1234 // Other things you may need to define //+============================================================================= // @@ -122,22 +122,22 @@ void IRsend::sendShuzu (unsigned long data, int nbits) enableIROut(38); // Header - mark (SHUZU_HDR_MARK); - space(SHUZU_HDR_SPACE); + mark (HDR_MARK); + space(HDR_SPACE); // Data for (unsigned long mask = 1 << (nbits - 1); mask; mask >>= 1) { if (data & mask) { - mark (SHUZU_BIT_MARK); - space(SHUZU_ONE_SPACE); + mark (BIT_MARK); + space(ONE_SPACE); } else { - mark (SHUZU_BIT_MARK); - space(SHUZU_ZERO_SPACE); + mark (BIT_MARK); + space(ZERO_SPACE); } } // Footer - mark(SHUZU_BIT_MARK); + mark(BIT_MARK); space(0); // Always end with the LED off } #endif @@ -151,27 +151,27 @@ bool IRrecv::decodeShuzu (decode_results *results) int offset = 1; // Skip the Gap reading // Check we have the right amount of data - if (irparams.rawlen != 1 + 2 + (2 * SHUZU_BITS) + 1) return false ; + if (irparams.rawlen != 1 + 2 + (2 * BITS) + 1) return false ; // Check initial Mark+Space match - if (!MATCH_MARK (results->rawbuf[offset++], SHUZU_HDR_MARK )) return false ; - if (!MATCH_SPACE(results->rawbuf[offset++], SHUZU_HDR_SPACE)) return false ; + if (!MATCH_MARK (results->rawbuf[offset++], HDR_MARK )) return false ; + if (!MATCH_SPACE(results->rawbuf[offset++], HDR_SPACE)) return false ; // Read the bits in for (int i = 0; i < SHUZU_BITS; i++) { // Each bit looks like: MARK + SPACE_1 -> 1 // or : MARK + SPACE_0 -> 0 - if (!MATCH_MARK(results->rawbuf[offset++], SAMSUNG_BIT_MARK)) return false ; + if (!MATCH_MARK(results->rawbuf[offset++], BIT_MARK)) return false ; // IR data is big-endian, so we shuffle it in from the right: - if (MATCH_SPACE(results->rawbuf[offset], SHUZU_ONE_SPACE)) data = (data << 1) | 1 ; - else if (MATCH_SPACE(results->rawbuf[offset], SHUZU_ZERO_SPACE)) data = (data << 1) | 0 ; - else return false ; + if (MATCH_SPACE(results->rawbuf[offset], ONE_SPACE)) data = (data << 1) | 1 ; + else if (MATCH_SPACE(results->rawbuf[offset], ZERO_SPACE)) data = (data << 1) | 0 ; + else return false ; offset++; } // Success - results->bits = SHUZU_BITS; + results->bits = BITS; results->value = data; results->decode_type = SHUZU; return true; From 6a1222d180afb9386b917c111f3a816388ddfb43 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sun, 21 Jun 2015 03:11:24 +0100 Subject: [PATCH 27/31] Started work on supporting Pronto Codes --- irPronto.cpp | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 irPronto.cpp diff --git a/irPronto.cpp b/irPronto.cpp new file mode 100644 index 0000000..dacb66c --- /dev/null +++ b/irPronto.cpp @@ -0,0 +1,171 @@ +#if 0 +/* +http://www.remotecentral.com/features/irdisp2.htm + +http://www.hifi-remote.com/wiki/index.php?title=Working_With_Pronto_Hex + +The first 4 digits of the Pronto code indicate the form it is stored in. + 0000 - raw oscillated code + 0100 - raw unmodulated code + +*/ + +char code[] = +"0000 0070 0000 0032 0080 0040 0010 0010 0010 0030 " // 10 +"0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 20 +"0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 30 +"0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 " // 40 +"0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 50 +"0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 " // 60 +"0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 70 +"0010 0010 0010 0030 0010 0010 0010 0030 0010 0010 " // 80 +"0010 0010 0010 0030 0010 0010 0010 0010 0010 0030 " // 90 +"0010 0010 0010 0030 0010 0010 0010 0010 0010 0030 " // 100 +"0010 0030 0010 0aa6" // 104 + +#define DEBUGF(...) printf(__VA_ARGS__) + +//+============================================================================= +// Check for a valid hex digit +// +bool ishex (char ch) +{ + return ( ((ch >= '0') && (ch <= '9')) || + ((ch >= 'A') && (ch <= 'F')) || + ((ch >= 'a') && (ch <= 'f')) ) ? true : false ; +} + +//+============================================================================= +// Check for a valid "blank" ... '\0' is a valid "blank" +// +bool isblank (char ch) +{ + return ((ch == ' ') || (ch == '\t') || (ch == '\0')) ? true : false ; +} + +//+============================================================================= +// Bypass spaces +// +bool byp (char** pcp) +{ + while (isblank(**pcp)) *pcp++ ; +} + +//+============================================================================= +// String must be block of 4 hex digits separated with blanks +// +bool validate (char* cp, int* len) +{ + for (*len = 0; *cp; *len++, cp += 4) + byp(*cp); + if ( !ishex(cp[0]) || !ishex(cp[1]) || + !ishex(cp[2]) || !ishex(cp[3]) || !isspace(cp[4]) ) return false ; + } + + return true; +} + +//+============================================================================= +// Hex-to-Byte : Decode a hex digit +// We assume the character has already been validated +// +uint8_t htob (char cp) +{ + if ((ch >= '0') && (ch <= '9')) return ch - '0' ; + if ((ch >= 'A') && (ch <= 'F')) return ch - 'A' ; + if ((ch >= 'a') && (ch <= 'f')) return ch - 'f' ; +} + +//+============================================================================= +// Hex-to-Word : Decode a block of 4 hex digits +// We assume the string has already been validated +// and the pointer being passed points at the start of a block of 4 hex digits +// +uint16_t htow (char* cp) +{ + return ( (htob(cp[0]) << 12) | (htob(cp[1]) << 8) | + (htob(cp[2]) << 4) | (htob(cp[3]) ) ) +} + +//+============================================================================= +// +typedef + struct { + int len; + uint16_t* code; + + int freq; + int usec; + + int onceLen; + int onceSt; + + int rptLen; + int rptSt; + } +pronto_t; + +bool decodePronto (char* s, pronto_t* p) +{ + int i; + char* cp; + + // Validate the Pronto string + if (!validate(s, &p->len)) { + DEBUGF("Invalid pronto string\n"); + return false ; + } + DEBUGF("Found %d hex codes\n", p->len); + + // Allocate memory to store the decoded string + if (!(p->code = malloc(p->len))) { + DEBUGF("Memory allocation failed\n"); + return false ; + } + + // Decode the string + cp = s; + for (i = 0; i < p->len; i++) { + byp(*cp); + p->code[i] = htow(cp); + } + + // Annound our findings + DEBUGF("Input: |%s|", s); + DEBUGF("Found: |"); + for (i = 0; i < p->len; i++) DEBUGF("%04x ", p->code[i]) ; + DEBUGF("|\n"); + + DEBUGF("Form : "); + if (p->code[0] = 0x0000) DEBUGF("Oscillated (Learned)\n"); + else if (p->code[0] = 0x0100) DEBUGF("Unmodulated\n"); + else DEBUGF("Unknown\n"); + if (p->code[0] != 0x0000) return false ; // Can only handle Oscillated + + // Calculate the carrier frequency (+/i 10%) & uSecs per pulse + // Pronto uses a crystal which generates a timeabse of 0.241246 + p->freq = 1000000 / (p->code[1] * 0.241246); + p->usec = (int)(((1.0 / p->freq) * 1000000) + 0.5); + DEBUGF("Freq : %d (%suS/pluse)\n", freq, usec); + + // Get the start+length of the "once" code + p->onceSt = 4; + p->onceLen = p->code[2]; + DEBUGF("Once : %d\n", p->onceLen); + + // Get the start+length of the "repeat" code + p->rptLen = code[3]; + p->rptSt = 4 + p->onceLen; + DEBUGF("Rpt : %d\n", p->rptLen); + + // Check everything tallies + if (1 + 1 + 1 + 1 + p->onceLen + p->rptLen != p->len) { + DEBUGF("Bad code length\n"); + return false; + } + + return true; +} + + +#endif //0 \ No newline at end of file From 3dec9973919d5a55bb15c20763d80ac7db9d129a Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sun, 21 Jun 2015 18:13:21 +0100 Subject: [PATCH 28/31] Added sendPronto() --- IRremote.h | 25 ++- IRremoteInt.h | 4 +- irPronto.cpp | 550 ++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 469 insertions(+), 110 deletions(-) diff --git a/IRremote.h b/IRremote.h index cb8d958..3a64fed 100644 --- a/IRremote.h +++ b/IRremote.h @@ -3,7 +3,7 @@ // IRremote // Version 0.1 July, 2009 // Copyright 2009 Ken Shirriff -// For details, see http://arcfn.com/2009/08/multi-protocol-infrared-remote-library.htm http://arcfn.com +// For details, see http://arcfn.com/2009/08/multi-protocol-infrared-remote-library.html // Edited by Mitra to add new controller SANYO // // Interrupt code based on NECIRrcv by Joe Knapp @@ -73,6 +73,24 @@ #define DECODE_DENON 1 #define SEND_DENON 1 +#define DECODE_PRONTO 0 // This function doe not logically make sense +#define SEND_PRONTO 1 + +//------------------------------------------------------------------------------ +// When sending a Pronto code we request to send either the "once" code +// or the "repeat" code +// If the code requested does not exist we can request to fallback on the +// other code (the one we did not explicitly request) +// +// I would suggest that "fallback" will be the standard calling method +// The last paragraph on this page discusses the rationale of this idea: +// http://www.remotecentral.com/features/irdisp2.htm +// +#define PRONTO_ONCE false +#define PRONTO_REPEAT true +#define PRONTO_FALLBACK true +#define PRONTO_NOFALLBACK false + //------------------------------------------------------------------------------ // An enumerated list of all supported formats // You do NOT need to remove entries from this list when disabling protocols! @@ -96,6 +114,7 @@ typedef DISH, SHARP, DENON, + PRONTO, } decode_type_t; @@ -300,6 +319,10 @@ class IRsend //...................................................................... # if SEND_DENON void sendDenon (unsigned long data, int nbits) ; +# endif + //...................................................................... +# if SEND_Pronto + void sendPronto (char* code, bool repeat, bool fallback) ; # endif } ; diff --git a/IRremoteInt.h b/IRremoteInt.h index 486e0cf..83d0dff 100644 --- a/IRremoteInt.h +++ b/IRremoteInt.h @@ -23,7 +23,9 @@ #if defined(ARDUINO) && (ARDUINO >= 100) # include #else -# include +# if !defined(IRPRONTO) +# include +# endif #endif //------------------------------------------------------------------------------ diff --git a/irPronto.cpp b/irPronto.cpp index dacb66c..2411038 100644 --- a/irPronto.cpp +++ b/irPronto.cpp @@ -1,29 +1,16 @@ -#if 0 -/* -http://www.remotecentral.com/features/irdisp2.htm +#if SEND_PRONTO -http://www.hifi-remote.com/wiki/index.php?title=Working_With_Pronto_Hex +#define TEST 0 -The first 4 digits of the Pronto code indicate the form it is stored in. - 0000 - raw oscillated code - 0100 - raw unmodulated code - -*/ - -char code[] = -"0000 0070 0000 0032 0080 0040 0010 0010 0010 0030 " // 10 -"0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 20 -"0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 30 -"0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 " // 40 -"0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 50 -"0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 " // 60 -"0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 70 -"0010 0010 0010 0030 0010 0010 0010 0030 0010 0010 " // 80 -"0010 0010 0010 0030 0010 0010 0010 0010 0010 0030 " // 90 -"0010 0010 0010 0030 0010 0010 0010 0010 0010 0030 " // 100 -"0010 0030 0010 0aa6" // 104 - -#define DEBUGF(...) printf(__VA_ARGS__) +//****************************************************************************** +#if TEST +# include + void enableIROut (int freq) { printf("\nFreq = %d KHz\n", freq); } + void mark (int t) { printf("+%d," , t); } + void space (int t) { printf("-%d, ", t); } +#else +# include "IRremote.h" +#endif // TEST //+============================================================================= // Check for a valid hex digit @@ -48,32 +35,18 @@ bool isblank (char ch) // bool byp (char** pcp) { - while (isblank(**pcp)) *pcp++ ; -} - -//+============================================================================= -// String must be block of 4 hex digits separated with blanks -// -bool validate (char* cp, int* len) -{ - for (*len = 0; *cp; *len++, cp += 4) - byp(*cp); - if ( !ishex(cp[0]) || !ishex(cp[1]) || - !ishex(cp[2]) || !ishex(cp[3]) || !isspace(cp[4]) ) return false ; - } - - return true; + while (isblank(**pcp)) (*pcp)++ ; } //+============================================================================= // Hex-to-Byte : Decode a hex digit // We assume the character has already been validated // -uint8_t htob (char cp) +uint8_t htob (char ch) { if ((ch >= '0') && (ch <= '9')) return ch - '0' ; - if ((ch >= 'A') && (ch <= 'F')) return ch - 'A' ; - if ((ch >= 'a') && (ch <= 'f')) return ch - 'f' ; + if ((ch >= 'A') && (ch <= 'F')) return ch - 'A' + 10 ; + if ((ch >= 'a') && (ch <= 'f')) return ch - 'a' + 10 ; } //+============================================================================= @@ -84,88 +57,449 @@ uint8_t htob (char cp) uint16_t htow (char* cp) { return ( (htob(cp[0]) << 12) | (htob(cp[1]) << 8) | - (htob(cp[2]) << 4) | (htob(cp[3]) ) ) + (htob(cp[2]) << 4) | (htob(cp[3]) ) ) ; } //+============================================================================= // +bool sendPronto (char* s, bool repeat, bool fallback) +{ + int i; + int len; + int skip; + char* cp; + uint8_t freq; // Frequency in KHz + uint8_t usec; // pronto uSec/tick + uint8_t once; + uint8_t rpt; + + // Validate the string + for (cp = s; *cp; cp += 4) { + byp(&cp); + if ( !ishex(cp[0]) || !ishex(cp[1]) || + !ishex(cp[2]) || !ishex(cp[3]) || !isblank(cp[4]) ) return false ; + } + + // We will use cp to traverse the string + cp = s; + + // Check mode = Oscillated/Learned + byp(&cp); + if (htow(cp) != 0000) return false; + cp += 4; + + // Extract & set frequency + byp(&cp); + freq = (int)((1000000 / (htow(cp) * 0.241246)) / 1000); + usec = (int)(((1.0 / freq) * 1000000) + 0.5); + cp += 4; + + // Get length of "once" code + byp(&cp); + once = htow(cp); + cp += 4; + + // Get length of "repeat" code + byp(&cp); + rpt = htow(cp); + cp += 4; + + // Which code are we sending? + if (fallback) { + if (!repeat) { // requested 'once' + if (once) len = once * 2, skip = 0 ; // if once exists send it + else len = rpt * 2, skip = 0 ; // else send repeat code + } else { // requested 'repeat' + if (rpt) len = rpt * 2, skip = 0 ; // if rpt exists send it + else len = once * 2, skip = 0 ; // else send once code + } + } else { // Send what we asked for, do not fallback if the code is empty! + if (!repeat) len = once * 2, skip = 0 ; // 'once' starts at 0 + else len = rpt * 2, skip = once ; // 'repeat' starts where 'once' ends + } + + // Skip to start of code + for (i = 0; i < skip; i++, cp += 4) byp(&cp) ; + + // Send code + enableIROut(freq); + + for (i = 0; i < len; i++) { + byp(&cp); + if (i & 1) space(htow(cp) * usec); + else mark (htow(cp) * usec); + cp += 4; + } +} + +//+============================================================================= +#if TEST + +int main ( ) +{ + char prontoTest[] = + "0000 0070 0000 0032 0080 0040 0010 0010 0010 0030 " // 10 + "0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 20 + "0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 30 + "0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 " // 40 + "0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 50 + "0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 " // 60 + "0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 70 + "0010 0010 0010 0030 0010 0010 0010 0030 0010 0010 " // 80 + "0010 0010 0010 0030 0010 0010 0010 0010 0010 0030 " // 90 + "0010 0010 0010 0030 0010 0010 0010 0010 0010 0030 " // 100 + "0010 0030 0010 0aa6"; // 104 + + sendPronto(prontoTest, PRONTO_ONCE, PRONTO_FALLBACK); // once code + sendPronto(prontoTest, PRONTO_REPEAT, PRONTO_FALLBACK); // repeat code + sendPronto(prontoTest, PRONTO_ONCE, PRONTO_NOFALLBACK); // once code + sendPronto(prontoTest, PRONTO_REPEAT, PRONTO_NOFALLBACK); // repeat code + + return 0; +} + +#endif // TEST + +#endif SEND_PRONTO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#if 0 +//****************************************************************************** +// Sources: +// http://www.remotecentral.com/features/irdisp2.htm +// http://www.hifi-remote.com/wiki/index.php?title=Working_With_Pronto_Hex +//****************************************************************************** + +#include +#include + +#define IRPRONTO +#include "IRremoteInt.h" // The Arduino IRremote library defines USECPERTICK + +//------------------------------------------------------------------------------ +// Source: https://www.google.co.uk/search?q=DENON+MASTER+IR+Hex+Command+Sheet +// -> http://assets.denon.com/documentmaster/us/denon%20master%20ir%20hex.xls +// +char prontoTest[] = + "0000 0070 0000 0032 0080 0040 0010 0010 0010 0030 " // 10 + "0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 20 + "0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 30 + "0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 " // 40 + "0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 50 + "0010 0010 0010 0030 0010 0010 0010 0010 0010 0010 " // 60 + "0010 0010 0010 0010 0010 0010 0010 0010 0010 0010 " // 70 + "0010 0010 0010 0030 0010 0010 0010 0030 0010 0010 " // 80 + "0010 0010 0010 0030 0010 0010 0010 0010 0010 0030 " // 90 + "0010 0010 0010 0030 0010 0010 0010 0010 0010 0030 " // 100 + "0010 0030 0010 0aa6"; // 104 + +//------------------------------------------------------------------------------ +// This is the longest code we can support +#define CODEMAX 200 + +//------------------------------------------------------------------------------ +// This is the data we pull out of the pronto code typedef struct { - int len; - uint16_t* code; + int freq; // Carrier frequency (in Hz) + int usec; // uSec per tick (based on freq) - int freq; - int usec; + int codeLen; // Length of code + uint16_t code[CODEMAX]; // Code in hex - int onceLen; - int onceSt; + int onceLen; // Length of "once" transmit + uint16_t* once; // Pointer to start within 'code' - int rptLen; - int rptSt; + int rptLen; // Length of "repeat" transmit + uint16_t* rpt; // Pointer to start within 'code' } pronto_t; -bool decodePronto (char* s, pronto_t* p) +//------------------------------------------------------------------------------ +// From what I have seen, the only time we go over 8-bits is the 'space' +// on the end which creates the lead-out/inter-code gap. Assuming I'm right, +// we can code this up as a special case and otherwise halve the size of our +// data! +// Ignoring the first four values (the config data) and the last value +// (the lead-out), if you find a protocol that uses values greater than 00fe +// we are going to have to revisit this code! +// +// +// So, the 0th byte will be the carrier frequency in Khz (NOT Hz) +// " 1st " " " " length of the "once" code +// " 2nd " " " " length of the "repeat" code +// +// Thereafter, odd bytes will be Mark lengths as a multiple of USECPERTICK uS +// even " " " Space " " " " " " " +// +// Any occurence of "FF" in either a Mark or a Space will indicate +// "Use the 16-bit FF value" which will also be a multiple of USECPERTICK uS +// +// +// As a point of comparison, the test code (prontoTest[]) is 520 bytes +// (yes, more than 0.5KB of our Arduino's precious 32KB) ... after conversion +// to pronto hex that goes down to ((520/5)*2) = 208 bytes ... once converted to +// our format we are down to ((208/2) -1 -1 +2) = 104 bytes +// +// In fariness this is still very memory-hungry +// ...As a rough guide: +// 10 codes cost 1K of memory (this will vary depending on the protocol). +// +// So if you're building a complex remote control, you will probably need to +// keep the codes on an external memory device (not in the Arduino sketch) and +// load them as you need them. Hmmm. +// +// This dictates that "Oscillated Pronto Codes" are probably NOT the way forward +// +// For example, prontoTest[] happens to be: A 48-bit IR code in Denon format +// So we know it starts with 80/40 (Denon header) +// and ends with 10/aa6 (Denon leadout) +// and all (48) bits in between are either 10/10 (Denon 0) +// or 10/30 (Denon 1) +// So we could easily store this data in 1-byte ("Denon") +// + 1-byte (Length=48) +// + 6-bytes (IR code) +// At 8-bytes per code, we can store 128 codes in 1KB or memory - that's a lot +// better than the 2 (two) we started off with! +// +// And serendipitously, by reducing the amount of data, our program will run +// a LOT faster! +// +// Again, I repeat, even after you have spent time converting the "Oscillated +// Pronto Codes" in to IRremote format, it will be a LOT more memory-hungry +// than using sendDenon() (or whichever) ...BUT these codes are easily +// available on the internet, so we'll support them! +// +typedef + struct { + uint16_t FF; + uint8_t code[CODEMAX]; + } +irCode_t; + +//------------------------------------------------------------------------------ +#define DEBUGF(...) printf(__VA_ARGS__) + +//+============================================================================= +// String must be block of 4 hex digits separated with blanks +// +bool validate (char* cp, int* len) { - int i; - char* cp; - - // Validate the Pronto string - if (!validate(s, &p->len)) { - DEBUGF("Invalid pronto string\n"); - return false ; - } - DEBUGF("Found %d hex codes\n", p->len); - - // Allocate memory to store the decoded string - if (!(p->code = malloc(p->len))) { - DEBUGF("Memory allocation failed\n"); - return false ; - } - - // Decode the string - cp = s; - for (i = 0; i < p->len; i++) { - byp(*cp); - p->code[i] = htow(cp); - } - - // Annound our findings - DEBUGF("Input: |%s|", s); - DEBUGF("Found: |"); - for (i = 0; i < p->len; i++) DEBUGF("%04x ", p->code[i]) ; - DEBUGF("|\n"); - - DEBUGF("Form : "); - if (p->code[0] = 0x0000) DEBUGF("Oscillated (Learned)\n"); - else if (p->code[0] = 0x0100) DEBUGF("Unmodulated\n"); - else DEBUGF("Unknown\n"); - if (p->code[0] != 0x0000) return false ; // Can only handle Oscillated - - // Calculate the carrier frequency (+/i 10%) & uSecs per pulse - // Pronto uses a crystal which generates a timeabse of 0.241246 - p->freq = 1000000 / (p->code[1] * 0.241246); - p->usec = (int)(((1.0 / p->freq) * 1000000) + 0.5); - DEBUGF("Freq : %d (%suS/pluse)\n", freq, usec); - - // Get the start+length of the "once" code - p->onceSt = 4; - p->onceLen = p->code[2]; - DEBUGF("Once : %d\n", p->onceLen); - - // Get the start+length of the "repeat" code - p->rptLen = code[3]; - p->rptSt = 4 + p->onceLen; - DEBUGF("Rpt : %d\n", p->rptLen); - - // Check everything tallies - if (1 + 1 + 1 + 1 + p->onceLen + p->rptLen != p->len) { - DEBUGF("Bad code length\n"); - return false; + for (*len = 0; *cp; (*len)++, cp += 4) { + byp(&cp); + if ( !ishex(cp[0]) || !ishex(cp[1]) || + !ishex(cp[2]) || !ishex(cp[3]) || !isblank(cp[4]) ) return false ; } return true; } +//+============================================================================= +// Hex-to-Byte : Decode a hex digit +// We assume the character has already been validated +// +uint8_t htob (char ch) +{ + if ((ch >= '0') && (ch <= '9')) return ch - '0' ; + if ((ch >= 'A') && (ch <= 'F')) return ch - 'A' + 10 ; + if ((ch >= 'a') && (ch <= 'f')) return ch - 'a' + 10 ; +} -#endif //0 \ No newline at end of file +//+============================================================================= +// Hex-to-Word : Decode a block of 4 hex digits +// We assume the string has already been validated +// and the pointer being passed points at the start of a block of 4 hex digits +// +uint16_t htow (char* cp) +{ + return ( (htob(cp[0]) << 12) | (htob(cp[1]) << 8) | + (htob(cp[2]) << 4) | (htob(cp[3]) ) ) ; +} + +//+============================================================================= +// Convert the pronto string in to data +// +bool decode (char* s, pronto_t* p, irCode_t* ir) +{ + int i, len; + char* cp; + + // Validate the Pronto string + if (!validate(s, &p->codeLen)) { + DEBUGF("Invalid pronto string\n"); + return false ; + } + DEBUGF("Found %d hex codes\n", p->codeLen); + + // Allocate memory to store the decoded string + //if (!(p->code = malloc(p->len))) { + // DEBUGF("Memory allocation failed\n"); + // return false ; + //} + + // Check in case our code is too long + if (p->codeLen > CODEMAX) { + DEBUGF("Code too long, edit CODEMAX and recompile\n"); + return false ; + } + + // Decode the string + cp = s; + for (i = 0; i < p->codeLen; i++, cp += 4) { + byp(&cp); + p->code[i] = htow(cp); + } + + // Announce our findings + DEBUGF("Input: |%s|\n", s); + DEBUGF("Found: |"); + for (i = 0; i < p->codeLen; i++) DEBUGF("%04x ", p->code[i]) ; + DEBUGF("|\n"); + + DEBUGF("Form [%04X] : ", p->code[0]); + if (p->code[0] == 0x0000) DEBUGF("Oscillated (Learned)\n"); + else if (p->code[0] == 0x0100) DEBUGF("Unmodulated\n"); + else DEBUGF("Unknown\n"); + if (p->code[0] != 0x0000) return false ; // Can only handle Oscillated + + // Calculate the carrier frequency (+/- 10%) & uSecs per pulse + // Pronto uses a crystal which generates a timeabse of 0.241246 + p->freq = (int)(1000000 / (p->code[1] * 0.241246)); + p->usec = (int)(((1.0 / p->freq) * 1000000) + 0.5); + ir->code[0] = p->freq / 1000; + DEBUGF("Freq [%04X] : %d Hz (%d uS/pluse) -> %d KHz\n", + p->code[1], p->freq, p->usec, ir->code[0]); + + // Set the length & start pointer for the "once" code + p->onceLen = p->code[2]; + p->once = &p->code[4]; + ir->code[1] = p->onceLen; + DEBUGF("Once [%04X] : %d\n", p->code[2], p->onceLen); + + // Set the length & start pointer for the "repeat" code + p->rptLen = p->code[3]; + p->rpt = &p->code[4 + p->onceLen]; + ir->code[2] = p->rptLen; + DEBUGF("Rpt [%04X] : %d\n", p->code[3], p->rptLen); + + // Check everything tallies + if (1 + 1 + 1 + 1 + (p->onceLen * 2) + (p->rptLen * 2) != p->codeLen) { + DEBUGF("Bad code length\n"); + return false; + } + + // Convert the IR data to our new format + ir->FF = p->code[p->codeLen - 1]; + + len = (p->onceLen * 2) + (p->rptLen * 2); + DEBUGF("Encoded: |"); + for (i = 0; i < len; i++) { + if (p->code[i+4] == ir->FF) { + ir->code[i+3] = 0xFF; + } else if (p->code[i+4] > 0xFE) { + DEBUGF("\n%04X : Mark/Space overflow\n", p->code[i+4]); + return false; + } else { + ir->code[i+3] = (p->code[i+4] * p->usec) / USECPERTICK; + } + DEBUGF("%s%d", !i ? "" : (i&1 ? "," : ", "), ir->code[i+3]); + } + DEBUGF("|\n"); + + ir->FF = (ir->FF * p->usec) / USECPERTICK; + DEBUGF("FF -> %d\n", ir->FF); + + return true; +} + +//+============================================================================= +// +void irDump (irCode_t* ir) +{ + int i, len; + + printf("uint8_t buttonName[%d] = {", len); + + printf("%d,%d, ", (ir->FF >> 8), ir->FF & 0xFF); + printf("%d,%d,%d, ", ir->code[0], ir->code[1], ir->code[2]); + + len = (ir->code[1] * 2) + (ir->code[2] * 2); + for (i = 0; i < len; i++) { + printf("%s%d", !i ? "" : (i&1 ? "," : ", "), ir->code[i+3]); + } + + printf("};\n"); + +} + +//+============================================================================= +// +int main ( ) +{ + pronto_t pCode; + irCode_t irCode; + + decode(prontoTest, &pCode, &irCode); + + irDump(&irCode); + + return 0; +} + +#endif //0 From 2e163ae3f453aadd1c5e12b960b0e4478e5209c0 Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sun, 21 Jun 2015 18:33:47 +0100 Subject: [PATCH 29/31] Additional comments in Denon code --- ir_Denon.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ir_Denon.cpp b/ir_Denon.cpp index 4ce6862..7c9b075 100644 --- a/ir_Denon.cpp +++ b/ir_Denon.cpp @@ -1,7 +1,15 @@ #include "IRremote.h" #include "IRremoteInt.h" -// Reverse Engineerd by looking at RAW dumps generated by IRremote +// Reverse Engineered by looking at RAW dumps generated by IRremote + +// I have since discovered that Denon publish all their IR codes: +// https://www.google.co.uk/search?q=DENON+MASTER+IR+Hex+Command+Sheet +// -> http://assets.denon.com/documentmaster/us/denon%20master%20ir%20hex.xls + +// Having looked at the official Denon Pronto sheet and reverse engineered +// the timing values from it, it is obvious that Denon have a range of +// different timings and protocols ...the values here work for my AVR-3801 Amp! //============================================================================== // DDDD EEEEE N N OOO N N From 845e912e9f291dbbdfbafe0dba63154bdae931df Mon Sep 17 00:00:00 2001 From: Bluechip Date: Sun, 21 Jun 2015 18:34:40 +0100 Subject: [PATCH 30/31] Fixup test harness & frequency calculator in Pronto code --- irPronto.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/irPronto.cpp b/irPronto.cpp index 2411038..0f530a9 100644 --- a/irPronto.cpp +++ b/irPronto.cpp @@ -1,7 +1,15 @@ -#if SEND_PRONTO - #define TEST 0 +#if TEST +# define SEND_PRONTO 1 +# define PRONTO_ONCE false +# define PRONTO_REPEAT true +# define PRONTO_FALLBACK true +# define PRONTO_NOFALLBACK false +#endif + +#if SEND_PRONTO + //****************************************************************************** #if TEST # include @@ -68,7 +76,7 @@ bool sendPronto (char* s, bool repeat, bool fallback) int len; int skip; char* cp; - uint8_t freq; // Frequency in KHz + uint16_t freq; // Frequency in KHz uint8_t usec; // pronto uSec/tick uint8_t once; uint8_t rpt; @@ -90,8 +98,9 @@ bool sendPronto (char* s, bool repeat, bool fallback) // Extract & set frequency byp(&cp); - freq = (int)((1000000 / (htow(cp) * 0.241246)) / 1000); - usec = (int)(((1.0 / freq) * 1000000) + 0.5); + freq = (int)(1000000 / (htow(cp) * 0.241246)); // Rounding errors will occur, tolerance is +/- 10% + usec = (int)(((1.0 / freq) * 1000000) + 0.5); // Another rounding error, thank Cod for analogue electronics + freq /= 1000; // This will introduce a(nother) rounding error which we do not want in the usec calcualtion cp += 4; // Get length of "once" code @@ -105,7 +114,7 @@ bool sendPronto (char* s, bool repeat, bool fallback) cp += 4; // Which code are we sending? - if (fallback) { + if (fallback) { // fallback on the "other" code if "this" code is not present if (!repeat) { // requested 'once' if (once) len = once * 2, skip = 0 ; // if once exists send it else len = rpt * 2, skip = 0 ; // else send repeat code @@ -123,7 +132,6 @@ bool sendPronto (char* s, bool repeat, bool fallback) // Send code enableIROut(freq); - for (i = 0; i < len; i++) { byp(&cp); if (i & 1) space(htow(cp) * usec); @@ -160,7 +168,7 @@ int main ( ) #endif // TEST -#endif SEND_PRONTO +#endif // SEND_PRONTO From 4e5608f25f03f069847281feb1b3cf25e4ddb87b Mon Sep 17 00:00:00 2001 From: Bluechip Date: Mon, 22 Jun 2015 21:23:53 +0100 Subject: [PATCH 31/31] https://github.com/shirriff/Arduino-IRremote/issues/156 Improve output for recvDumpV2 Added my name to the contributors list (not 'cos I really care for the credit but so people know who to "blame" [non-pejorative]) Moved the decode() function to the top of the source as it is likely to be edited the most --- Contributors.md | 1 + examples/IRrecvDumpV2/IRrecvDumpV2.ino | 16 ++++ irRecv.cpp | 104 ++++++++++++------------- irSend.cpp | 2 +- 4 files changed, 70 insertions(+), 53 deletions(-) diff --git a/Contributors.md b/Contributors.md index 2bb8d9d..4a9b88d 100644 --- a/Contributors.md +++ b/Contributors.md @@ -11,6 +11,7 @@ These are the active contributors of this project that you may contact if there - [crash7](https://github.com/crash7) : Active contributor - [Neco777](https://github.com/neco777) : Active contributor - [Lauszus](https://github.com/lauszus) : Active contributor +- [csBlueChip](https://github.com/csbluechip) : Active contributor Note: This list is being updated constantly so please let [z3t0](https://github.com/z3t0) know if you have been missed. diff --git a/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/examples/IRrecvDumpV2/IRrecvDumpV2.ino index a610bff..a2add9f 100644 --- a/examples/IRrecvDumpV2/IRrecvDumpV2.ino +++ b/examples/IRrecvDumpV2/IRrecvDumpV2.ino @@ -142,6 +142,22 @@ void dumpCode (decode_results *results) // Newline Serial.println(""); + + // Now dump "known" codes + if (results->decode_type != UNKNOWN) { + + // Some protocols have an address + if (results->decode_type == PANASONIC) { + Serial.print("unsigned int addr = 0x"); + Serial.print(results->address, HEX); + Serial.println(";"); + } + + // All protocols have data + Serial.print("unsigned int data = 0x"); + Serial.print(results->value, HEX); + Serial.println(";"); + } } //+============================================================================= diff --git a/irRecv.cpp b/irRecv.cpp index d3a7060..4614020 100644 --- a/irRecv.cpp +++ b/irRecv.cpp @@ -1,58 +1,6 @@ #include "IRremote.h" #include "IRremoteInt.h" -//+============================================================================= -IRrecv::IRrecv (int recvpin) -{ - irparams.recvpin = recvpin; - irparams.blinkflag = 0; -} - -//+============================================================================= -// initialization -// -void IRrecv::enableIRIn ( ) -{ - cli(); - // setup pulse clock timer interrupt - //Prescale /8 (16M/8 = 0.5 microseconds per tick) - // Therefore, the timer interval can range from 0.5 to 128 microseconds - // depending on the reset value (255 to 0) - TIMER_CONFIG_NORMAL(); - - //Timer2 Overflow Interrupt Enable - TIMER_ENABLE_INTR; - - TIMER_RESET; - - sei(); // enable interrupts - - // initialize state machine variables - irparams.rcvstate = STATE_IDLE; - irparams.rawlen = 0; - - // set pin modes - pinMode(irparams.recvpin, INPUT); -} - -//+============================================================================= -// enable/disable blinking of pin 13 on IR processing -// -void IRrecv::blink13 (int blinkflag) -{ - irparams.blinkflag = blinkflag; - if (blinkflag) pinMode(BLINKLED, OUTPUT) ; -} - -//+============================================================================= -// Restart the ISR state machine -// -void IRrecv::resume ( ) -{ - irparams.rcvstate = STATE_IDLE; - irparams.rawlen = 0; -} - //+============================================================================= // Decodes the received IR message // Returns 0 if no data ready, 1 if data ready. @@ -142,6 +90,58 @@ int IRrecv::decode (decode_results *results) return false; } +//+============================================================================= +IRrecv::IRrecv (int recvpin) +{ + irparams.recvpin = recvpin; + irparams.blinkflag = 0; +} + +//+============================================================================= +// initialization +// +void IRrecv::enableIRIn ( ) +{ + cli(); + // Setup pulse clock timer interrupt + // Prescale /8 (16M/8 = 0.5 microseconds per tick) + // Therefore, the timer interval can range from 0.5 to 128 microseconds + // Depending on the reset value (255 to 0) + TIMER_CONFIG_NORMAL(); + + // Timer2 Overflow Interrupt Enable + TIMER_ENABLE_INTR; + + TIMER_RESET; + + sei(); // enable interrupts + + // Initialize state machine variables + irparams.rcvstate = STATE_IDLE; + irparams.rawlen = 0; + + // Set pin modes + pinMode(irparams.recvpin, INPUT); +} + +//+============================================================================= +// Enable/disable blinking of pin 13 on IR processing +// +void IRrecv::blink13 (int blinkflag) +{ + irparams.blinkflag = blinkflag; + if (blinkflag) pinMode(BLINKLED, OUTPUT) ; +} + +//+============================================================================= +// Restart the ISR state machine +// +void IRrecv::resume ( ) +{ + irparams.rcvstate = STATE_IDLE; + irparams.rawlen = 0; +} + //+============================================================================= // hashdecode - decode an arbitrary IR code. // Instead of decoding using a standard encoding scheme diff --git a/irSend.cpp b/irSend.cpp index df3b1d9..1ec97a5 100644 --- a/irSend.cpp +++ b/irSend.cpp @@ -59,7 +59,7 @@ void IRsend::enableIROut (int khz) // COM2A = 00: disconnect OC2A // COM2B = 00: disconnect OC2B; to send signal set to 10: OC2B non-inverted // WGM2 = 101: phase-correct PWM with OCRA as top - // CS2 = 000: no prescaling + // CS2 = 000: no prescaling // The top value for the timer. The modulation frequency will be SYSCLOCK / 2 / OCR2A. TIMER_CONFIG_KHZ(khz); }