Revert "Merge pull request #519 from PaulStoffregen/master"

This reverts commit 20a4d97f61, reversing
changes made to 47aadf559d.

Contributors.md

@@ -3,7 +3,6 @@ These are the active contributors of this project that you may contact if there
 
 - [z3t0](https://github.com/z3t0) : Active Contributor and currently also the main contributor.
   * Email: zetoslab@gmail.com
-  * Skype: polarised16
 - [shirriff](https://github.com/shirriff) : An amazing person who worked to create this awesome library and provide unending support
 - [AnalysIR](https:/github.com/AnalysIR): Active contributor and is amazing with providing support!
 - [Informatic](https://github.com/Informatic) : Active contributor
@@ -15,9 +14,9 @@ These are the active contributors of this project that you may contact if there
 - [csBlueChip](https://github.com/csbluechip) : Active contributor, who contributed major and vital changes to the code base.
 - [Sebazzz](https://github.com/sebazz): Contributor
 - [lumbric](https://github.com/lumbric): Contributor
-- [ElectricRCAircraftGuy](https://github.com/electricrcaircraftguy): Contributor
-- [henkel](https://github.com/henkel): Contributor
+- [ElectricRCAircraftGuy](https://github.com/electricrcaircraftguy): Active Contributor
+- [philipphenkel](https://github.com/philipphenkel): Active Contributor
 - [MCUdude](https://github.com/MCUdude): Contributor
-- [salocinx](https://github.com/salocinx): Contributor
+- [marcmerlin](https://github.com/marcmerlin): Contributor (ESP32 port)
 
 Note: This list is being updated constantly so please let [z3t0](https://github.com/z3t0) know if you have been missed.

IRremote.cpp

@@ -18,14 +18,17 @@
 // Whynter A/C ARC-110WD added by Francesco Meschia
 //******************************************************************************
 
-#include <avr/interrupt.h>
-
 // 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
 
+#ifndef IR_TIMER_USE_ESP32
+#include <avr/interrupt.h>
+#endif
+
+
 //+=============================================================================
 // The match functions were (apparently) originally MACROs to improve code speed
 //   (although this would have bloated the code) hence the names being CAPS
@@ -120,7 +123,11 @@ int  MATCH_SPACE (int measured_ticks,  int desired_us)
 // As soon as first MARK arrives:
 //   Gap width is recorded; Ready is cleared; New logging starts
 //
+#ifdef IR_TIMER_USE_ESP32
+void IRTimer()
+#else
 ISR (TIMER_INTR_NAME)
+#endif
 {
 	TIMER_RESET;
 

IRremote.h

@@ -79,9 +79,6 @@
 #define DECODE_LEGO_PF       0 // NOT WRITTEN
 #define SEND_LEGO_PF         1
 
-#define DECODE_CDTV          1
-#define SEND_CDTV            1
-
 //------------------------------------------------------------------------------
 // When sending a Pronto code we request to send either the "once" code
 //                                                   or the "repeat" code
@@ -122,7 +119,6 @@ typedef
 		DENON,
 		PRONTO,
 		LEGO_PF,
-		CDTV,
 	}
 decode_type_t;
 
@@ -251,13 +247,9 @@ class IRrecv
 #		if DECODE_DENON
 			bool  decodeDenon (decode_results *results) ;
 #		endif
-		//......................................................................
+//......................................................................
 #		if DECODE_LEGO_PF
 			bool  decodeLegoPowerFunctions (decode_results *results) ;
-#		endif
-		//......................................................................
-#		if DECODE_CDTV
-			bool  decodeCDTV	   (decode_results *results) ;
 #		endif
 } ;
 
@@ -343,13 +335,9 @@ class IRsend
 #		if SEND_PRONTO
 			void  sendPronto     (char* code,  bool repeat,  bool fallback) ;
 #		endif
-		//......................................................................
+//......................................................................
 #		if SEND_LEGO_PF
 			void  sendLegoPowerFunctions (uint16_t data, bool repeat = true) ;
-#		endif
-		//......................................................................
-#		if SEND_CDTV
-			void  sendCDTV		 (unsigned long data, int nbits) ;
 #		endif
 } ;
 

IRremoteInt.h

@@ -108,6 +108,6 @@ EXTERN  volatile irparams_t  irparams;
 #define SPACE  1
 
 // All board specific stuff has been moved to its own file, included here.
-#include "IRremoteBoardDefs.h"
+#include "boarddefs.h"
 
 #endif

ISSUE_TEMPLATE.md

@@ -14,8 +14,12 @@
 Use [a gist](gist.github.com) if the code exceeds 30 lines
 
 **checklist:**
+- [] I have **read** the README.md file thoroughly
+- [] I have searched existing issues to see if there is anything I have missed.
 - [] The latest [release](https://github.com/z3t0/Arduino-IRremote/releases/latest) is used
-- [] Any code referenced is provided
+- [] Any code referenced is provided and if over 30 lines a gist is linked INSTEAD of it being pasted in here
 - [] The title of the issue is helpful and relevant 
 
-The above is a short template allowing you to make detailed issues!
+** We will start to close issues that do not follow these guidelines as it doesn't help the contributors who spend time trying to solve issues if the community ignores guidelines!**
+
+The above is a short template allowing you to make detailed issues!

README.md

@@ -8,7 +8,7 @@ This library enables you to send and receive using infra-red signals on an Ardui
 
 Tutorials and more information will be made available on [the official homepage](http://z3t0.github.io/Arduino-IRremote/).
 
-## Version - 2.2.1
+## Version - 2.2.3
 
 ## Installation
 1. Navigate to the [Releases](https://github.com/z3t0/Arduino-IRremote/releases) page.
@@ -17,6 +17,12 @@ Tutorials and more information will be made available on [the official homepage]
 4. Move the "IRremote" folder that has been extracted to your libraries directory.
 5. Make sure to delete Arduino_Root/libraries/RobotIRremote. Where Arduino_Root refers to the install directory of Arduino. The library RobotIRremote has similar definitions to IRremote and causes errors.
 
+
+## FAQ
+- IR does not work right when I use Neopixels (aka WS2811/WS2812/WS2812B)  
+Whether you use the Adafruit Neopixel lib, or FastLED, interrupts get disabled on many lower end CPUs like the basic arduinos. In turn, this stops the IR interrupt handler from running when it needs to. There are some solutions to this on some processors, [see this page from Marc MERLIN](http://marc.merlins.org/perso/arduino/post_2017-04-03_Arduino-328P-Uno-Teensy3_1-ESP8266-ESP32-IR-and-Neopixels.html)
+
+
 ## Supported Boards
 - Arduino Uno / Mega / Leonardo / Duemilanove / Diecimila / LilyPad / Mini / Fio / Nano etc.
 - Teensy 1.0 / 1.0++ / 2.0 / 2++ / 3.0 / 3.1 / Teensy-LC; Credits: @PaulStoffregen (Teensy Team)
@@ -25,6 +31,8 @@ Tutorials and more information will be made available on [the official homepage]
 - ATmega8535, 16, 32, 164, 324, 644, 1284,
 - ATmega64, 128
 - ATtiny 84 / 85
+- ESP32 (receive only)
+- ESP8266 is supported in a fork based on an old codebase that isn't as recent, but it works reasonably well given that perfectly timed sub millisecond interrupts are different on that chip. See https://github.com/markszabo/IRremoteESP8266
 
 We are open to suggestions for adding support to new boards, however we highly recommend you contact your supplier first and ask them to provide support from their side.
 
@@ -35,19 +43,26 @@ We are open to suggestions for adding support to new boards, however we highly r
 | [ATtiny84](https://github.com/SpenceKonde/ATTinyCore)                    | **6**               | **1**             |
 | [ATtiny85](https://github.com/SpenceKonde/ATTinyCore)                    | **1**               | **TINY0**         |
 | [ATmega8](https://github.com/MCUdude/MiniCore)                           | **9**               | **1**             |
-| Atmega32u4                                                               | 5, 9, **13**        | 1, 3, **4**       |
+| Atmega32u4                                                               | 5, **9**, 13        | 1, 3, **4**       |
 | [ATmega48, ATmega88, ATmega168, ATmega328](https://github.com/MCUdude/MiniCore) | **3**, 9     | 1, **2**          |
 | [ATmega1284](https://github.com/MCUdude/MightyCore)                      | 13, 14, 6           | 1, **2**, 3       |
 | [ATmega164, ATmega324, ATmega644](https://github.com/MCUdude/MightyCore) | 13, **14**          | 1, **2**          |
 | [ATmega8535 ATmega16, ATmega32](https://github.com/MCUdude/MightyCore)   | **13**              | **1**             |
 | [ATmega64, ATmega128](https://github.com/MCUdude/MegaCore)               | **13**              | **1**             |
 | ATmega1280, ATmega2560                                                   | 5, 6, **9**, 11, 46 | 1, **2**, 3, 4, 5 |
+| [ESP32](http://esp32.net/)                                               | N/A (not supported) | **1**             |
 | [Teensy 1.0](https://www.pjrc.com/teensy/)                               | **17**              | **1**             |
 | [Teensy 2.0](https://www.pjrc.com/teensy/)                               | 9, **10**, 14       | 1, 3, **4_HS**    |
 | [Teensy++ 1.0 / 2.0](https://www.pjrc.com/teensy/)                       | **1**, 16, 25       | 1, **2**, 3       |
 | [Teensy 3.0 / 3.1](https://www.pjrc.com/teensy/)                         | **5**               | **CMT**           |
 | [Teensy-LC](https://www.pjrc.com/teensy/)                                | **16**              | **TPM1**          |
 
+
+### Experimental patches
+The following are strictly community supported patches that have yet to make it into mainstream. If you have issues feel free to ask here. If it works well then let us know!
+
+[Arduino 101](https://github.com/z3t0/Arduino-IRremote/pull/481#issuecomment-311243146)
+
 The table above lists the currently supported timers and corresponding send pins, many of these can have additional pins opened up and we are open to requests if a need arises for other pins.
 
 ## Usage
@@ -65,7 +80,7 @@ Check [here](Contributing.md) for some guidelines.
 
 ## Contact
 Email: zetoslab@gmail.com
-Please only email me if it is more appropriate than creating an Issue / PR. I **will** not respond to requests for adding support for particular boards, unless of course you are the creator of the board and would like to cooperate on the project. I will also **ignore** any emails asking me to tell you how to implement your ideas. However, if you have a private inquiry that you would only apply to you and you would prefer it to be via email, by all means. 
+Please only email me if it is more appropriate than creating an Issue / PR. I **will** not respond to requests for adding support for particular boards, unless of course you are the creator of the board and would like to cooperate on the project. I will also **ignore** any emails asking me to tell you how to implement your ideas. However, if you have a private inquiry that you would only apply to you and you would prefer it to be via email, by all means.
 
 ## Contributors
 Check [here](Contributors.md)

boarddefs.h

@@ -17,8 +17,8 @@
 // Whynter A/C ARC-110WD added by Francesco Meschia
 //******************************************************************************
 
-#ifndef IRremoteBoardDefs_h
-#define IRremoteBoardDefs_h
+#ifndef boarddefs_h
+#define boarddefs_h
 
 //------------------------------------------------------------------------------
 // Defines for blinking the LED
@@ -39,9 +39,14 @@
 #	define BLINKLED_ON()   (PORTD |= B00000001)
 #	define BLINKLED_OFF()  (PORTD &= B11111110)
 
+// No system LED on ESP32, disable blinking
+#elif defined(ESP32)
+#	define BLINKLED        255
+#	define BLINKLED_ON()   1
+#	define BLINKLED_OFF()  1
 #else
 #	define BLINKLED        13
-	#define BLINKLED_ON()  (PORTB |= B00100000)
+#	define BLINKLED_ON()  (PORTB |= B00100000)
 #	define BLINKLED_OFF()  (PORTB &= B11011111)
 #endif
 
@@ -80,8 +85,8 @@
 // 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_TIMER3   // tx = pin 9
+	//#define IR_USE_TIMER4_HS  // tx = pin 10
 
 // Teensy 3.0 / Teensy 3.1
 #elif defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
@@ -125,15 +130,17 @@
 
 // ATtiny84
 #elif defined(__AVR_ATtiny84__)
-  #define IR_USE_TIMER1     // tx = pin 6
+	#define IR_USE_TIMER1     // tx = pin 6
 
 //ATtiny85
 #elif defined(__AVR_ATtiny85__)
-  #define IR_USE_TIMER_TINY0   // tx = pin 1
+	#define IR_USE_TIMER_TINY0   // tx = pin 1
 
+#elif defined(ESP32)
+	#define IR_TIMER_USE_ESP32
+#else
 // Arduino Duemilanove, Diecimila, LilyPad, Mini, Fio, Nano, etc
 // ATmega48, ATmega88, ATmega168, ATmega328
-#else
 	//#define IR_USE_TIMER1   // tx = pin 9
 	#define IR_USE_TIMER2     // tx = pin 3
 
@@ -538,6 +545,28 @@
 
 #define TIMER_PWM_PIN        1  /* ATtiny85 */
 
+//---------------------------------------------------------
+// ESP32 (ESP8266 should likely be added here too)
+//
+
+// ESP32 has it own timer API and does not use these macros, but to avoid ifdef'ing
+// them out in the common code, they are defined to no-op. This allows the code to compile
+// (which it wouldn't otherwise) but irsend will not work until ESP32 specific code is written
+// for that -- merlin
+// As a warning, sending timing specific code from an ESP32 can be challenging if you need 100%
+// reliability because the arduino code may be interrupted and cause your sent waveform to be the
+// wrong length. This is specifically an issue for neopixels which require 800Khz resolution.
+// IR may just work as is with the common code since it's lower frequency, but if not, the other
+// way to do this on ESP32 is using the RMT built in driver like in this incomplete library below
+// https://github.com/ExploreEmbedded/ESP32_RMT
+#elif defined(IR_TIMER_USE_ESP32)
+#define TIMER_RESET	     
+#define TIMER_ENABLE_PWM     
+#define TIMER_DISABLE_PWM   Serial.println("IRsend not implemented for ESP32 yet");
+#define TIMER_ENABLE_INTR    
+#define TIMER_DISABLE_INTR   
+#define TIMER_INTR_NAME      
+
 //---------------------------------------------------------
 // Unknown Timer
 //
@@ -545,4 +574,4 @@
 #	error "Internal code configuration error, no known IR_USE_TIMER# defined\n"
 #endif
 
-#endif // ! IRremoteBoardDefs_h
+#endif // ! boarddefs_h

changelog.md

@@ -1,8 +1,16 @@
-## 2.3.0 - 2017/02/06
-- Added Commodore Amiga CDTV Support [ISSUE #407](https://github.com/z3t0/Arduino-IRremote/issues/407) [PR #413](https://github.com/z3t0/Arduino-IRremote/pull/413)
+## 3.0.0 - 2017/09/14
+- Changed default send pin on ATmega32u4 from 13 to 9.
+	Note: this is a non-backwards compatible change as the behaviour of existing programs using this board for receiving WILL be affected. If you would like to use pin 13 as before then please search src/boarddefs.h for "32u4" and comment the line for pin 9 while uncommenting the line for pin 13
+
+
+
+## 2.3.3 - 2017/03/31
+- Added ESP32 IR receive support [PR #427](https://github.com/z3t0/Arduino-IRremote/pull/425)
+
+## 2.2.3 - 2017/03/27
+- Fix calculation of pause length in LEGO PF protocol [PR #427](https://github.com/z3t0/Arduino-IRremote/pull/427)
 
 ## 2.2.2 - 2017/01/20
-- Renamed "boarddefs.h" [ISSUE #375](https://github.com/z3t0/Arduino-IRremote/issues/375)
 - Fixed naming bug [PR #398](https://github.com/z3t0/Arduino-IRremote/pull/398)
 
 ## 2.2.1 - 2016/07/27

examples/IRrecvDemo/IRrecvDemo.ino

@@ -17,7 +17,11 @@ decode_results results;
 void setup()
 {
   Serial.begin(9600);
+  // In case the interrupt driver crashes on setup, give a clue
+  // to the user what's going on.
+  Serial.println("Enabling IRin");
   irrecv.enableIRIn(); // Start the receiver
+  Serial.println("Enabled IRin");
 }
 
 void loop() {

examples/IRrecvDump/IRrecvDump.ino

@@ -15,7 +15,7 @@
 *  You can change this to another available Arduino Pin.
 *  Your IR receiver should be connected to the pin defined here
 */
-int RECV_PIN = 11; 
+int RECV_PIN = 11;
 
 IRrecv irrecv(RECV_PIN);
 

examples/LegoPowerFunctionsTests/LegoPowerFunctionsTests.ino

@@ -1,6 +1,6 @@
 /*
  * LegoPowerFunctionsTest: LEGO Power Functions Tests
- * Copyright (c) 2016 Philipp Henkel
+ * Copyright (c) 2016, 2017 Philipp Henkel
  */
 
 #include <ir_Lego_PF_BitStreamEncoder.h>
@@ -78,14 +78,14 @@ void testMessageBitCount(LegoPfBitStreamEncoder& bitStreamEncoder) {
   logTestResult(bitCount == 18);
 }
 
-boolean check(LegoPfBitStreamEncoder& bitStreamEncoder, int markDuration, int pauseDuration) {
+boolean check(LegoPfBitStreamEncoder& bitStreamEncoder, unsigned long markDuration, unsigned long pauseDuration) {
   bool result = true;
   result = result && bitStreamEncoder.getMarkDuration() == markDuration;
   result = result && bitStreamEncoder.getPauseDuration() == pauseDuration;
   return result;
 }
 
-boolean checkNext(LegoPfBitStreamEncoder& bitStreamEncoder, int markDuration, int pauseDuration) {
+boolean checkNext(LegoPfBitStreamEncoder& bitStreamEncoder, unsigned long markDuration, unsigned long pauseDuration) {
   bool result = bitStreamEncoder.next();
   result = result && check(bitStreamEncoder, markDuration, pauseDuration);
   return result;
@@ -129,16 +129,16 @@ void testMessage407Repeated(LegoPfBitStreamEncoder& bitStreamEncoder) {
   bool result = true;
   result = result && check(bitStreamEncoder, 158, 1026);
   result = result && checkDataBitsOfMessage407(bitStreamEncoder);
-  result = result && checkNext(bitStreamEncoder, 158, 1026 + 5 * 16000 - 10844);
+  result = result && checkNext(bitStreamEncoder, 158, 1026L + 5L * 16000L - 10844L);
   result = result && checkNext(bitStreamEncoder, 158, 1026);
   result = result && checkDataBitsOfMessage407(bitStreamEncoder);
-  result = result && checkNext(bitStreamEncoder, 158, 1026 + 5 * 16000 - 10844);
+  result = result && checkNext(bitStreamEncoder, 158, 1026L + 5L * 16000L - 10844L);
   result = result && checkNext(bitStreamEncoder, 158, 1026);
   result = result && checkDataBitsOfMessage407(bitStreamEncoder);
-  result = result && checkNext(bitStreamEncoder, 158, 1026 + 8 * 16000 - 10844);
+  result = result && checkNext(bitStreamEncoder, 158, 1026L + 8L * 16000L - 10844L);
   result = result && checkNext(bitStreamEncoder, 158, 1026);
   result = result && checkDataBitsOfMessage407(bitStreamEncoder);
-  result = result && checkNext(bitStreamEncoder, 158, 1026 + 8 * 16000 - 10844);
+  result = result && checkNext(bitStreamEncoder, 158, 1026L + 8L * 16000L - 10844L);
   result = result && checkNext(bitStreamEncoder, 158, 1026);
   result = result && checkDataBitsOfMessage407(bitStreamEncoder);
   result = result && checkNext(bitStreamEncoder, 158, 1026);
@@ -191,7 +191,3 @@ void testGetMessageLengthAllLow(LegoPfBitStreamEncoder& bitStreamEncoder) {
   bitStreamEncoder.reset(0x0, false);
   logTestResult(bitStreamEncoder.getMessageLength() == 9104);
 }
-
-
-
-

irRecv.cpp

@@ -1,5 +1,10 @@
 #include "IRremote.h"
 #include "IRremoteInt.h"
+
+#ifdef IR_TIMER_USE_ESP32
+hw_timer_t *timer;
+void IRTimer(); // defined in IRremote.cpp
+#endif
 
 //+=============================================================================
 // Decodes the received IR message
@@ -84,11 +89,6 @@ int  IRrecv::decode (decode_results *results)
 	DBG_PRINTLN("Attempting Lego Power Functions");
 	if (decodeLegoPowerFunctions(results))  return true ;
 #endif
-	
-#if DECODE_CDTV
-	DBG_PRINTLN("Attempting Commodore Amiga CDTV decode");
-	if (decodeCDTV(results))  return true;
-#endif
 
 	// decodeHash returns a hash on any input.
 	// Thus, it needs to be last in the list.
@@ -122,6 +122,17 @@ IRrecv::IRrecv (int recvpin, int blinkpin)
 //
 void  IRrecv::enableIRIn ( )
 {
+// Interrupt Service Routine - Fires every 50uS
+#ifdef ESP32
+	// ESP32 has a proper API to setup timers, no weird chip macros needed
+	// simply call the readable API versions :)
+	// 3 timers, choose #1, 80 divider nanosecond precision, 1 to count up
+	timer = timerBegin(1, 80, 1);
+	timerAttachInterrupt(timer, &IRTimer, 1);
+	// every 50ns, autoreload = true
+	timerAlarmWrite(timer, 50, true);
+	timerAlarmEnable(timer);
+#else
 	cli();
 	// Setup pulse clock timer interrupt
 	// Prescale /8 (16M/8 = 0.5 microseconds per tick)
@@ -135,6 +146,7 @@ void  IRrecv::enableIRIn ( )
 	TIMER_RESET;
 
 	sei();  // enable interrupts
+#endif
 
 	// Initialize state machine variables
 	irparams.rcvstate = STATE_IDLE;

irSend.cpp

@@ -54,6 +54,8 @@ void  IRsend::space (unsigned int time)
 //
 void  IRsend::enableIROut (int khz)
 {
+// FIXME: implement ESP32 support, see IR_TIMER_USE_ESP32 in boarddefs.h
+#ifndef ESP32
 	// Disable the Timer2 Interrupt (which is used for receiving IR)
 	TIMER_DISABLE_INTR; //Timer2 Overflow Interrupt
 
@@ -66,6 +68,7 @@ void  IRsend::enableIROut (int khz)
 	// CS2  = 000: no prescaling
 	// The top value for the timer.  The modulation frequency will be SYSCLOCK / 2 / OCR2A.
 	TIMER_CONFIG_KHZ(khz);
+#endif
 }
 
 //+=============================================================================

ir_CDTV.cpp

@@ -1,148 +0,0 @@
-#include "IRremote.h"
-#include "IRremoteInt.h"
-
-//==============================================================================
-//                            COMMODORE AMIGA CD-TV
-//==============================================================================
-
-//==============================================================================
-//                           CCCC  DDDD   TTTTT V       V
-//                          C      D   D    T    V     V
-//                          C      D   D    T     V   V
-//                          C      D   D    T      V V
-//                           CCCC  DDDD     T       V
-//==============================================================================
-
-//==============================================================================
-//                                 MEASUREMENTS
-//==============================================================================
-
-/*Encoding: UNKNOWN
-	Code : 72A03D6B(32 bits)
-	Timing[51] :
-	+8900, -4450 + 400, -1200 + 350, -400 + 400, -400
-	+ 400, -400 + 400, -1200 + 400, -400 + 350, -450
-	+ 350, -400 + 400, -400 + 400, -350 + 450, -400
-	+ 350, -450 + 350, -400 + 400, -1200 + 400, -1200
-	+ 350, -1200 + 400, -450 + 350, -1200 + 400, -1200
-	+ 350, -1200 + 400, -1200 + 350, -1250 + 350, -1200
-	+ 400, -1200 + 350
-	unsigned int rawData[51] = { 8900,4450, 400,1200, 350,400, 400,400, 400,400, 400,1200, 400,400, 350,450, 350,400, 400,400, 400,350, 450,400, 350,450, 350,400, 400,1200, 400,1200, 350,1200, 400,450, 350,1200, 400,1200, 350,1200, 400,1200, 350,1250, 350,1200, 400,1200, 350 }; // UNKNOWN 72A03D6B
-*/
-
-// NOTE: The array dump above begins at index = 1; therefore offset = 1 in the code below
-
-//==============================================================================
-
-#define CDTV_BITS          24
-// timing intervals in usec
-#define CDTV_HDR_MARK    8850			// start burst
-#define CDTV_HDR_SPACE   4450			// pause after start
-#define CDTV_BIT_MARK     350			// pulse
-#define CDTV_ONE_SPACE   1250			// receive a '1'
-#define CDTV_ZERO_SPACE   450			// receive a '0'
-#define CDTV_RPT_SPACE   2250			// repeat signal
-// message sizes measured in raw pulses
-#define CDTV_RAW_REPEAT_LENGTH	   4    // CDTV_HDR_MARK + CDTV_HDR_SPACE + CDTV_BIT_MARK
-#define CDTV_RAW_SIGNAL_LENGTH	   52   // CDTV_HDR_MARK + CDTV_HDR_SPACE + CDTV_BITS * (CDTV_BIT_MARK + CDTV_ZERO_SPACE | CDTV_ONE_SPACE)
-
-//+=============================================================================
-#if SEND_CDTV
-void  IRsend::sendCDTV(unsigned long data, int nbits) {
-
-	// set IR carrier frequency
-	enableIROut(40);
-
-	// send header
-	mark(CDTV_HDR_MARK);
-	space(CDTV_HDR_SPACE);
-
-	// send data
-	for (unsigned long mask = 1UL << (nbits - 1); mask; mask >>= 1) {
-		if (data & mask) {
-			mark(CDTV_BIT_MARK);
-			space(CDTV_ONE_SPACE);
-		} else {
-			mark(CDTV_BIT_MARK);
-			space(CDTV_ZERO_SPACE);
-		}
-	}
-
-	// send footer
-	mark(CDTV_BIT_MARK);
-	// always end with the LED off
-	space(0);
-
-}
-#endif
-
-//+=============================================================================
-// CDTV have a repeat signal that is 4-bits long [#FFFFFF]
-//
-#if DECODE_CDTV
-bool  IRrecv::decodeCDTV(decode_results *results) {
-
-	unsigned long  data   = 0;    // we decode into this field; start with empty placeholder
-	int            offset = 1;	  // skip first entry since it has not a lot of meaning
-
-	// check if header mark is within range
-	if (!MATCH_MARK(results->rawbuf[offset], CDTV_HDR_MARK)) {
-		return false;
-	}
-	offset++;	// -> offset[2]
-
-	// check for 4-bit repeat signal
-	if ((irparams.rawlen == CDTV_RAW_REPEAT_LENGTH)
-		&& MATCH_SPACE(results->rawbuf[offset], CDTV_RPT_SPACE)
-		&& MATCH_MARK(results->rawbuf[offset+1], CDTV_BIT_MARK)) {
-		results->bits = 4;
-		results->value = 0xFFFFFF;
-		results->decode_type = CDTV;
-		return true;
-	}
-
-	// check on minimal raw length for decoding the 24-bit signal correctly
-	if (irparams.rawlen < CDTV_RAW_SIGNAL_LENGTH) {
-		return false;
-	}
-
-	// check header space
-	if (!MATCH_SPACE(results->rawbuf[offset], CDTV_HDR_SPACE)) {
-		return false;
-	}
-	offset++;	// -> offset[3]
-
-	// build the data
-	for (int i = 0; i < CDTV_BITS; i++) {
-		// check if data mark is available; otherwise break
-		if (!MATCH_MARK(results->rawbuf[offset], CDTV_BIT_MARK)) {
-			return false;
-		}
-		offset++;    // -> offset[4->28]
-		// append this bit
-		if (MATCH_SPACE(results->rawbuf[offset], CDTV_ONE_SPACE)) {
-			data = (data << 1) | 1;
-		} else if (MATCH_SPACE(results->rawbuf[offset], CDTV_ZERO_SPACE)) {
-			data = (data << 1) | 0;
-		} else {
-			return false;
-		}
-		offset++;
-	}
-
-	// validate checksum by comparing lower 12-bits with inverted higher 12-bits
-	unsigned long lo = data & 0xFFF;		// extract lower 12-bit
-	unsigned long hi = data >> 12;			// extract higher 12-bit
-
-	// success if (low XOR high == 0xFFF)
-	if (lo^hi == 0xFFF) {
-		results->bits = CDTV_BITS;
-		results->value = data;
-		results->decode_type = CDTV;
-		return true;
-	}
-
-	return false;
-
-}
-#endif

ir_Lego_PF_BitStreamEncoder.h

@@ -4,7 +4,7 @@
 //    L       E       E       O    O
 //    L       EEEE    E  EEE  O    O
 //    L       E       E    E  O    O    LEGO Power Functions
-//    LLLLLL  EEEEEE   EEEE    OOOO     Copyright (c) 2016 Philipp Henkel
+//    LLLLLL  EEEEEE   EEEE    OOOO     Copyright (c) 2016, 2017 Philipp Henkel
 //==============================================================================
 
 //+=============================================================================
@@ -14,25 +14,25 @@ class LegoPfBitStreamEncoder {
  private:
   uint16_t data;
   bool repeatMessage;
-  int messageBitIdx;
-  int repeatCount;
-  int messageLength;
-
-  // HIGH data bit = IR mark + high pause
-  // LOW data bit = IR mark + low pause
-  static const int LOW_BIT_DURATION = 421;
-  static const int HIGH_BIT_DURATION = 711;
-  static const int START_BIT_DURATION = 1184;
-  static const int STOP_BIT_DURATION = 1184;
-  static const int IR_MARK_DURATION = 158;
-  static const int HIGH_PAUSE_DURATION = HIGH_BIT_DURATION - IR_MARK_DURATION;
-  static const int LOW_PAUSE_DURATION = LOW_BIT_DURATION - IR_MARK_DURATION;
-  static const int START_PAUSE_DURATION = START_BIT_DURATION - IR_MARK_DURATION;
-  static const int STOP_PAUSE_DURATION = STOP_BIT_DURATION - IR_MARK_DURATION;
-  static const int MESSAGE_BITS = 18;
-  static const int MAX_MESSAGE_LENGTH = 16000;
+  uint8_t messageBitIdx;
+  uint8_t repeatCount;
+  uint16_t messageLength;
 
  public:
+  // HIGH data bit = IR mark + high pause
+  // LOW data bit = IR mark + low pause
+  static const uint16_t LOW_BIT_DURATION = 421;
+  static const uint16_t HIGH_BIT_DURATION = 711;
+  static const uint16_t START_BIT_DURATION = 1184;
+  static const uint16_t STOP_BIT_DURATION = 1184;
+  static const uint8_t IR_MARK_DURATION = 158;
+  static const uint16_t HIGH_PAUSE_DURATION = HIGH_BIT_DURATION - IR_MARK_DURATION;
+  static const uint16_t LOW_PAUSE_DURATION = LOW_BIT_DURATION - IR_MARK_DURATION;
+  static const uint16_t START_PAUSE_DURATION = START_BIT_DURATION - IR_MARK_DURATION;
+  static const uint16_t STOP_PAUSE_DURATION = STOP_BIT_DURATION - IR_MARK_DURATION;
+  static const uint8_t MESSAGE_BITS = 18;
+  static const uint16_t MAX_MESSAGE_LENGTH = 16000;
+
   void reset(uint16_t data, bool repeatMessage) {
     this->data = data;
     this->repeatMessage = repeatMessage;
@@ -43,9 +43,9 @@ class LegoPfBitStreamEncoder {
 
   int getChannelId() const { return 1 + ((data >> 12) & 0x3); }
 
-  int getMessageLength() const {
+  uint16_t getMessageLength() const {
     // Sum up all marks
-    int length = MESSAGE_BITS * IR_MARK_DURATION;
+    uint16_t length = MESSAGE_BITS * IR_MARK_DURATION;
 
     // Sum up all pauses
     length += START_PAUSE_DURATION;
@@ -75,9 +75,9 @@ class LegoPfBitStreamEncoder {
     }
   }
 
-  int getMarkDuration() const { return IR_MARK_DURATION; }
+  uint8_t getMarkDuration() const { return IR_MARK_DURATION; }
 
-  int getPauseDuration() const {
+  uint32_t getPauseDuration() const {
     if (messageBitIdx == 0)
       return START_PAUSE_DURATION;
     else if (messageBitIdx < MESSAGE_BITS - 1) {
@@ -88,13 +88,13 @@ class LegoPfBitStreamEncoder {
   }
 
  private:
-  int getDataBitPause() const {
+  uint16_t getDataBitPause() const {
     const int pos = MESSAGE_BITS - 2 - messageBitIdx;
     const bool isHigh = data & (1 << pos);
     return isHigh ? HIGH_PAUSE_DURATION : LOW_PAUSE_DURATION;
   }
 
-  int getStopPause() const {
+  uint32_t getStopPause() const {
     if (repeatMessage) {
       return getRepeatStopPause();
     } else {
@@ -102,12 +102,12 @@ class LegoPfBitStreamEncoder {
     }
   }
 
-  int getRepeatStopPause() const {
+  uint32_t getRepeatStopPause() const {
     if (repeatCount == 0 || repeatCount == 1) {
-      return STOP_PAUSE_DURATION + 5 * MAX_MESSAGE_LENGTH - messageLength;
+      return STOP_PAUSE_DURATION + (uint32_t)5 * MAX_MESSAGE_LENGTH - messageLength;
     } else if (repeatCount == 2 || repeatCount == 3) {
       return STOP_PAUSE_DURATION
-             + (6 + 2 * getChannelId()) * MAX_MESSAGE_LENGTH - messageLength;
+             + (uint32_t)(6 + 2 * getChannelId()) * MAX_MESSAGE_LENGTH - messageLength;
     } else {
       return STOP_PAUSE_DURATION;
     }

library.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/z3t0/Arduino-IRremote.git"
   },
-  "version": "2.2.1",
+  "version": "2.3.3",
   "frameworks": "arduino",
   "platforms": "atmelavr",
   "authors" :

library.properties

@@ -1,5 +1,5 @@
 name=IRremote
-version=2.2.1
+version=2.2.3
 author=shirriff
 maintainer=shirriff
 sentence=Send and receive infrared signals with multiple protocols