Added missing #endif

Updated irRecv.h to include Nerf LOP
Updated IRremote.h to include NERF LOP
2026-01-08 06:02:49 +00:00 · 2018-12-27 20:03:12 +01:00 · 2018-12-27 17:05:33 +01:00 · 2018-12-27 17:03:36 +01:00 · 2018-12-27 16:59:26 +01:00 · 2018-03-12 17:17:02 -04:00
22 changed files with 916 additions and 581 deletions
--- a/Contributors.md
+++ b/Contributors.md
@@ -3,8 +3,8 @@ 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
 - [fmeschia](https://github.com/fmeschia) : Active contributor
 - [PaulStoffregen](https://github.com/paulstroffregen) : Active contributor
@@ -15,7 +15,8 @@ These are the active contributors of this project that you may contact if there
 - [Sebazzz](https://github.com/sebazz): Contributor
 - [lumbric](https://github.com/lumbric): Contributor
 - [ElectricRCAircraftGuy](https://github.com/electricrcaircraftguy): Active Contributor
- [henkel](https://github.com/henkel): Contributor
+- [philipphenkel](https://github.com/philipphenkel): Active Contributor
 - [MCUdude](https://github.com/MCUdude): 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.
--- a/IRremote.cpp
+++ b/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;

--- a/IRremote.h
+++ b/IRremote.h
@@ -79,6 +79,9 @@
 #define DECODE_LEGO_PF       0 // NOT WRITTEN
 #define SEND_LEGO_PF         1

+#define DECODE_NERF_LOP      0 // NOT WRITTEN
+#define SEND_NERF_LOP        1
+
 //------------------------------------------------------------------------------
 // When sending a Pronto code we request to send either the "once" code
 //                                                   or the "repeat" code
@@ -119,6 +122,7 @@ typedef
 		DENON,
 		PRONTO,
 		LEGO_PF,
+	        NERF_LOP,
 	}
 decode_type_t;

@@ -251,6 +255,10 @@ class IRrecv
 #		if DECODE_LEGO_PF
 			bool  decodeLegoPowerFunctions (decode_results *results) ;
 #		endif
+//......................................................................
+#		if DECODE_NERF_LOP
+			bool  decodeNerfLOP (decode_results *results) ;
+#               endif
 } ;

 //------------------------------------------------------------------------------
@@ -339,6 +347,10 @@ class IRsend
 #		if SEND_LEGO_PF
 			void  sendLegoPowerFunctions (uint16_t data, bool repeat = true) ;
 #		endif
+//......................................................................
+#		if SEND_NERF_LOP
+			void  sendNerfLOP (uint16_t data, bool repeat = true) ;
+#               endif
 } ;

 #endif
--- a/IRremoteInt.h
+++ b/IRremoteInt.h
@@ -68,40 +68,6 @@ irparams_t;
 // 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
-#	define BLINKLED        13
-	#define BLINKLED_ON()  (PORTB |= B00100000)
-#	define BLINKLED_OFF()  (PORTB &= B11011111)
-#endif
-
-//------------------------------------------------------------------------------
-// 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
 //
@@ -123,9 +89,6 @@ EXTERN  volatile irparams_t  irparams;
 //                                   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.))
@@ -144,491 +107,7 @@ EXTERN  volatile irparams_t  irparams;
 #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.
-//
-
-// 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
-
-// Teensy 1.0
-#elif defined(__AVR_AT90USB162__)
-	#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
-
-// Teensy 3.0 / Teensy 3.1
-#elif defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
-	#define IR_USE_TIMER_CMT  // tx = pin 5
-
-// Teensy-LC
-#elif defined(__MKL26Z64__)
-  #define IR_USE_TIMER_TPM1 // tx = pin 16
-
-// 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
-
-// MightyCore - ATmega1284
-#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)
-	//#define IR_USE_TIMER1   // tx = pin 13
-	#define IR_USE_TIMER2     // tx = pin 14
-	//#define IR_USE_TIMER3   // tx = pin 6
-
-// MightyCore - ATmega164, ATmega324, ATmega644
-#elif defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) \
-|| defined(__AVR_ATmega324P__) || defined(__AVR_ATmega324A__) \
-|| defined(__AVR_ATmega324PA__) || defined(__AVR_ATmega164A__) \
-|| defined(__AVR_ATmega164P__)
-	//#define IR_USE_TIMER1   // tx = pin 13
-	#define IR_USE_TIMER2     // tx = pin 14
-	
-//MegaCore - ATmega64, ATmega128
-#elif defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__)
- 	#define IR_USE_TIMER1     // tx = pin 13
-
-// MightyCore - ATmega8535, ATmega16, ATmega32
-#elif defined(__AVR_ATmega8535__) || defined(__AVR_ATmega16__) || defined(__AVR_ATmega32__)
- 	#define IR_USE_TIMER1     // tx = pin 13
-
-// Atmega8
-#elif defined(__AVR_ATmega8__)
-	#define IR_USE_TIMER1     // tx = pin 9
-
-// ATtiny84
-#elif defined(__AVR_ATtiny84__)
-  #define IR_USE_TIMER1     // tx = pin 6
-
-//ATtiny85
-#elif defined(__AVR_ATtiny85__)
-  #define IR_USE_TIMER_TINY0   // tx = pin 1
-
-// 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
+// All board specific stuff has been moved to its own file, included here.
+#include "boarddefs.h"

 #endif
-
-//------------------------------------------------------------------------------
-// Defines for Timer
-
-//---------------------------------------------------------
-// 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_CONFIG_KHZ(val) ({ \
-	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)
-
-//-----------------
-#if (TIMER_COUNT_TOP < 256)
-#	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; \
-	})
-#endif
-
-//-----------------
-#if defined(CORE_OC2B_PIN)
-#	define TIMER_PWM_PIN  CORE_OC2B_PIN  // Teensy
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#	define TIMER_PWM_PIN  9              // Arduino Mega
-#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) \
-|| defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) \
-|| defined(__AVR_ATmega324P__) || defined(__AVR_ATmega324A__) \
-|| defined(__AVR_ATmega324PA__) || defined(__AVR_ATmega164A__) \
-|| defined(__AVR_ATmega164P__)
-#	define TIMER_PWM_PIN  14             // MightyCore
-#else
-#	define TIMER_PWM_PIN  3              // Arduino Duemilanove, Diecimila, LilyPad, etc
-#endif					     // ATmega48, ATmega88, ATmega168, ATmega328
-
-//---------------------------------------------------------
-// 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)))
-
-//-----------------
-#if defined(__AVR_ATmega8__) || defined(__AVR_ATmega8535__) \
-|| defined(__AVR_ATmega16__) || defined(__AVR_ATmega32__) \
-|| defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__)
-#	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)
-#endif
-
-//-----------------
-#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; \
-})
-
-#define TIMER_CONFIG_NORMAL() ({ \
-	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
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#	define TIMER_PWM_PIN  11             // Arduino Mega
-#elif defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__)
-#	define TIMER_PWM_PIN  13	     // MegaCore
-#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) \
-|| defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) \
-|| defined(__AVR_ATmega324P__) || defined(__AVR_ATmega324A__) \
-|| defined(__AVR_ATmega324PA__) || defined(__AVR_ATmega164A__) \
-|| defined(__AVR_ATmega164P__) || defined(__AVR_ATmega32__) \
-|| defined(__AVR_ATmega16__) || defined(__AVR_ATmega8535__)
-#	define TIMER_PWM_PIN  13             // MightyCore
-#elif defined(__AVR_ATtiny84__)
-# 	define TIMER_PWM_PIN  6
-#else
-#	define TIMER_PWM_PIN  9              // Arduino Duemilanove, Diecimila, LilyPad, etc
-#endif					     // ATmega48, ATmega88, ATmega168, ATmega328
-
-//---------------------------------------------------------
-// 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); \
-  TCCR3B = _BV(WGM33) | _BV(CS30); \
-  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
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#	define TIMER_PWM_PIN  5              // Arduino Mega
-#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)
-#	define TIMER_PWM_PIN  6              // MightyCore
-#else
-#	error "Please add OC3A pin number here\n"
-#endif
-
-//---------------------------------------------------------
-// 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_CONFIG_KHZ(val) ({ \
-	const uint16_t pwmval = SYSCLOCK / 2000 / (val); \
-	TCCR4A                = (1<<PWM4A); \
-	TCCR4B                = _BV(CS40); \
-	TCCR4C                = 0; \
-	TCCR4D                = (1<<WGM40); \
-	TCCR4E                = 0; \
-	TC4H                  = pwmval >> 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; \
-})
-
-//-----------------
-#if defined(CORE_OC4A_PIN)
-#	define TIMER_PWM_PIN  CORE_OC4A_PIN  // Teensy
-#elif defined(__AVR_ATmega32U4__)
-#	define TIMER_PWM_PIN  13             // Leonardo
-#else
-#	error "Please add OC4A pin number here\n"
-#endif
-
-//---------------------------------------------------------
-// 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_CONFIG_KHZ(val) ({ \
-  const uint16_t pwmval = SYSCLOCK / 2000 / (val); \
-  TCCR4A = _BV(WGM41); \
-  TCCR4B = _BV(WGM43) | _BV(CS40); \
-  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
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#	define TIMER_PWM_PIN  6  // Arduino Mega
-#else
-#	error "Please add OC4A pin number here\n"
-#endif
-
-//---------------------------------------------------------
-// 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_CONFIG_KHZ(val) ({ \
-  const uint16_t pwmval = SYSCLOCK / 2000 / (val); \
-  TCCR5A = _BV(WGM51); \
-  TCCR5B = _BV(WGM53) | _BV(CS50); \
-  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
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#	define TIMER_PWM_PIN  46  // Arduino Mega
-#else
-#	error "Please add OC5A pin number here\n"
-#endif
-
-//---------------------------------------------------------
-// Special carrier modulator timer
-//
-#elif defined(IR_USE_TIMER_CMT)
-
-#define TIMER_RESET ({     \
-	uint8_t tmp __attribute__((unused)) = CMT_MSC; \
-	CMT_CMD2 = 30;         \
-})
-
-#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
-#endif
-#define  ISR(f)  void f(void)
-
-//-----------------
-#define CMT_PPS_DIV  ((F_BUS + 7999999) / 8000000)
-#if F_BUS < 8000000
-#error IRremote requires at least 8 MHz on Teensy 3.x
-#endif
-
-//-----------------
-#define TIMER_CONFIG_KHZ(val) ({ 	 \
-	SIM_SCGC4 |= SIM_SCGC4_CMT;      \
-	SIM_SOPT2 |= SIM_SOPT2_PTD7PAD;  \
-	CMT_PPS    = CMT_PPS_DIV - 1;    \
-	CMT_CGH1   = ((F_BUS / CMT_PPS_DIV / 3000) + ((val)/2)) / (val); \
-	CMT_CGL1   = ((F_BUS / CMT_PPS_DIV / 1500) + ((val)/2)) / (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_DIV - 1; \
-	CMT_CGH1   = 1;               \
-	CMT_CGL1   = 1;               \
-	CMT_CMD1   = 0;               \
-	CMT_CMD2   = 30;              \
-	CMT_CMD3   = 0;               \
-	CMT_CMD4   = (F_BUS / 160000 + CMT_PPS_DIV / 2) / CMT_PPS_DIV - 31; \
-	CMT_OC     = 0;               \
-	CMT_MSC    = 0x03;            \
-})
-
-#define TIMER_PWM_PIN  5
-
-// defines for TPM1 timer on Teensy-LC
-#elif defined(IR_USE_TIMER_TPM1)
-#define TIMER_RESET          FTM1_SC |= FTM_SC_TOF;
-#define TIMER_ENABLE_PWM     CORE_PIN16_CONFIG = PORT_PCR_MUX(3)|PORT_PCR_DSE|PORT_PCR_SRE
-#define TIMER_DISABLE_PWM    CORE_PIN16_CONFIG = PORT_PCR_MUX(1)|PORT_PCR_SRE
-#define TIMER_ENABLE_INTR    NVIC_ENABLE_IRQ(IRQ_FTM1)
-#define TIMER_DISABLE_INTR   NVIC_DISABLE_IRQ(IRQ_FTM1)
-#define TIMER_INTR_NAME      ftm1_isr
-#ifdef ISR
-#undef ISR
-#endif
-#define ISR(f) void f(void)
-#define TIMER_CONFIG_KHZ(val) ({                     \
-	SIM_SCGC6 |= SIM_SCGC6_TPM1;                 \
-	FTM1_SC = 0;                                 \
-	FTM1_CNT = 0;                                \
-	FTM1_MOD = (F_PLL/2000) / val - 1;           \
-	FTM1_C0V = (F_PLL/6000) / val - 1;           \
-	FTM1_SC = FTM_SC_CLKS(1) | FTM_SC_PS(0);     \
-})
-#define TIMER_CONFIG_NORMAL() ({                     \
-	SIM_SCGC6 |= SIM_SCGC6_TPM1;                 \
-	FTM1_SC = 0;                                 \
-	FTM1_CNT = 0;                                \
-	FTM1_MOD = (F_PLL/40000) - 1;                \
-	FTM1_C0V = 0;                                \
-	FTM1_SC = FTM_SC_CLKS(1) | FTM_SC_PS(0) | FTM_SC_TOF | FTM_SC_TOIE; \
-})
-#define TIMER_PWM_PIN        16
-
-// defines for timer_tiny0 (8 bits)
-#elif defined(IR_USE_TIMER_TINY0)
-#define TIMER_RESET
-#define TIMER_ENABLE_PWM     (TCCR0A |= _BV(COM0B1))
-#define TIMER_DISABLE_PWM    (TCCR0A &= ~(_BV(COM0B1)))
-#define TIMER_ENABLE_INTR    (TIMSK |= _BV(OCIE0A))
-#define TIMER_DISABLE_INTR   (TIMSK &= ~(_BV(OCIE0A)))
-#define TIMER_INTR_NAME      TIMER0_COMPA_vect
-#define TIMER_CONFIG_KHZ(val) ({ \
-  const uint8_t pwmval = SYSCLOCK / 2000 / (val); \
-  TCCR0A = _BV(WGM00); \
-  TCCR0B = _BV(WGM02) | _BV(CS00); \
-  OCR0A = pwmval; \
-  OCR0B = pwmval / 3; \
-})
-#define TIMER_COUNT_TOP      (SYSCLOCK * USECPERTICK / 1000000)
-#if (TIMER_COUNT_TOP < 256)
-#define TIMER_CONFIG_NORMAL() ({ \
-  TCCR0A = _BV(WGM01); \
-  TCCR0B = _BV(CS00); \
-  OCR0A = TIMER_COUNT_TOP; \
-  TCNT0 = 0; \
-})
-#else
-#define TIMER_CONFIG_NORMAL() ({ \
-  TCCR0A = _BV(WGM01); \
-  TCCR0B = _BV(CS01); \
-  OCR0A = TIMER_COUNT_TOP / 8; \
-  TCNT0 = 0; \
-})
-#endif
-
-#define TIMER_PWM_PIN        1  /* ATtiny85 */
-
-//---------------------------------------------------------
-// Unknown Timer
-//
-#else
-#	error "Internal code configuration error, no known IR_USE_TIMER# defined\n"
-#endif
-#endif
--- a/ISSUE_TEMPLATE.md
+++ b/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!
--- a/README.md
+++ b/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,9 @@ 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
+- Sparkfun Pro Micro

 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.

@@ -42,12 +51,20 @@ We are open to suggestions for adding support to new boards, however we highly r
 | [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**             |
+| [Sparkfun Pro Micro](https://www.sparkfun.com/products/12640)            | 9, **5**, 5         | 1, **3**, 4_HS    |
 | [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
@@ -64,8 +81,8 @@ If you want to contribute to this project:
 Check [here](Contributing.md) for some guidelines.

 ## Contact
-The only way to contact me at the moment is by email: zetoslab@gmail.com
-I am not currently monitoring any PRs or Issues due to other issues but will respond to all emails. If anyone wants contributor access, feel free to email me. Or if you find any Issues/PRs to be of importance that my attention is needed please email me.
+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.

 ## Contributors
 Check [here](Contributors.md)
--- a/boarddefs.h
+++ b/boarddefs.h
@@ -0,0 +1,595 @@
+//******************************************************************************
+// IRremote
+// Version 2.0.1 June, 2015
+// Copyright 2009 Ken Shirriff
+// For details, see http://arcfn.com/2009/08/multi-protocol-infrared-remote-library.html
+
+// This file contains all board specific information. It was previously contained within
+// IRremoteInt.h
+
+// Modified by Paul Stoffregen <paul@pjrc.com> 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
+
+// Sparkfun Pro Micro support by Alastair McCormack
+//******************************************************************************
+
+#ifndef boarddefs_h
+#define boarddefs_h
+
+//------------------------------------------------------------------------------
+// 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)
+
+// 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_OFF()  (PORTB &= B11011111)
+#endif
+
+//------------------------------------------------------------------------------
+// CPU Frequency
+//
+#ifdef F_CPU
+#	define SYSCLOCK  F_CPU     // main Arduino clock
+#else
+#	define SYSCLOCK  16000000  // main Arduino clock
+#endif
+
+// microseconds per clock interrupt tick
+#define USECPERTICK    50
+
+//------------------------------------------------------------------------------
+// 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.
+//
+
+// Sparkfun Pro Micro
+#if defined(ARDUINO_AVR_PROMICRO)
+	//#define IR_USE_TIMER1     // tx = pin 9
+	#define IR_USE_TIMER3       // tx = pin 5
+	//#define IR_USE_TIMER4_HS  // tx = pin 5
+
+// Arduino Mega
+#elif 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
+
+// Teensy 1.0
+#elif defined(__AVR_AT90USB162__)
+	#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
+
+// Teensy 3.0 / Teensy 3.1
+#elif defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
+	#define IR_USE_TIMER_CMT  // tx = pin 5
+
+// Teensy-LC
+#elif defined(__MKL26Z64__)
+  #define IR_USE_TIMER_TPM1 // tx = pin 16
+
+// 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
+
+// MightyCore - ATmega1284
+#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)
+	//#define IR_USE_TIMER1   // tx = pin 13
+	#define IR_USE_TIMER2     // tx = pin 14
+	//#define IR_USE_TIMER3   // tx = pin 6
+
+// MightyCore - ATmega164, ATmega324, ATmega644
+#elif defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) \
+|| defined(__AVR_ATmega324P__) || defined(__AVR_ATmega324A__) \
+|| defined(__AVR_ATmega324PA__) || defined(__AVR_ATmega164A__) \
+|| defined(__AVR_ATmega164P__)
+	//#define IR_USE_TIMER1   // tx = pin 13
+	#define IR_USE_TIMER2     // tx = pin 14
+	
+//MegaCore - ATmega64, ATmega128
+#elif defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__)
+ 	#define IR_USE_TIMER1     // tx = pin 13
+
+// MightyCore - ATmega8535, ATmega16, ATmega32
+#elif defined(__AVR_ATmega8535__) || defined(__AVR_ATmega16__) || defined(__AVR_ATmega32__)
+ 	#define IR_USE_TIMER1     // tx = pin 13
+
+// Atmega8
+#elif defined(__AVR_ATmega8__)
+	#define IR_USE_TIMER1     // tx = pin 9
+
+// ATtiny84
+#elif defined(__AVR_ATtiny84__)
+	#define IR_USE_TIMER1     // tx = pin 6
+
+//ATtiny85
+#elif defined(__AVR_ATtiny85__)
+	#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
+	//#define IR_USE_TIMER1   // tx = pin 9
+	#define IR_USE_TIMER2     // tx = pin 3
+
+#endif
+
+//------------------------------------------------------------------------------
+// Defines for Timer
+
+//---------------------------------------------------------
+// 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_CONFIG_KHZ(val) ({ \
+	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)
+
+//-----------------
+#if (TIMER_COUNT_TOP < 256)
+#	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; \
+	})
+#endif
+
+//-----------------
+#if defined(CORE_OC2B_PIN)
+#	define TIMER_PWM_PIN  CORE_OC2B_PIN  // Teensy
+#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#	define TIMER_PWM_PIN  9              // Arduino Mega
+#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) \
+|| defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) \
+|| defined(__AVR_ATmega324P__) || defined(__AVR_ATmega324A__) \
+|| defined(__AVR_ATmega324PA__) || defined(__AVR_ATmega164A__) \
+|| defined(__AVR_ATmega164P__)
+#	define TIMER_PWM_PIN  14             // MightyCore
+#else
+#	define TIMER_PWM_PIN  3              // Arduino Duemilanove, Diecimila, LilyPad, etc
+#endif					     // ATmega48, ATmega88, ATmega168, ATmega328
+
+//---------------------------------------------------------
+// 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)))
+
+//-----------------
+#if defined(__AVR_ATmega8__) || defined(__AVR_ATmega8535__) \
+|| defined(__AVR_ATmega16__) || defined(__AVR_ATmega32__) \
+|| defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__)
+#	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)
+#endif
+
+//-----------------
+#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; \
+})
+
+#define TIMER_CONFIG_NORMAL() ({ \
+	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
+#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#	define TIMER_PWM_PIN  11             // Arduino Mega
+#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) \
+|| defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) \
+|| defined(__AVR_ATmega324P__) || defined(__AVR_ATmega324A__) \
+|| defined(__AVR_ATmega324PA__) || defined(__AVR_ATmega164A__) \
+|| defined(__AVR_ATmega164P__) || defined(__AVR_ATmega32__) \
+|| defined(__AVR_ATmega16__) || defined(__AVR_ATmega8535__) \
+|| defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__)
+#	define TIMER_PWM_PIN  13             // MightyCore, MegaCore
+#elif defined(__AVR_ATtiny84__)
+# 	define TIMER_PWM_PIN  6
+#else
+#	define TIMER_PWM_PIN  9              // Arduino Duemilanove, Diecimila, LilyPad, Sparkfun Pro Micro etc
+#endif					     // ATmega48, ATmega88, ATmega168, ATmega328
+
+//---------------------------------------------------------
+// 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); \
+  TCCR3B = _BV(WGM33) | _BV(CS30); \
+  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
+#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(ARDUINO_AVR_PROMICRO)
+#	define TIMER_PWM_PIN  5              // Arduino Mega, Sparkfun Pro Micro
+#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)
+#	define TIMER_PWM_PIN  6              // MightyCore
+#else
+#	error "Please add OC3A pin number here\n"
+#endif
+
+//---------------------------------------------------------
+// Timer4 (10 bits, high speed option)
+//
+#elif defined(IR_USE_TIMER4_HS)
+
+#define TIMER_RESET
+
+#if defined(ARDUINO_AVR_PROMICRO) // Sparkfun Pro Micro                         
+	#define TIMER_ENABLE_PWM    (TCCR4A |= _BV(COM4A0))     // Use complimentary O̅C̅4̅A̅ output on pin 5
+	#define TIMER_DISABLE_PWM   (TCCR4A &= ~(_BV(COM4A0)))  // (Pro Micro does not map PC7 (32/ICP3/CLK0/OC4A)
+															// of ATmega32U4 )
+#else
+	#define TIMER_ENABLE_PWM    (TCCR4A |= _BV(COM4A1))
+	#define TIMER_DISABLE_PWM   (TCCR4A &= ~(_BV(COM4A1)))
+#endif
+
+#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<<PWM4A); \
+	TCCR4B                = _BV(CS40); \
+	TCCR4C                = 0; \
+	TCCR4D                = (1<<WGM40); \
+	TCCR4E                = 0; \
+	TC4H                  = pwmval >> 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; \
+})
+
+//-----------------
+#if defined(CORE_OC4A_PIN)
+#	define TIMER_PWM_PIN  CORE_OC4A_PIN  // Teensy
+#elif defined(ARDUINO_AVR_PROMICRO)
+#	define TIMER_PWM_PIN  5              // Sparkfun Pro Micro
+#elif defined(__AVR_ATmega32U4__)
+#	define TIMER_PWM_PIN  13             // Leonardo
+#else
+#	error "Please add OC4A pin number here\n"
+#endif
+
+//---------------------------------------------------------
+// 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_CONFIG_KHZ(val) ({ \
+  const uint16_t pwmval = SYSCLOCK / 2000 / (val); \
+  TCCR4A = _BV(WGM41); \
+  TCCR4B = _BV(WGM43) | _BV(CS40); \
+  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
+#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#	define TIMER_PWM_PIN  6  // Arduino Mega
+#else
+#	error "Please add OC4A pin number here\n"
+#endif
+
+//---------------------------------------------------------
+// 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_CONFIG_KHZ(val) ({ \
+  const uint16_t pwmval = SYSCLOCK / 2000 / (val); \
+  TCCR5A = _BV(WGM51); \
+  TCCR5B = _BV(WGM53) | _BV(CS50); \
+  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
+#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
+#	define TIMER_PWM_PIN  46  // Arduino Mega
+#else
+#	error "Please add OC5A pin number here\n"
+#endif
+
+//---------------------------------------------------------
+// Special carrier modulator timer
+//
+#elif defined(IR_USE_TIMER_CMT)
+
+#define TIMER_RESET ({     \
+	uint8_t tmp __attribute__((unused)) = CMT_MSC; \
+	CMT_CMD2 = 30;         \
+})
+
+#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
+#endif
+#define  ISR(f)  void f(void)
+
+//-----------------
+#define CMT_PPS_DIV  ((F_BUS + 7999999) / 8000000)
+#if F_BUS < 8000000
+#error IRremote requires at least 8 MHz on Teensy 3.x
+#endif
+
+//-----------------
+#define TIMER_CONFIG_KHZ(val) ({ 	 \
+	SIM_SCGC4 |= SIM_SCGC4_CMT;      \
+	SIM_SOPT2 |= SIM_SOPT2_PTD7PAD;  \
+	CMT_PPS    = CMT_PPS_DIV - 1;    \
+	CMT_CGH1   = ((F_BUS / CMT_PPS_DIV / 3000) + ((val)/2)) / (val); \
+	CMT_CGL1   = ((F_BUS / CMT_PPS_DIV / 1500) + ((val)/2)) / (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_DIV - 1; \
+	CMT_CGH1   = 1;               \
+	CMT_CGL1   = 1;               \
+	CMT_CMD1   = 0;               \
+	CMT_CMD2   = 30;              \
+	CMT_CMD3   = 0;               \
+	CMT_CMD4   = (F_BUS / 160000 + CMT_PPS_DIV / 2) / CMT_PPS_DIV - 31; \
+	CMT_OC     = 0;               \
+	CMT_MSC    = 0x03;            \
+})
+
+#define TIMER_PWM_PIN  5
+
+// defines for TPM1 timer on Teensy-LC
+#elif defined(IR_USE_TIMER_TPM1)
+#define TIMER_RESET          FTM1_SC |= FTM_SC_TOF;
+#define TIMER_ENABLE_PWM     CORE_PIN16_CONFIG = PORT_PCR_MUX(3)|PORT_PCR_DSE|PORT_PCR_SRE
+#define TIMER_DISABLE_PWM    CORE_PIN16_CONFIG = PORT_PCR_MUX(1)|PORT_PCR_SRE
+#define TIMER_ENABLE_INTR    NVIC_ENABLE_IRQ(IRQ_FTM1)
+#define TIMER_DISABLE_INTR   NVIC_DISABLE_IRQ(IRQ_FTM1)
+#define TIMER_INTR_NAME      ftm1_isr
+#ifdef ISR
+#undef ISR
+#endif
+#define ISR(f) void f(void)
+#define TIMER_CONFIG_KHZ(val) ({                     \
+	SIM_SCGC6 |= SIM_SCGC6_TPM1;                 \
+	FTM1_SC = 0;                                 \
+	FTM1_CNT = 0;                                \
+	FTM1_MOD = (F_PLL/2000) / val - 1;           \
+	FTM1_C0V = (F_PLL/6000) / val - 1;           \
+	FTM1_SC = FTM_SC_CLKS(1) | FTM_SC_PS(0);     \
+})
+#define TIMER_CONFIG_NORMAL() ({                     \
+	SIM_SCGC6 |= SIM_SCGC6_TPM1;                 \
+	FTM1_SC = 0;                                 \
+	FTM1_CNT = 0;                                \
+	FTM1_MOD = (F_PLL/40000) - 1;                \
+	FTM1_C0V = 0;                                \
+	FTM1_SC = FTM_SC_CLKS(1) | FTM_SC_PS(0) | FTM_SC_TOF | FTM_SC_TOIE; \
+})
+#define TIMER_PWM_PIN        16
+
+// defines for timer_tiny0 (8 bits)
+#elif defined(IR_USE_TIMER_TINY0)
+#define TIMER_RESET
+#define TIMER_ENABLE_PWM     (TCCR0A |= _BV(COM0B1))
+#define TIMER_DISABLE_PWM    (TCCR0A &= ~(_BV(COM0B1)))
+#define TIMER_ENABLE_INTR    (TIMSK |= _BV(OCIE0A))
+#define TIMER_DISABLE_INTR   (TIMSK &= ~(_BV(OCIE0A)))
+#define TIMER_INTR_NAME      TIMER0_COMPA_vect
+#define TIMER_CONFIG_KHZ(val) ({ \
+  const uint8_t pwmval = SYSCLOCK / 2000 / (val); \
+  TCCR0A = _BV(WGM00); \
+  TCCR0B = _BV(WGM02) | _BV(CS00); \
+  OCR0A = pwmval; \
+  OCR0B = pwmval / 3; \
+})
+#define TIMER_COUNT_TOP      (SYSCLOCK * USECPERTICK / 1000000)
+#if (TIMER_COUNT_TOP < 256)
+#define TIMER_CONFIG_NORMAL() ({ \
+  TCCR0A = _BV(WGM01); \
+  TCCR0B = _BV(CS00); \
+  OCR0A = TIMER_COUNT_TOP; \
+  TCNT0 = 0; \
+})
+#else
+#define TIMER_CONFIG_NORMAL() ({ \
+  TCCR0A = _BV(WGM01); \
+  TCCR0B = _BV(CS01); \
+  OCR0A = TIMER_COUNT_TOP / 8; \
+  TCNT0 = 0; \
+})
+#endif
+
+#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
+//
+#else
+#	error "Internal code configuration error, no known IR_USE_TIMER# defined\n"
+#endif
+
+#endif // ! boarddefs_h
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,12 @@
+## 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
+- Fixed naming bug [PR #398](https://github.com/z3t0/Arduino-IRremote/pull/398)
+
 ## 2.2.1 - 2016/07/27
 - Added tests for Lego Power Functions Protocol [PR #336](https://github.com/z3t0/Arduino-IRremote/pull/336)

--- a/examples/IRrecord/IRrecord.ino
+++ b/examples/IRrecord/IRrecord.ino
@@ -45,7 +45,7 @@ int toggle = 0; // The RC5/6 toggle state
 // Most of this code is just logging
 void storeCode(decode_results *results) {
  codeType = results->decode_type;
-  int count = results->rawlen;
+  //int count = results->rawlen;
  if (codeType == UNKNOWN) {
    Serial.println("Received unknown code, saving as raw");
    codeLen = results->rawlen - 1;
@@ -126,7 +126,7 @@ void sendCode(int repeat) {
    Serial.println(codeValue, HEX);
  }
  else if (codeType == JVC) {
-    irsend.sendPanasonic(codeValue, codeLen);
+    irsend.sendJVC(codeValue, codeLen, false);
    Serial.print("Sent JVC");
    Serial.println(codeValue, HEX);
  }
--- a/examples/IRrecvDemo/IRrecvDemo.ino
+++ b/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() {
--- a/examples/IRrecvDump/IRrecvDump.ino
+++ b/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);

--- a/examples/IRrecvDumpV2/IRrecvDumpV2.ino
+++ b/examples/IRrecvDumpV2/IRrecvDumpV2.ino
@@ -66,7 +66,7 @@ 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");
+    Serial.println("IR code too long. Edit IRremoteInt.h and increase RAWBUF");
    return;
  }

--- a/examples/IRtest2/IRtest2.ino
+++ b/examples/IRtest2/IRtest2.ino
@@ -61,7 +61,7 @@ void setup()
 // Wait for the gap between tests, to synchronize with
 // the sender.
 // Specifically, wait for a signal followed by a gap of at last gap ms.
-void waitForGap(int gap) {
+void waitForGap(unsigned long gap) {
  Serial.println("Waiting for gap");
  while (1) {
    while (digitalRead(RECV_PIN) == LOW) { 
@@ -125,7 +125,7 @@ void dump(decode_results *results) {
 // The motivation behind this method is that the sender and the receiver
 // can do the same test calls, and the mode variable indicates whether
 // to send or receive.
-void test(char *label, int type, unsigned long value, int bits) {
+void test(const char *label, int type, unsigned long value, int bits) {
  if (mode == SENDER) {
    Serial.println(label);
    if (type == NEC) {
@@ -175,7 +175,7 @@ void test(char *label, int type, unsigned long value, int bits) {

 // Test raw send or receive.  This is similar to the test method,
 // except it send/receives raw data.
-void testRaw(char *label, unsigned int *rawbuf, int rawlen) {
+void testRaw(const char *label, unsigned int *rawbuf, int rawlen) {
  if (mode == SENDER) {
    Serial.println(label);
    irsend.sendRaw(rawbuf, rawlen, 38 /* kHz */);
--- a/examples/LGACSendDemo/LGACSendDemo.ino
+++ b/examples/LGACSendDemo/LGACSendDemo.ino
@@ -192,12 +192,12 @@ void loop()
        ac_activate(AC_TEMPERATURE, AC_FLOW);
        break;
      case 2:
-        if ( b == 0 | b == 1 ) {
+        if ( b == 0 || b == 1 ) {
          ac_change_air_swing(b);
        }
        break;
      case 3: // 1  : clean on, power on
-        if ( b == 0 | b == 1 ) {
+        if ( b == 0 || b == 1 ) {
          ac_air_clean(b);
        }
        break;
--- a/examples/LegoPowerFunctionsTests/LegoPowerFunctionsTests.ino
+++ b/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);
 }
-
-
-
-
--- a/irRecv.cpp
+++ b/irRecv.cpp
@@ -1,6 +1,11 @@
 #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
 // Returns 0 if no data ready, 1 if data ready.
@@ -84,6 +89,11 @@ int  IRrecv::decode (decode_results *results)
 	DBG_PRINTLN("Attempting Lego Power Functions");
 	if (decodeLegoPowerFunctions(results))  return true ;
 #endif
+	
+#if DECODE_NERF_LOP
+	DBG_PRINTLN("Attempting Nerf Laser Ops Pro Functions");
+	if (decodeNerfLOP(results))  return true ;
+#endif

 	// decodeHash returns a hash on any input.
 	// Thus, it needs to be last in the list.
@@ -117,6 +127,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)
@@ -130,6 +151,7 @@ void  IRrecv::enableIRIn ( )
 	TIMER_RESET;

 	sei();  // enable interrupts
+#endif

 	// Initialize state machine variables
 	irparams.rcvstate = STATE_IDLE;
--- a/irSend.cpp
+++ b/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
 }

 //+=============================================================================
--- a/ir_Lego_PF_BitStreamEncoder.h
+++ b/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;
    }
--- a/ir_NerfLaserOpsPro.cpp
+++ b/ir_NerfLaserOpsPro.cpp
@@ -0,0 +1,89 @@
+#include "IRremote.h"
+#include "IRremoteInt.h"
+
+//==============================================================================
+//
+//
+//                              NERF LASER OPS PRO
+//
+//
+//==============================================================================
+
+#define BITS          15  // The number of bits in the command
+
+#define HDR_MARK    2800  // The length of the Header:Mark
+#define HDR_SPACE   6000  // The lenght of the Header:Space
+
+#define ONE_MARK    1800  // The length of a Bit:Mark for 1's
+#define ZERO_MARK    800  // The length of a Bit:Mark for 0's
+#define ALL_SPACE   2100  // The length of a Bit:Space
+
+#define purpule 0x440
+#define red     0x400
+#define blue    0x420
+
+//+=============================================================================
+//
+#if SEND_NERF_LOP
+void  IRsend::sendNerfLOP (unsigned long data,  int nbits)
+{
+	// Set IR carrier frequency
+	enableIROut(40);
+
+	// Header
+	mark (HDR_MARK);
+	space(HDR_SPACE);
+  mark (HDR_MARK);
+
+	// Data
+	for (unsigned long  mask = 1UL << (nbits - 1);  mask;  mask >>= 1) {
+		if (data & mask) {
+      space(ALL_SPACE);
+			mark (ONE_MARK);
+		} else {
+			space(ALL_SPACE);
+			mark (ZERO_MARK);
+		}
+	}
+  
+  space(0);  // Always end with the LED off
+}
+#endif
+
+//+=============================================================================
+//
+#if DECODE_NERF_LOP
+bool  IRrecv::decodeNerfLOP (decode_results *results)
+{
+  //NOT IMPLEMENTED YET
+  return false;
+	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 < SHUZU_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 = SHUZU;
+	return true;
+}
+#endif
--- a/library.json
+++ b/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" :
--- a/library.properties
+++ b/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
--- a/readmdFrench.md
+++ b/readmdFrench.md
@@ -0,0 +1,97 @@
+##  IRremote Library
+
+
+Cette bibliothèque vous permet d'envoyer et de recevoir des signaux infrarouges sur un Arduino.
+Des tutoriels et plus d'informations seront disponibles sur la page d'accueil officielle.
+
+## Version - 2.2.3
+
+## Installation
+1. Allez à la [Releases](https://github.com/z3t0/Arduino-IRremote/releases) page.
+2. Téléchargez la dernière version.
+3. Extraire le fichier zip
+4. Déplacez le dossier "IRremote" vers vos bibliothèques.
+5. Assurez-vous de supprimer Arduino_Root / libraries / RobotIRremote. Où Arduino_Root fait référence au répertoire d'installation d'Arduino. La bibliothèque RobotIRremote a des définitions similaires à IRremote et provoque des erreurs.
+
+
+## FAQ
+Je ne travaille pas correctement en utilisant Neopixels (aka WS2811 / WS2812 / WS2812B)
+Que vous utilisiez la librairie Adafruit Neopixel ou FastLED, les interruptions sont désactivées sur de nombreux processeurs bas de gamme comme les arduinos de base. À son tour, cela empêche le gestionnaire IR de s'exécuter quand il le faut. Il y a quelques solutions à ce processus, voir cette page de Marc MERLIN
+[cette page de Marc MERLIN](http://marc.merlins.org/perso/arduino/post_2017-04-03_Arduino-328P-Uno-Teensy3_1-ESP8266-ESP32-IR-and-Neopixels.html)
+
+
+## Conseils pris en charge
+
+- Teensy 1.0 / 1.0++ / 2.0 / 2++ / 3.0 / 3.1 / Teensy-LC; Crédits: @PaulStoffregen (Teensy Team)
+- Sanguino
+- ATmega8, 48, 88, 168, 328
+- ATmega8535, 16, 32, 164, 324, 644, 1284,
+- ATmega64, 128
+- ATtiny 84 / 85
+- ESP32 (recevoir seulement)
+- ESP8266 est basé sur un ancien code qui n'est pas très récent, mais cela fonctionne raisonnablement bien. Voir https://github.com/markszabo/IRremoteESP8266
+Sparkfun Pro Micro
+
+
+
+
+Nous sommes ouverts aux suggestions d'ajout de support pour les nouveaux tableaux, cependant, nous vous recommandons fortement de contacter votre fournisseur et de fournir un soutien de leur côté.
+
+
+## Spécifications matérielles
+
+
+| Carte/CPU                                                                | Envoyer Pin         | Compteurs         |
+|--------------------------------------------------------------------------|---------------------|-------------------|
+| [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**       |
+| [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 (insupporté) | **1**             |
+| [Sparkfun Pro Micro](https://www.sparkfun.com/products/12640)            | 9, **5**, 5         | 1, **3**, 4_HS    |
+| [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**          |
+
+
+## Patchs expérimentaux
+
+Voici les correctifs strictement pris en charge qui n'ont pas encore été intégrés. Si vous avez des questions, n'hésitez pas à demander ici. Si cela fonctionne, faites le nous savoir!
+
+[Arduino 101](https://github.com/z3t0/Arduino-IRremote/pull/481#issuecomment-311243146)
+
+Le tableau ci-dessus répertorie les temporisations actuellement supportées et les broches d'envoi correspondantes, beaucoup de ces broches supplémentaires sont ouvertes.
+
+
+## Utilisation
+- À faire TODO (Vérifier les exemples pour l'instant)
+
+
+## Contribution
+Si vous voulez contribuer à ce projet:
+- Signaler les bogues et les erreurs
+- Demander des améliorations
+- Créer des problèmes et tirer des requêtes
+- Parlez de cette bibliothèque à d'autres personnes
+- Contribuer de nouveaux protocoles
+Vérifiez ici [ici](Contributing.md) pour quelques 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.
+
+## Contributeurs
+Check [here](Contributors.md)
+@Lsuperman735 French translation 
+
+## Copyright
+Copyright 2009-2012 Ken Shirriff
Author	SHA1	Message	Date
Wieland Schöbl	176c000cdf	Added missing #endif	2018-12-27 20:03:12 +01:00
Wieland Schöbl	09d9e3a28d	Updated irRecv.h to include Nerf LOP	2018-12-27 17:05:33 +01:00
Wieland Schöbl	a963e85e8c	Updated IRremote.h to include NERF LOP	2018-12-27 17:03:36 +01:00
Wieland Schöbl	df0c2db187	Created NERF Laser Ops Pro file	2018-12-27 16:59:26 +01:00
Rafi Khan	2dc97b29f2	Merge pull request #555 from LSUPERMAN735/patch-1 Create readmdFrench.md	2018-03-12 17:17:02 -04:00
LSUPERMAN735	a6b9cc277b	Create readmdFrench.md French translation by @Lsuperman735	2018-03-12 18:11:55 +01:00
Rafi Khan	96186317b2	Merge pull request #542 from use-sparingly/master Sparkfun Pro Micro Support	2018-01-03 18:52:44 -05:00
alastair.mccormack	5a2ded839c	Typo Removed erroneous `//`	2017-12-03 21:27:35 +00:00
alastair.mccormack	46b7a72da0	Sparkfun Pro Micro credit	2017-12-03 20:36:49 +00:00
alastair.mccormack	06d06019a6	Removed whitespace	2017-12-03 20:22:37 +00:00
alastair.mccormack	57ee7a670e	Supported board order Correct Sparkfun Pro Micro position in supported board order	2017-12-03 20:19:16 +00:00
alastair.mccormack	20bc39a68f	Corrected TIMER4_HS output on Sparkfun Pro Micro Use O̅C̅4̅A̅ (complimentary output pin) to output to pin 5 (shared with OC3A) on Sparkfun Pro Micro	2017-12-03 20:09:23 +00:00
alastair.mccormack	c2d25b4dd9	Added Sparkfun timer and pins information	2017-11-23 17:30:25 +01:00
alastair.mccormack	7734a90db3	Added Sparkfun Pro Micro pinouts Used -DARDUINO_AVR_PROMICRO to determine which timers are available and pin mapping. Also removed separate ifdef in	2017-11-23 15:44:56 +01:00
Rafi Khan	20a4d97f61	Merge pull request #519 from PaulStoffregen/master Fix minor compiler warnings in examples	2017-09-09 17:53:45 -06:00
PaulStoffregen	1154607b69	Fix minor compiler warnings in examples	2017-09-04 20:48:37 -07:00
Rafi Khan	47aadf559d	Update Contributors.md (#488 )	2017-07-24 14:51:03 -06:00
Rafi Khan	eb7a0bee7d	#481 note (#484 )	2017-07-01 21:53:37 -07:00
Marc MERLIN	18f12d3aff	Add FAQ on mixing IR and neopixels (#451 ) * Add FAQ on mixing IR and neopixels As requested in https://github.com/z3t0/Arduino-IRremote/issues/435 * Update README.md	2017-04-22 20:44:19 -06:00
Rafi Khan	f0aa48a4d1	Merge pull request #436 from marcmerlin/patch-1 Added pointer for ESP8266 fork	2017-04-10 14:05:36 -06:00
Marc MERLIN	691ea5bc53	Added pointer for ESP8266 fork As requested in https://github.com/z3t0/Arduino-IRremote/issues/400	2017-04-09 19:55:49 -07:00
Rafi Khan	e0c2649b9f	Merge pull request #425 from marcmerlin/master Added ESP32 IR receive support (IRsend not implemented yet).	2017-04-01 12:55:05 -06:00
Marc MERLIN	419c948c29	Fixed rev to 2.3.3 and added info on timer used.	2017-04-01 08:32:37 -07:00
Marc MERLIN	9133814e60	Rev'ed to 2.2.4.	2017-03-31 23:10:07 -07:00
Marc MERLIN	3875097df9	Merge branch 'master' of github.com:marcmerlin/Arduino-IRremote	2017-03-31 22:33:16 -07:00
Marc MERLIN	88b294a0cd	change no-op defines from '1' to ''.	2017-03-31 22:32:48 -07:00
Marc MERLIN	ffdb6081ae	Merge branch 'master' into master	2017-03-31 22:04:36 -07:00
Marc MERLIN	6b8f2bdbfc	move comment about 'or else' chips that use TIMER2.	2017-03-31 22:01:31 -07:00
Marc MERLIN	eae9de4307	Cleaned up ESP32 integration, reverted ESP32 ifdefs on irreceive examples. - fixed indenting on existing code in a few places for consistency - introduced IR_TIMER_USE_ESP32 for ifdefs within the code as per request - added comments explaining what's missing for irsend support on ESP32 - IRrecvDemo.ino gets a warning before and after interrupt is enabled in case it causes a crash TESTED=IoTuz ESP32 board and original 328p arduino to make sure current code did not break.	2017-03-31 21:52:52 -07:00
Rafi Khan	513e104515	Merge pull request #427 from philipphenkel/lego_pf_integer_overflow_2 Fix calculation of pause length in LEGO PF protocol	2017-03-27 16:25:19 -06:00
Philipp Henkel	ccc9d0135c	Add Lego fix to change and bump version up to 2.2.3	2017-03-27 19:57:25 +02:00
Philipp Henkel	257a15130f	Fix calculation of pause length in LEGO PF protocol Fix #384 Integer overflow in LEGO Power Functions affects pause between messages Is rebased version of PR #385	2017-03-26 22:32:55 +02:00
Marc MERLIN	1b56da6cc7	Rename ESP32 timer name so that it doesn't conflict with other timers.	2017-03-19 21:28:14 -07:00
Marc MERLIN	aa8f7b31fe	Added ESP32 IR receive support (IRsend not implemented yet). - disable a lot of defines not relevant to ESP32, set them to 1 (no-op) - change default IR pin to 35 from 11 - changed serial speed to 115200 (9600 is too slow to keep up with IR input) - irSend disables code that will not compile on ESP32. It won't work, but it won't break compilation either.	2017-03-19 20:27:56 -07:00
Rafi Khan	048efb23a2	Merge pull request #414 from z3t0/z3t0-patch-1 Update ISSUE_TEMPLATE.md	2017-02-06 22:26:51 -06:00
Rafi Khan	4f24b696cf	Update ISSUE_TEMPLATE.md	2017-02-03 21:18:47 -06:00
Rafi Khan	a4cf8bc43e	Merge pull request #406 from z3t0/panasonic-jvc IRrecord.ino typo	2017-01-26 21:11:10 -06:00
Rafi Khan	3b41130ff9	Manual merge of #398	2017-01-22 01:52:14 -06:00
Rafi Khan	96efb5930a	Merge pull request #402 from felipenoris/fn/fix-msg fix example error message	2017-01-14 14:14:16 -06:00
Felipe Noronha	9a74475c8d	fix example error message	2017-01-13 11:58:40 -02:00
Rafi Khan	7c14514beb	Merge pull request #377 from z3t0/z3t0-patch-3 Just gonna put this in here....	2016-11-12 00:02:17 -06:00
Rafi Khan	20b6e3b8a2	Just gonna put this in here....	2016-11-11 22:28:41 -06:00
Rafi Khan	fe27a84d26	Merge pull request #352 from bengtmartensson/boarddefs Move board specific configuration info to new file boarddefs.h	2016-11-08 18:24:09 -06:00
Bengt Martensson	ccbaca5acc	Merge branch 'boarddefs' of github.com:bengtmartensson/Arduino-IRremote into boarddefs	2016-11-07 17:04:41 +01:00
Bengt Martensson	74594847b7	Move board specific configuration info to new file boarddefs.h.	2016-11-07 17:02:34 +01:00
Rafi Khan	85f8aa1e25	Merge pull request #367 from z3t0/z3t0-patch-2 updated readme email notice	2016-10-26 22:05:22 -06:00
Rafi Khan	9ae0239fb7	updated readme email notice far too many emails for things that should be an issue or PR	2016-10-08 02:03:14 -06:00
Bengt Martensson	0d69a1a9ed	Move board specific configuration info to new file boarddefs.h.	2016-08-23 15:23:51 +02:00