Merge branch 'beta' of https://github.com/z3t0/Arduino-IRremote into beta

Merge branch 'LarsWH-master' into beta
Added support for RC5 extended
2025-12-24 15:26:16 +00:00 · 2017-09-23 23:16:52 -04:00 · 2017-09-23 23:15:34 -04:00 · 2017-09-23 21:03:07 -04:00 · 2017-09-14 22:13:50 -04:00 · 2017-09-14 21:57:46 -04:00
49 changed files with 3115 additions and 455 deletions
--- a/Contributors.md
+++ b/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
@@ -16,7 +15,10 @@ 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)
+- [bengtmartensson](https://github.com/bengtmartensson): Active Contributor
+- [MrBryonMiller](https://github.com/MrBryonMiller): Contributor

 Note: This list is being updated constantly so please let [z3t0](https://github.com/z3t0) know if you have been missed.
--- a/2417
+++ b/2417
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -5,7 +5,7 @@
 **Code Block:**
 ```c

-#include <AIRremote.h> 
+#include <IRremote.h> 

 .....

@@ -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.5.0b

 ## 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,24 +43,45 @@ 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
 - TODO (Check examples for now)

+## API documentation
+This project documents the library API using [Doxygen](http://www.doxygen.org).
+It is planned to make generated and up-to-date API documentation available online.
+
+To generate the API documentation,
+Doxygen, as well as [Graphviz](http://www.graphviz.org/) should be installed.
+(Note that on Windows, it may be necessary to add the Graphviz binary directory
+(something like `C:\Program Files\Graphviz2.38\bin`)
+to the `PATH` variable manually.)
+With Doxygen and Graphviz installed, issue the command
+`doxygen` from the command line in the main project directory, which will
+generate the API documentation in HTML format.
+The just generated `api-doc/index.html` can now be opened in a browser.
+
 ## Contributing
 If you want to contribute to this project:
 - Report bugs and errors
@@ -65,7 +94,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)
--- a/arduino-irremote.sublime-workspace
+++ b/arduino-irremote.sublime-workspace
@@ -1,240 +0,0 @@
-{
-	"auto_complete":
-	{
-		"selected_items":
-		[
-			[
-				"vb",
-				"vboMatrix"
-			]
-		]
-	},
-	"buffers":
-	[
-	],
-	"build_system": "",
-	"build_system_choices":
-	[
-	],
-	"build_varint": "",
-	"command_palette":
-	{
-		"height": 275.0,
-		"last_filter": "blame",
-		"selected_items":
-		[
-			[
-				"blame",
-				"Git: Blame"
-			],
-			[
-				"install",
-				"Package Control: Install Package"
-			],
-			[
-				"diff",
-				"Git: Diff Current File"
-			],
-			[
-				"js",
-				"Set Syntax: JavaScript"
-			],
-			[
-				"i",
-				"Package Control: Install Package"
-			],
-			[
-				"instal",
-				"Package Control: Install Package"
-			]
-		],
-		"width": 510.0
-	},
-	"console":
-	{
-		"height": 126.0,
-		"history":
-		[
-			"import urllib.request,os,hashlib; h = '2915d1851351e5ee549c20394736b442' + '8bc59f460fa1548d1514676163dafc88'; pf = 'Package Control.sublime-package'; ipp = sublime.installed_packages_path(); urllib.request.install_opener( urllib.request.build_opener( urllib.request.ProxyHandler()) ); by = urllib.request.urlopen( 'http://packagecontrol.io/' + pf.replace(' ', '%20')).read(); dh = hashlib.sha256(by).hexdigest(); print('Error validating download (got %s instead of %s), please try manual install' % (dh, h)) if dh != h else open(os.path.join( ipp, pf), 'wb' ).write(by)"
-		]
-	},
-	"distraction_free":
-	{
-		"menu_visible": true,
-		"show_minimap": false,
-		"show_open_files": false,
-		"show_tabs": false,
-		"side_bar_visible": false,
-		"status_bar_visible": false
-	},
-	"expanded_folders":
-	[
-		"/C/Users/Rafi Khan/Documents/Arduino/libraries/Arduino-IRremote"
-	],
-	"file_history":
-	[
-		"/C/Users/Rafi Khan/Documents/Arduino/libraries/Arduino-IRremote/changelog.md",
-		"/C/Users/Rafi Khan/Documents/Development/Arduino-IRremote/arduino-irremote.sublime-project",
-		"/C/Users/Rafi Khan/Documents/Development/Arduino-IRremote/.gitignore",
-		"/C/Users/Rafi Khan/Documents/Development/magic/README.md",
-		"/C/Users/Rafi Khan/Documents/Development/magic/shader.frag",
-		"/C/Users/Rafi Khan/Documents/Development/magic/package.json",
-		"/C/Users/Rafi Khan/Documents/Development/magic/block.js",
-		"/C/Users/Rafi Khan/Documents/Development/magic/chunker.js",
-		"/C/Users/Rafi Khan/Documents/Development/magic/index.js",
-		"/C/Users/Rafi Khan/Documents/Development/magic/blocks",
-		"/C/Users/Rafi Khan/AppData/Roaming/Sublime Text 3/Packages/User/Preferences.sublime-settings",
-		"/C/Users/Rafi Khan/Documents/Development/magic/shader.vert",
-		"/C/Users/Rafi Khan/Documents/Development/magic/magic.sublime-project",
-		"/C/Users/Rafi Khan/Documents/Development/magic/node_modules/browserify/node_modules/syntax-error/node_modules/acorn/.tern-project",
-		"/C/Users/Rafi Khan/OneDrive/Documents/School-RafiKhan/Grade 11/CS30/Python/supermarket.py",
-		"/C/Users/Rafi Khan/OneDrive/Documents/School-RafiKhan/Grade 11/CS30/Python/takingavacation.py",
-		"/C/Users/Rafi Khan/OneDrive/Documents/School-RafiKhan/Grade 11/CS30/Python/TipCalculator.py",
-		"/C/Users/Rafi Khan/OneDrive/Documents/School-RafiKhan/Grade 11/CS30/Python/battleship.py",
-		"/C/Users/Rafi Khan/OneDrive/Documents/School-RafiKhan/Grade 11/CS30/Python/exam.py",
-		"/C/Users/Rafi Khan/OneDrive/Documents/School-RafiKhan/Grade 11/CS30/Python/pyglatin.py",
-		"/C/Users/Rafi Khan/OneDrive/Documents/School-RafiKhan/Grade 11/CS30/Python/student.py"
-	],
-	"find":
-	{
-		"height": 28.0
-	},
-	"find_in_files":
-	{
-		"height": 0.0,
-		"where_history":
-		[
-		]
-	},
-	"find_state":
-	{
-		"case_sensitive": false,
-		"find_history":
-		[
-			"i",
-			"Direction",
-			";",
-			";\n",
-			"north",
-			"cubeMatrix",
-			")\n",
-			"vec3.set",
-			"f",
-			";",
-			"();\n",
-			"render",
-			"this",
-			"y"
-		],
-		"highlight": true,
-		"in_selection": false,
-		"preserve_case": false,
-		"regex": false,
-		"replace_history":
-		[
-		],
-		"reverse": false,
-		"show_context": true,
-		"use_buffer2": true,
-		"whole_word": false,
-		"wrap": true
-	},
-	"groups":
-	[
-		{
-			"sheets":
-			[
-			]
-		}
-	],
-	"incremental_find":
-	{
-		"height": 28.0
-	},
-	"input":
-	{
-		"height": 66.0
-	},
-	"layout":
-	{
-		"cells":
-		[
-			[
-				0,
-				0,
-				1,
-				1
-			]
-		],
-		"cols":
-		[
-			0.0,
-			1.0
-		],
-		"rows":
-		[
-			0.0,
-			1.0
-		]
-	},
-	"menu_visible": true,
-	"output.find_results":
-	{
-		"height": 0.0
-	},
-	"pinned_build_system": "",
-	"project": "arduino-irremote.sublime-project",
-	"replace":
-	{
-		"height": 52.0
-	},
-	"save_all_on_build": true,
-	"select_file":
-	{
-		"height": 0.0,
-		"last_filter": "",
-		"selected_items":
-		[
-			[
-				"json",
-				"package.json"
-			],
-			[
-				"inde",
-				"index.js"
-			]
-		],
-		"width": 0.0
-	},
-	"select_project":
-	{
-		"height": 0.0,
-		"last_filter": "",
-		"selected_items":
-		[
-		],
-		"width": 0.0
-	},
-	"select_symbol":
-	{
-		"height": 0.0,
-		"last_filter": "",
-		"selected_items":
-		[
-		],
-		"width": 0.0
-	},
-	"selected_group": 0,
-	"settings":
-	{
-	},
-	"show_minimap": true,
-	"show_open_files": false,
-	"show_tabs": true,
-	"side_bar_visible": true,
-	"side_bar_width": 150.0,
-	"status_bar_visible": true,
-	"template_settings":
-	{
-	}
-}
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,18 @@
+## 2.5.0
+- Added Philips Extended RC-5 protocol support [PR #522] (https://github.com/z3t0/Arduino-IRremote/pull/522)
+
+## 2.4.0 - 2017/08/10
+ - Cleanup of hardware dependencies. Merge in SAM support [PR #437](https://github.com/z3t0/Arduino-IRremote/pull/437)
+
+## 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/AiwaRCT501SendDemo/AiwaRCT501SendDemo.ino
+++ b/examples/AiwaRCT501SendDemo/AiwaRCT501SendDemo.ino
@@ -6,7 +6,7 @@
 * http://arcfn.com
 */

-#include "AIRremote.h"
+#include "IRremote.h"

 #define POWER 0x7F80
 #define AIWA_RC_T501
--- a/examples/IRrecord/IRrecord.ino
+++ b/examples/IRrecord/IRrecord.ino
@@ -15,7 +15,7 @@
 * http://arcfn.com
 */

-#include <AIRremote.h>
+#include <IRremote.h>

 int RECV_PIN = 11;
 int BUTTON_PIN = 12;
@@ -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
@@ -6,7 +6,7 @@
 * http://arcfn.com
 */

-#include <AIRremote.h>
+#include <IRremote.h>

 int RECV_PIN = 11;

@@ -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
@@ -8,14 +8,14 @@
 * LG added by Darryl Smith (based on the JVC protocol)
 */

-#include <AIRremote.h>
+#include <IRremote.h>

 /* 
 *  Default is Arduino pin D11. 
 *  You can change this to another available Arduino Pin.
 *  Your IR receiver should be connected to the pin defined here
 */
-int RECV_PIN = 11; 
+int RECV_PIN = 11;

 IRrecv irrecv(RECV_PIN);

--- a/examples/IRrecvDumpV2/IRrecvDumpV2.ino
+++ b/examples/IRrecvDumpV2/IRrecvDumpV2.ino
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // Include the IRremote library header
 //
-#include <AIRremote.h>
+#include <IRremote.h>

 //------------------------------------------------------------------------------
 // Tell IRremote which Arduino pin is connected to the IR Receiver (TSOP4838)
@@ -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/IRrelay/IRrelay.ino
+++ b/examples/IRrelay/IRrelay.ino
@@ -6,7 +6,7 @@
 * http://arcfn.com
 */

-#include <AIRremote.h>
+#include <IRremote.h>

 int RECV_PIN = 11;
 int RELAY_PIN = 4;
--- a/examples/IRremoteInfo/IRremoteInfo.ino
+++ b/examples/IRremoteInfo/IRremoteInfo.ino
@@ -11,7 +11,7 @@
 */


-#include <AIRremote.h>
+#include <IRremote.h>

 void setup()
 {
@@ -79,7 +79,7 @@ void dumpTIMER() {

 void dumpTimerPin() {
  Serial.print(F("IR Tx Pin: "));
-  Serial.println(TIMER_PWM_PIN);
+  Serial.println(SEND_PIN);
 }

 void dumpClock() {
@@ -224,7 +224,7 @@ void dumpFooter() {
  Serial.println(F("Notes: "));
  Serial.println(F("     - Most of the seetings above can be configured in the following files included as part of the library"));
  Serial.println(F("     - IRremteInt.h"));
-  Serial.println(F("     - AIRremote.h"));
+  Serial.println(F("     - IRremote.h"));
  Serial.println(F("     - You can save SRAM by disabling the Decode or Send features for any protocol (Near the top of IRremoteInt.h)"));
  Serial.println(F("     - Some Timer conflicts, with other libraries, can be easily resolved by configuring a differnt Timer for your platform"));
 }
--- a/examples/IRsendDemo/IRsendDemo.ino
+++ b/examples/IRsendDemo/IRsendDemo.ino
@@ -7,7 +7,7 @@
 */


-#include <AIRremote.h>
+#include <IRremote.h>

 IRsend irsend;

--- a/examples/IRsendRawDemo/IRsendRawDemo.ino
+++ b/examples/IRsendRawDemo/IRsendRawDemo.ino
@@ -18,7 +18,7 @@
 */


-#include <AIRremote.h>
+#include <IRremote.h>

 IRsend irsend;

--- a/examples/IRtest/IRtest.ino
+++ b/examples/IRtest/IRtest.ino
@@ -4,13 +4,12 @@
 * Copyright 2009 Ken Shirriff
 * http://arcfn.com
 *
- * Note: to run these tests, edit IRremote/AIRremote.h to add "#define TEST"
+ * Note: to run these tests, edit IRremote/IRremote.h to add "#define TEST"
 * You must then recompile the library by removing IRremote.o and restarting
 * the arduino IDE.
 */

-#include <AIRremote.h>
-#include <IRremoteInt.h>
+#include <IRremote.h>

 // Dumps out the decode_results structure.
 // Call this after IRrecv::decode()
--- a/examples/IRtest2/IRtest2.ino
+++ b/examples/IRtest2/IRtest2.ino
@@ -25,7 +25,7 @@
 * http://arcfn.com
 */

-#include <AIRremote.h>
+#include <IRremote.h>

 int RECV_PIN = 11;
 int LED_PIN = 3;
--- a/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
+++ b/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
@@ -6,7 +6,7 @@
 * http://arcfn.com
 * JVC and Panasonic protocol added by Kristian Lauszus (Thanks to zenwheel and other people at the original blog post)
 */
-#include <AIRremote.h>
+#include <IRremote.h>
 
 #define PanasonicAddress      0x4004     // Panasonic address (Pre data) 
 #define PanasonicPower        0x100BCBD  // Panasonic Power button
--- a/examples/LGACSendDemo/LGACSendDemo.ino
+++ b/examples/LGACSendDemo/LGACSendDemo.ino
@@ -1,4 +1,4 @@
-#include <AIRremote.h>
+#include <IRremote.h>
 #include <Wire.h>


--- a/examples/LegoPowerFunctionsSendDemo/LegoPowerFunctionsSendDemo.ino
+++ b/examples/LegoPowerFunctionsSendDemo/LegoPowerFunctionsSendDemo.ino
@@ -3,8 +3,7 @@
 * Copyright (c) 2016 Philipp Henkel
 */

-#include <AIRremote.h>
-#include <IRremoteInt.h>
+#include <IRremote.h>

 IRsend irsend;

--- 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/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.4.0",
  "frameworks": "arduino",
  "platforms": "atmelavr",
  "authors" :
--- a/library.properties
+++ b/library.properties
@@ -1,9 +1,9 @@
 name=IRremote
-version=2.2.1
-author=shirriff
-maintainer=shirriff
+version=2.4.0
+author=shirriff, z3t0
+maintainer=z3t0
 sentence=Send and receive infrared signals with multiple protocols
-paragraph=Send and receive infrared signals with multiple protocols
-category=Signal Input/Output
-url=https://github.com/shirriff/Arduino-IRremote.git
+paragraph=Find more information at https://github.com/z3t0/Arduino-IRremote
+category=Communication
+url=https://github.com/z3t0/Arduino-IRremote
 architectures=*
--- a/src/IRremote.cpp
+++ b/src/IRremote.cpp
@@ -18,14 +18,16 @@
 // 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 "AIRremote.h"
-#	include "IRremoteInt.h"
+#include "IRremote.h"
 #undef IR_GLOBAL

+#ifdef HAS_AVR_INTERRUPT_H
+#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
@@ -49,11 +51,12 @@ int  MATCH (int measured,  int desired)
 	DBG_PRINT(TICKS_HIGH(desired), DEC);

  bool passed = ((measured >= TICKS_LOW(desired)) && (measured <= TICKS_HIGH(desired)));
-  if (passed)
+  if (passed) {
    DBG_PRINTLN(F("?; passed"));
-  else
-    DBG_PRINTLN(F("?; FAILED")); 
- 	return passed;
+  } else {
+    DBG_PRINTLN(F("?; FAILED"));
+  }
+  return passed;
 }

 //+========================================================
@@ -65,7 +68,7 @@ int  MATCH_MARK (int measured_ticks,  int desired_us)
 	DBG_PRINT(measured_ticks * USECPERTICK, DEC);
 	DBG_PRINT(F("us vs "));
 	DBG_PRINT(desired_us, DEC);
-	DBG_PRINT("us"); 
+	DBG_PRINT("us");
 	DBG_PRINT(": ");
 	DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS) * USECPERTICK, DEC);
 	DBG_PRINT(F(" <= "));
@@ -75,11 +78,12 @@ int  MATCH_MARK (int measured_ticks,  int desired_us)

  bool passed = ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS))
                && (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS)));
-  if (passed)
+  if (passed) {
    DBG_PRINTLN(F("?; passed"));
-  else
-    DBG_PRINTLN(F("?; FAILED")); 
- 	return passed;
+  } else {
+    DBG_PRINTLN(F("?; FAILED"));
+  }
+  return passed;
 }

 //+========================================================
@@ -91,7 +95,7 @@ int  MATCH_SPACE (int measured_ticks,  int desired_us)
 	DBG_PRINT(measured_ticks * USECPERTICK, DEC);
 	DBG_PRINT(F("us vs "));
 	DBG_PRINT(desired_us, DEC);
-	DBG_PRINT("us"); 
+	DBG_PRINT("us");
 	DBG_PRINT(": ");
 	DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS) * USECPERTICK, DEC);
 	DBG_PRINT(F(" <= "));
@@ -101,11 +105,12 @@ int  MATCH_SPACE (int measured_ticks,  int desired_us)

  bool passed = ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS))
                && (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS)));
-  if (passed)
+  if (passed) {
    DBG_PRINTLN(F("?; passed"));
-  else
-    DBG_PRINTLN(F("?; FAILED")); 
- 	return passed;
+  } else {
+    DBG_PRINTLN(F("?; FAILED"));
+  }
+  return passed;
 }

 //+=============================================================================
@@ -182,6 +187,7 @@ ISR (TIMER_INTR_NAME)
 		 	break;
 	}

+#ifdef BLINKLED
 	// If requested, flash LED while receiving IR data
 	if (irparams.blinkflag) {
 		if (irdata == MARK)
@@ -190,4 +196,5 @@ ISR (TIMER_INTR_NAME)
 		else if (irparams.blinkpin) digitalWrite(irparams.blinkpin, LOW); // Turn user defined pin LED on
 				else BLINKLED_OFF() ;   // if no user defined LED pin, turn default LED pin for the hardware on
 	}
+#endif // BLINKLED
 }
--- a/src/IRremote.h
+++ b/src/IRremote.h
@@ -1,3 +1,7 @@
+/**
+ * @file IRremote.h
+ * @brief Public API to the library.
+ */

 //******************************************************************************
 // IRremote
@@ -15,13 +19,13 @@
 // Whynter A/C ARC-110WD added by Francesco Meschia
 //******************************************************************************

-#ifndef AIRremote_h
-#define AIRremote_h
+#ifndef IRremote_h
+#define IRremote_h

 //------------------------------------------------------------------------------
 // The ISR header contains several useful macros the user may wish to use
 //
-#include "IRremoteInt.h"
+#include "private/IRremoteInt.h"

 //------------------------------------------------------------------------------
 // Supported IR protocols
@@ -94,10 +98,10 @@
 #define PRONTO_FALLBACK    true
 #define PRONTO_NOFALLBACK  false

-//------------------------------------------------------------------------------
-// An enumerated list of all supported formats
-// You do NOT need to remove entries from this list when disabling protocols!
-//
+/**
+ * An enum consisting of all supported formats.
+ * You do NOT need to remove entries from this list when disabling protocols!
+ */
 typedef
 	enum {
 		UNKNOWN      = -1,
@@ -122,9 +126,9 @@ typedef
 	}
 decode_type_t;

-//------------------------------------------------------------------------------
-// Set DEBUG to 1 for lots of lovely debug output
-//
+/**
+ * Set DEBUG to 1 for lots of lovely debug output.
+ */
 #define DEBUG  0

 //------------------------------------------------------------------------------
@@ -134,7 +138,13 @@ decode_type_t;
 #	define DBG_PRINT(...)    Serial.print(__VA_ARGS__)
 #	define DBG_PRINTLN(...)  Serial.println(__VA_ARGS__)
 #else
+/**
+ * If DEBUG, print the arguments, otherwise do nothing.
+ */
 #	define DBG_PRINT(...)
+/**
+ * If DEBUG, print the arguments as a line, otherwise do nothing.
+ */
 #	define DBG_PRINTLN(...)
 #endif

@@ -145,39 +155,71 @@ int  MATCH       (int measured, int desired) ;
 int  MATCH_MARK  (int measured_ticks, int desired_us) ;
 int  MATCH_SPACE (int measured_ticks, int desired_us) ;

-//------------------------------------------------------------------------------
-// Results returned from the decoder
-//
+/**
+ * Results returned from the decoder
+ */
 class decode_results
 {
 	public:
-		decode_type_t          decode_type;  // UNKNOWN, NEC, SONY, RC5, ...
-		unsigned int           address;      // Used by Panasonic & Sharp [16-bits]
-		unsigned long          value;        // Decoded value [max 32-bits]
-		int                    bits;         // Number of bits in decoded value
-		volatile unsigned int  *rawbuf;      // Raw intervals in 50uS ticks
-		int                    rawlen;       // Number of records in rawbuf
-		int                    overflow;     // true iff IR raw code too long
+		decode_type_t          decode_type;  ///< UNKNOWN, NEC, SONY, RC5, ...
+		unsigned int           address;      ///< Used by Panasonic & Sharp [16-bits]
+		unsigned long          value;        ///< Decoded value [max 32-bits]
+		int                    bits;         ///< Number of bits in decoded value
+		volatile unsigned int  *rawbuf;      ///< Raw intervals in 50uS ticks
+		int                    rawlen;       ///< Number of records in rawbuf
+		int                    overflow;     ///< true iff IR raw code too long
 };

-//------------------------------------------------------------------------------
-// Decoded value for NEC when a repeat code is received
-//
+/**
+ * Decoded value for NEC when a repeat code is received
+ */
 #define REPEAT 0xFFFFFFFF

-//------------------------------------------------------------------------------
-// Main class for receiving IR
-//
+/**
+ * Main class for receiving IR
+ */
 class IRrecv
 {
 	public:
+                /**
+                 * Instantiate the IRrecv class. Multiple instantiation is not supported.
+                 * @param recvpin Arduino pin to use. No sanity check is made.
+                 */
 		IRrecv (int recvpin) ;
+                /**
+                 * Instantiate the IRrecv class. Multiple instantiation is not supported.
+                 * @param recvpin Arduino pin to use, where a demodulating IR receiver is connected.
+                 * @param blinkpin pin to blink when receiving IR. Not supported by all hardware. No sanity check is made.
+                 */
 		IRrecv (int recvpin, int blinkpin);

+                /**
+                 * TODO: Why is this public???
+                 * @param blinkflag
+                 */
 		void  blink13    (int blinkflag) ;
+
+                /**
+                 * Attempt to decode the recently receive IR signal
+                 * @param results decode_results instance returning the decode, if any.
+                 * @return success of operation. TODO: convert to bool
+                 */
 		int   decode     (decode_results *results) ;
+
+                /**
+                 * Enable IR reception.
+                 */
 		void  enableIRIn ( ) ;
+
+                /**
+                 * Returns status of reception
+                 * @return true if no reception is on-going.
+                 */
 		bool  isIdle     ( ) ;
+
+                /**
+                 * Called to re-enable IR reception.
+                 */
 		void  resume     ( ) ;

 	private:
@@ -186,10 +228,17 @@ class IRrecv

 		//......................................................................
 #		if (DECODE_RC5 || DECODE_RC6)
-			// This helper function is shared by RC5 and RC6
+			/**
+                         *  This helper function is shared by RC5 and RC6
+                         */
 			int  getRClevel (decode_results *results,  int *offset,  int *used,  int t1) ;
 #		endif
 #		if DECODE_RC5
+                        /**
+                         * Try to decode the recently received IR signal as an RC5 signal-
+                         * @param results decode_results instance returning the decode, if any.
+                         * @return Success of the operation.
+                         */
 			bool  decodeRC5        (decode_results *results) ;
 #		endif
 #		if DECODE_RC6
@@ -253,13 +302,24 @@ class IRrecv
 #		endif
 } ;

-//------------------------------------------------------------------------------
-// Main class for sending IR
-//
+/**
+ * Main class for sending IR
+ */
 class IRsend
 {
 	public:
-		IRsend () { }
+#ifdef USE_SOFT_CARRIER
+
+		IRsend(int pin = SEND_PIN)
+		{
+			sendPin = pin;
+		}
+#else
+
+		IRsend()
+		{
+		}
+#endif

 		void  custom_delay_usec (unsigned long uSecs);
 		void  enableIROut 		(int khz) ;
@@ -270,6 +330,7 @@ class IRsend
 		//......................................................................
 #		if SEND_RC5
 			void  sendRC5        (unsigned long data,  int nbits) ;
+			void  sendRC5ext     (unsigned long addr, unsigned long cmd, boolean toggle);
 #		endif
 #		if SEND_RC6
 			void  sendRC6        (unsigned long data,  int nbits) ;
@@ -339,6 +400,20 @@ class IRsend
 #		if SEND_LEGO_PF
 			void  sendLegoPowerFunctions (uint16_t data, bool repeat = true) ;
 #		endif
+
+#ifdef USE_SOFT_CARRIER
+	private:
+		int sendPin;
+
+		unsigned int periodTime;
+		unsigned int periodOnTime;
+
+		void sleepMicros(unsigned long us);
+		void sleepUntilMicros(unsigned long targetTime);
+
+#else
+		const int sendPin = SEND_PIN;
+#endif
 } ;

 #endif
--- a/src/esp32.cpp
+++ b/src/esp32.cpp
@@ -0,0 +1,38 @@
+#ifdef ESP32
+
+// This file contains functions specific to the ESP32.
+
+#include "IRremote.h"
+
+// "Idiot check"
+#ifdef USE_DEFAULT_ENABLE_IR_IN
+#error Must undef USE_DEFAULT_ENABLE_IR_IN
+#endif
+
+hw_timer_t *timer;
+void IRTimer(); // defined in IRremote.cpp, masqueraded as ISR(TIMER_INTR_NAME)
+
+//+=============================================================================
+// initialization
+//
+void  IRrecv::enableIRIn ( )
+{
+// Interrupt Service Routine - Fires every 50uS
+	// 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);
+
+	// Initialize state machine variables
+	irparams.rcvstate = STATE_IDLE;
+	irparams.rawlen = 0;
+
+	// Set pin modes
+	pinMode(irparams.recvpin, INPUT);
+}
+
+#endif // ESP32
--- a/src/irPronto.cpp
+++ b/src/irPronto.cpp
@@ -17,7 +17,7 @@
 	void  mark        (int t)     { printf("+%d," , t); }
 	void  space       (int t)     { printf("-%d, ", t); }
 #else
-#	include "AIRremote.h"
+#	include "IRremote.h"
 #endif // TEST

 //+=============================================================================
--- a/src/irRecv.cpp
+++ b/src/irRecv.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //+=============================================================================
 // Decodes the received IR message
@@ -115,8 +114,10 @@ IRrecv::IRrecv (int recvpin, int blinkpin)
 //+=============================================================================
 // initialization
 //
+#ifdef USE_DEFAULT_ENABLE_IR_IN
 void  IRrecv::enableIRIn ( )
 {
+// Interrupt Service Routine - Fires every 50uS
 	cli();
 	// Setup pulse clock timer interrupt
 	// Prescale /8 (16M/8 = 0.5 microseconds per tick)
@@ -138,14 +139,17 @@ void  IRrecv::enableIRIn ( )
 	// Set pin modes
 	pinMode(irparams.recvpin, INPUT);
 }
+#endif // USE_DEFAULT_ENABLE_IR_IN

 //+=============================================================================
 // Enable/disable blinking of pin 13 on IR processing
 //
 void  IRrecv::blink13 (int blinkflag)
 {
+#ifdef BLINKLED
 	irparams.blinkflag = blinkflag;
 	if (blinkflag)  pinMode(BLINKLED, OUTPUT) ;
+#endif
 }

 //+=============================================================================
--- a/src/irSend.cpp
+++ b/src/irSend.cpp
@@ -1,6 +1,6 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

+#ifdef SENDING_SUPPORTED
 //+=============================================================================
 void  IRsend::sendRaw (const unsigned int buf[],  unsigned int len,  unsigned int hz)
 {
@@ -15,14 +15,59 @@ void  IRsend::sendRaw (const unsigned int buf[],  unsigned int len,  unsigned in
 	space(0);  // Always end with the LED off
 }

+#ifdef USE_SOFT_CARRIER
+void inline IRsend::sleepMicros(unsigned long us)
+{
+#ifdef USE_SPIN_WAIT
+	sleepUntilMicros(micros() + us);
+#else
+	if (us > 0U) // Is this necessary? (Official docu https://www.arduino.cc/en/Reference/DelayMicroseconds does not tell.)
+		delayMicroseconds((unsigned int) us);
+#endif
+}
+
+void inline IRsend::sleepUntilMicros(unsigned long targetTime)
+{
+#ifdef USE_SPIN_WAIT
+	while (micros() < targetTime)
+		;
+#else
+        unsigned long now = micros();
+        if (now < targetTime)
+                sleepMicros(targetTime - now);
+#endif
+}
+#endif // USE_SOFT_CARRIER
+
 //+=============================================================================
 // Sends an IR mark for the specified number of microseconds.
 // The mark output is modulated at the PWM frequency.
 //
-void  IRsend::mark (unsigned int time)
+
+void IRsend::mark(unsigned int time)
 {
+#ifdef USE_SOFT_CARRIER
+	unsigned long start = micros();
+	unsigned long stop = start + time;
+	if (stop + periodTime < start)
+		// Counter wrap-around, happens very seldomly, but CAN happen.
+		// Just give up instead of possibly damaging the hardware.
+		return;
+
+	unsigned long nextPeriodEnding = start;
+	unsigned long now = micros();
+	while (now < stop) {
+		SENDPIN_ON(sendPin);
+		sleepMicros(periodOnTime);
+		SENDPIN_OFF(sendPin);
+		nextPeriodEnding += periodTime;
+		sleepUntilMicros(nextPeriodEnding);
+		now = micros();
+	}
+#else
 	TIMER_ENABLE_PWM; // Enable pin 3 PWM output
 	if (time > 0) custom_delay_usec(time);
+#endif
 }

 //+=============================================================================
@@ -54,11 +99,16 @@ void  IRsend::space (unsigned int time)
 //
 void  IRsend::enableIROut (int khz)
 {
+#ifdef USE_SOFT_CARRIER
+	periodTime = (1000U + khz/2) / khz; // = 1000/khz + 1/2 = round(1000.0/khz)
+	periodOnTime = periodTime * DUTY_CYCLE / 100U - PULSE_CORRECTION;
+#endif
+	
 	// Disable the Timer2 Interrupt (which is used for receiving IR)
 	TIMER_DISABLE_INTR; //Timer2 Overflow Interrupt

-	pinMode(TIMER_PWM_PIN, OUTPUT);
-	digitalWrite(TIMER_PWM_PIN, LOW); // When not sending PWM, we want it low
+	pinMode(sendPin, OUTPUT);
+	SENDPIN_OFF(sendPin); // When not sending, we want it low

 	// COM2A = 00: disconnect OC2A
 	// COM2B = 00: disconnect OC2B; to send signal set to 10: OC2B non-inverted
@@ -85,3 +135,4 @@ void IRsend::custom_delay_usec(unsigned long uSecs) {
  //}
 }

+#endif // SENDING_SUPPORTED
--- a/src/ir_Aiwa.cpp
+++ b/src/ir_Aiwa.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //                         AAA   IIIII  W   W   AAA
--- a/src/ir_Denon.cpp
+++ b/src/ir_Denon.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 // Reverse Engineered by looking at RAW dumps generated by IRremote

--- a/src/ir_Dish.cpp
+++ b/src/ir_Dish.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //                       DDDD   IIIII   SSSS  H   H
--- a/src/ir_JVC.cpp
+++ b/src/ir_JVC.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //                             JJJJJ  V   V   CCCC
--- a/src/ir_LG.cpp
+++ b/src/ir_LG.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //                               L       GGGG
--- a/src/ir_Lego_PF.cpp
+++ b/src/ir_Lego_PF.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"
 #include "ir_Lego_PF_BitStreamEncoder.h"

 //==============================================================================
--- a/src/ir_Lego_PF_BitStreamEncoder.h
+++ b/src/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/src/ir_Mitsubishi.cpp
+++ b/src/ir_Mitsubishi.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //    MMMMM  IIIII TTTTT   SSSS  U   U  BBBB   IIIII   SSSS  H   H  IIIII
--- a/src/ir_NEC.cpp
+++ b/src/ir_NEC.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //                           N   N  EEEEE   CCCC
--- a/src/ir_Panasonic.cpp
+++ b/src/ir_Panasonic.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //       PPPP    AAA   N   N   AAA    SSSS   OOO   N   N  IIIII   CCCC
--- a/src/ir_RC5_RC6.cpp
+++ b/src/ir_RC5_RC6.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //+=============================================================================
 // Gets one undecoded level at a time from the raw buffer.
@@ -78,6 +77,73 @@ void  IRsend::sendRC5 (unsigned long data,  int nbits)

 	space(0);  // Always end with the LED off
 }
+
+void  IRsend::sendRC5ext (unsigned long addr, unsigned long cmd, boolean toggle)
+{
+	// Set IR carrier frequency
+	enableIROut(36);
+	
+	unsigned long addressBits = 5;
+	unsigned long commandBits = 7;
+	unsigned long nbits = addressBits + commandBits;
+	
+	// Start
+	mark(RC5_T1);
+	
+	// Bit #6 of the command part, but inverted!
+	unsigned long cmdBit6 = (1UL << (commandBits-1)) & cmd;
+	if (cmdBit6) {
+		// Inverted (1 -> 0 = mark-to-space)
+		mark(RC5_T1);
+		space(RC5_T1);
+	} else {
+		space(RC5_T1);
+		mark(RC5_T1);
+	}
+	commandBits--;
+
+	// Toggle bit
+	static int toggleBit = 1;
+	if (toggle) {
+		if (toggleBit == 0) {
+			toggleBit = 1;
+		} else {
+			toggleBit = 0;
+		}
+	}
+	if (toggleBit) {
+		space(RC5_T1);
+		mark(RC5_T1);
+	} else {
+		mark(RC5_T1);
+		space(RC5_T1);
+	}
+
+	// Address
+	for (unsigned long  mask = 1UL << (addressBits - 1);  mask;  mask >>= 1) {
+		if (addr & mask) {
+			space(RC5_T1); // 1 is space, then mark
+			mark(RC5_T1);
+		} else {
+			mark(RC5_T1);
+			space(RC5_T1);
+		}
+	}
+	
+	// Command
+	for (unsigned long  mask = 1UL << (commandBits - 1);  mask;  mask >>= 1) {
+		if (cmd & mask) {
+			space(RC5_T1); // 1 is space, then mark
+			mark(RC5_T1);
+		} else {
+			mark(RC5_T1);
+			space(RC5_T1);
+		}
+	}
+
+	space(0);  // Always end with the LED off
+}
+
 #endif

 //+=============================================================================
--- a/src/ir_Samsung.cpp
+++ b/src/ir_Samsung.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //              SSSS   AAA    MMM    SSSS  U   U  N   N   GGGG
--- a/src/ir_Sanyo.cpp
+++ b/src/ir_Sanyo.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //                      SSSS   AAA   N   N  Y   Y   OOO
--- a/src/ir_Sharp.cpp
+++ b/src/ir_Sharp.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //                       SSSS  H   H   AAA   RRRR   PPPP
--- a/src/ir_Sony.cpp
+++ b/src/ir_Sony.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //                           SSSS   OOO   N   N  Y   Y
--- a/src/ir_Template.cpp
+++ b/src/ir_Template.cpp
@@ -31,7 +31,7 @@ You have written the code to support your new protocol!

 Now you must do a few things to add it to the IRremote system:

-1. Open AIRremote.h and make the following changes:
+1. Open IRremote.h and make the following changes:
   REMEMEBER to change occurences of "SHUZU" with the name of your protocol

   A. At the top, in the section "Supported Protocols", add:
@@ -91,8 +91,7 @@ Regards,
  BlueChip
 */

-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //
--- a/src/ir_Whynter.cpp
+++ b/src/ir_Whynter.cpp
@@ -1,5 +1,4 @@
-#include "AIRremote.h"
-#include "IRremoteInt.h"
+#include "IRremote.h"

 //==============================================================================
 //               W   W  H   H  Y   Y N   N TTTTT EEEEE  RRRRR
--- a/src/private/IRremoteInt.h
+++ b/src/private/IRremoteInt.h
@@ -18,15 +18,9 @@
 #define IRremoteint_h

 //------------------------------------------------------------------------------
-// Include the right Arduino header
+// Include the Arduino header
 //
-#if defined(ARDUINO) && (ARDUINO >= 100)
-#	include <Arduino.h>
-#else
-#	if !defined(IRPRONTO)
-#		include <WProgram.h>
-#	endif
-#endif
+#include <Arduino.h>

 //------------------------------------------------------------------------------
 // This handles definition and access to global variables
@@ -40,19 +34,22 @@
 //------------------------------------------------------------------------------
 // Information for the Interrupt Service Routine
 //
-#define RAWBUF  101  // Maximum length of raw duration buffer
+#define RAWBUF  101  ///< Maximum length of raw duration buffer. Must be odd.

+/**
+  * This struct is used to communicate with the ISR (interrupt service routine).
+  */
 typedef
 	struct {
 		// The fields are ordered to reduce memory over caused by struct-padding
-		uint8_t       rcvstate;        // State Machine state
-		uint8_t       recvpin;         // Pin connected to IR data from detector
+		uint8_t       rcvstate;        ///< State Machine state
+		uint8_t       recvpin;         ///< Pin connected to IR data from detector
 		uint8_t       blinkpin;
-		uint8_t       blinkflag;       // true -> enable blinking of pin on IR processing
-		uint8_t       rawlen;          // counter of entries in rawbuf
-		unsigned int  timer;           // State timer, counts 50uS ticks.
-		unsigned int  rawbuf[RAWBUF];  // raw data
-		uint8_t       overflow;        // Raw buffer overflow occurred
+		uint8_t       blinkflag;       ///< true -> enable blinking of pin on IR processing
+		uint8_t       rawlen;          ///< counter of entries in rawbuf
+		unsigned int  timer;           ///< State timer, counts 50uS ticks.
+		unsigned int  rawbuf[RAWBUF];  ///< raw data
+		uint8_t       overflow;        ///< Raw buffer overflow occurred
 	}
 irparams_t;

@@ -63,9 +60,11 @@ irparams_t;
 #define STATE_STOP      5
 #define STATE_OVERFLOW  6

-// Allow all parts of the code access to the ISR data
-// NB. The data can be changed by the ISR at any time, even mid-function
-// Therefore we declare it as "volatile" to stop the compiler/CPU caching it
+/**
+ * Allow all parts of the code access to the ISR data
+ * NB. The data can be changed by the ISR at any time, even mid-function
+ * Therefore we declare it as "volatile" to stop the compiler/CPU caching it
+ */
 EXTERN  volatile irparams_t  irparams;

 //------------------------------------------------------------------------------
@@ -85,8 +84,12 @@ EXTERN  volatile irparams_t  irparams;
 // Pulse parameters in uSec
 //

-// Due to sensor lag, when received, Marks  tend to be 100us too long and
-//                                   Spaces tend to be 100us too short
+/**
+ * When received, marks  tend to be too long and
+ * spaces tend to be too short.
+ * To compensate for this, MARK_EXCESS is subtracted from all marks,
+ * and added to all spaces.
+ */
 #define MARK_EXCESS    100

 // Upper and Lower percentage tolerances in measurements
--- a/src/private/boarddefs.h
+++ b/src/private/boarddefs.h
@@ -20,6 +20,32 @@
 #ifndef boarddefs_h
 #define boarddefs_h

+// Define some defaults, that some boards may like to override
+// (This is to avoid negative logic, ! DONT_... is just awkward.)
+
+// This board has/needs the avr/interrupt.h
+#define HAS_AVR_INTERRUPT_H
+
+// Define if sending is supported
+#define SENDING_SUPPORTED
+
+// If defined, a standard enableIRIn function will be define.
+// Undefine for boards supplying their own.
+#define USE_DEFAULT_ENABLE_IR_IN
+
+// Duty cycle in percent for sent signals. Presently takes effect only with USE_SOFT_CARRIER
+#define DUTY_CYCLE 50
+
+// If USE_SOFT_CARRIER, this amount (in micro seconds) is subtracted from the
+// on-time of the pulses.
+#define PULSE_CORRECTION 3
+
+// digitalWrite is supposed to be slow. If this is an issue, define faster,
+// board-dependent versions of these macros SENDPIN_ON(pin) and SENDPIN_OFF(pin).
+// Portable, possibly slow, default definitions are given at the end of this file.
+// If defining new versions, feel free to ignore the pin argument if it
+// is not configurable on the current board.
+
 //------------------------------------------------------------------------------
 // Defines for blinking the LED
 //
@@ -39,9 +65,34 @@
 #	define BLINKLED_ON()   (PORTD |= B00000001)
 #	define BLINKLED_OFF()  (PORTD &= B11111110)

+#elif defined(ARDUINO_ARCH_SAM) || defined(ARDUINO_ARCH_SAMD)
+#	define BLINKLED        LED_BUILTIN
+#	define BLINKLED_ON()   (digitalWrite(LED_BUILTIN, HIGH))
+#	define BLINKLED_OFF()  (digitalWrite(LED_BUILTIN, LOW))
+
+#	define USE_SOFT_CARRIER
+	// Define to use spin wait instead of delayMicros()
+//#	define USE_SPIN_WAIT
+#       undef USE_DEFAULT_ENABLE_IR_IN
+
+        // The default pin used used for sending.
+#	define SEND_PIN 9
+
+#elif defined(ESP32)
+        // No system LED on ESP32, disable blinking by NOT defining BLINKLED
+
+        // avr/interrupt.h is not present
+#       undef HAS_AVR_INTERRUPT_H
+
+        // Sending not implemented
+#       undef SENDING_SUPPORTED
+
+        // Supply own enbleIRIn
+#       undef USE_DEFAULT_ENABLE_IR_IN
+
 #else
 #	define BLINKLED        13
-	#define BLINKLED_ON()  (PORTB |= B00100000)
+#	define BLINKLED_ON()  (PORTB |= B00100000)
 #	define BLINKLED_OFF()  (PORTB &= B11011111)
 #endif

@@ -80,8 +131,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__)
@@ -110,7 +161,7 @@
 || 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
@@ -125,15 +176,21 @@

 // 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
+
+#elif defined(ARDUINO_ARCH_SAM) || defined(ARDUINO_ARCH_SAMD)
+	#define TIMER_PRESCALER_DIV 64
+
+#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

@@ -183,17 +240,17 @@

 //-----------------
 #if defined(CORE_OC2B_PIN)
-#	define TIMER_PWM_PIN  CORE_OC2B_PIN  // Teensy
+#	define SEND_PIN  CORE_OC2B_PIN  // Teensy
 #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#	define TIMER_PWM_PIN  9              // Arduino Mega
+#	define SEND_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
+#	define SEND_PIN  14             // MightyCore
 #else
-#	define TIMER_PWM_PIN  3              // Arduino Duemilanove, Diecimila, LilyPad, etc
+#	define SEND_PIN  3              // Arduino Duemilanove, Diecimila, LilyPad, etc
 #endif					     // ATmega48, ATmega88, ATmega168, ATmega328

 //---------------------------------------------------------
@@ -236,22 +293,22 @@

 //-----------------
 #if defined(CORE_OC1A_PIN)
-#	define TIMER_PWM_PIN  CORE_OC1A_PIN  // Teensy
+#	define SEND_PIN  CORE_OC1A_PIN  // Teensy
 #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#	define TIMER_PWM_PIN  11             // Arduino Mega
+#	define SEND_PIN  11             // Arduino Mega
 #elif defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__)
-#	define TIMER_PWM_PIN  13	     // MegaCore
+#	define SEND_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
+#	define SEND_PIN  13             // MightyCore
 #elif defined(__AVR_ATtiny84__)
-# 	define TIMER_PWM_PIN  6
+# 	define SEND_PIN  6
 #else
-#	define TIMER_PWM_PIN  9              // Arduino Duemilanove, Diecimila, LilyPad, etc
+#	define SEND_PIN  9              // Arduino Duemilanove, Diecimila, LilyPad, etc
 #endif					     // ATmega48, ATmega88, ATmega168, ATmega328

 //---------------------------------------------------------
@@ -283,11 +340,11 @@

 //-----------------
 #if defined(CORE_OC3A_PIN)
-#	define TIMER_PWM_PIN  CORE_OC3A_PIN  // Teensy
+#	define SEND_PIN  CORE_OC3A_PIN  // Teensy
 #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#	define TIMER_PWM_PIN  5              // Arduino Mega
+#	define SEND_PIN  5              // Arduino Mega
 #elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)
-#	define TIMER_PWM_PIN  6              // MightyCore
+#	define SEND_PIN  6              // MightyCore
 #else
 #	error "Please add OC3A pin number here\n"
 #endif
@@ -331,9 +388,9 @@

 //-----------------
 #if defined(CORE_OC4A_PIN)
-#	define TIMER_PWM_PIN  CORE_OC4A_PIN  // Teensy
+#	define SEND_PIN  CORE_OC4A_PIN  // Teensy
 #elif defined(__AVR_ATmega32U4__)
-#	define TIMER_PWM_PIN  13             // Leonardo
+#	define SEND_PIN  13             // Leonardo
 #else
 #	error "Please add OC4A pin number here\n"
 #endif
@@ -367,9 +424,9 @@

 //-----------------
 #if defined(CORE_OC4A_PIN)
-#	define TIMER_PWM_PIN  CORE_OC4A_PIN
+#	define SEND_PIN  CORE_OC4A_PIN
 #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#	define TIMER_PWM_PIN  6  // Arduino Mega
+#	define SEND_PIN  6  // Arduino Mega
 #else
 #	error "Please add OC4A pin number here\n"
 #endif
@@ -403,9 +460,9 @@

 //-----------------
 #if defined(CORE_OC5A_PIN)
-#	define TIMER_PWM_PIN  CORE_OC5A_PIN
+#	define SEND_PIN  CORE_OC5A_PIN
 #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#	define TIMER_PWM_PIN  46  // Arduino Mega
+#	define SEND_PIN  46  // Arduino Mega
 #else
 #	error "Please add OC5A pin number here\n"
 #endif
@@ -472,7 +529,7 @@
 	CMT_MSC    = 0x03;            \
 })

-#define TIMER_PWM_PIN  5
+#define SEND_PIN  5

 // defines for TPM1 timer on Teensy-LC
 #elif defined(IR_USE_TIMER_TPM1)
@@ -502,7 +559,7 @@
 	FTM1_C0V = 0;                                \
 	FTM1_SC = FTM_SC_CLKS(1) | FTM_SC_PS(0) | FTM_SC_TOF | FTM_SC_TOIE; \
 })
-#define TIMER_PWM_PIN        16
+#define SEND_PIN        16

 // defines for timer_tiny0 (8 bits)
 #elif defined(IR_USE_TIMER_TINY0)
@@ -536,7 +593,46 @@
 })
 #endif

-#define TIMER_PWM_PIN        1  /* ATtiny85 */
+#define SEND_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
+
+#ifdef ISR
+#	undef ISR
+#endif
+#define  ISR(f)  void IRTimer()
+
+#elif defined(ARDUINO_ARCH_SAM) || defined(ARDUINO_ARCH_SAMD)
+// use timer 3 hardcoded at this time
+
+#define TIMER_RESET
+#define TIMER_ENABLE_PWM     // Not presently used
+#define TIMER_DISABLE_PWM
+#define TIMER_ENABLE_INTR    NVIC_EnableIRQ(TC3_IRQn) // Not presently used
+#define TIMER_DISABLE_INTR   NVIC_DisableIRQ(TC3_IRQn)
+#define TIMER_INTR_NAME      TC3_Handler // Not presently used
+#define TIMER_CONFIG_KHZ(f)
+
+#ifdef ISR
+#	undef ISR
+#endif
+#define  ISR(f)  void irs()

 //---------------------------------------------------------
 // Unknown Timer
@@ -545,4 +641,13 @@
 #	error "Internal code configuration error, no known IR_USE_TIMER# defined\n"
 #endif

+// Provide default definitions, portable but possibly slower than necessary.
+#ifndef SENDPIN_ON
+#define SENDPIN_ON(pin)  digitalWrite(pin, HIGH)
+#endif
+
+#ifndef SENDPIN_OFF
+#define SENDPIN_OFF(pin) digitalWrite(pin, LOW)
+#endif
+
 #endif // ! boarddefs_h
--- a/src/sam.cpp
+++ b/src/sam.cpp
@@ -0,0 +1,101 @@
+// Support routines for SAM processor boards
+
+#include "IRremote.h"
+
+#if defined(ARDUINO_ARCH_SAM) || defined(ARDUINO_ARCH_SAMD)
+
+// "Idiot check"
+#ifdef USE_DEFAULT_ENABLE_IR_IN
+#error Must undef USE_DEFAULT_ENABLE_IR_IN
+#endif
+
+//+=============================================================================
+// ATSAMD Timer setup & IRQ functions
+//
+
+// following based on setup from GitHub jdneo/timerInterrupt.ino
+
+static void setTimerFrequency(int frequencyHz)
+{
+	int compareValue = (SYSCLOCK / (TIMER_PRESCALER_DIV * frequencyHz)) - 1;
+	//Serial.println(compareValue);
+	TcCount16* TC = (TcCount16*) TC3;
+	// Make sure the count is in a proportional position to where it was
+	// to prevent any jitter or disconnect when changing the compare value.
+	TC->COUNT.reg = map(TC->COUNT.reg, 0, TC->CC[0].reg, 0, compareValue);
+	TC->CC[0].reg = compareValue;
+	//Serial.print("COUNT.reg ");
+	//Serial.println(TC->COUNT.reg);
+	//Serial.print("CC[0].reg ");
+	//Serial.println(TC->CC[0].reg);
+	while (TC->STATUS.bit.SYNCBUSY == 1);
+}
+
+static void startTimer()
+{
+	REG_GCLK_CLKCTRL = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID_TCC2_TC3);
+	while (GCLK->STATUS.bit.SYNCBUSY == 1); // wait for sync
+
+	TcCount16* TC = (TcCount16*) TC3;
+
+	TC->CTRLA.reg &= ~TC_CTRLA_ENABLE;
+	while (TC->STATUS.bit.SYNCBUSY == 1); // wait for sync
+
+	// Use the 16-bit timer
+	TC->CTRLA.reg |= TC_CTRLA_MODE_COUNT16;
+	while (TC->STATUS.bit.SYNCBUSY == 1); // wait for sync
+
+	// Use match mode so that the timer counter resets when the count matches the compare register
+	TC->CTRLA.reg |= TC_CTRLA_WAVEGEN_MFRQ;
+	while (TC->STATUS.bit.SYNCBUSY == 1); // wait for sync
+
+	// Set prescaler to 1024
+	//TC->CTRLA.reg |= TC_CTRLA_PRESCALER_DIV1024;
+	TC->CTRLA.reg |= TC_CTRLA_PRESCALER_DIV64;
+	while (TC->STATUS.bit.SYNCBUSY == 1); // wait for sync
+
+	setTimerFrequency(1000000 / USECPERTICK);
+	
+	// Enable the compare interrupt
+	TC->INTENSET.reg = 0;
+	TC->INTENSET.bit.MC0 = 1;
+
+	NVIC_EnableIRQ(TC3_IRQn);
+
+	TC->CTRLA.reg |= TC_CTRLA_ENABLE;
+	while (TC->STATUS.bit.SYNCBUSY == 1); // wait for sync
+}
+
+//+=============================================================================
+// initialization
+//
+
+void IRrecv::enableIRIn()
+{
+	// Interrupt Service Routine - Fires every 50uS
+	//Serial.println("Starting timer");
+	startTimer();
+	//Serial.println("Started timer");
+
+	// Initialize state machine variables
+	irparams.rcvstate = STATE_IDLE;
+	irparams.rawlen = 0;
+
+	// Set pin modes
+	pinMode(irparams.recvpin, INPUT);
+}
+
+void irs(); // Defined in IRRemote as ISR(TIMER_INTR_NAME)
+
+void TC3_Handler(void)
+{
+	TcCount16* TC = (TcCount16*) TC3;
+	// If this interrupt is due to the compare register matching the timer count
+	// we toggle the LED.
+	if (TC->INTFLAG.bit.MC0 == 1) {
+		TC->INTFLAG.bit.MC0 = 1;
+		irs();
+	}
+}
+
+#endif // defined(ARDUINO_ARCH_SAM) || defined(ARDUINO_ARCH_SAMD)
Author	SHA1	Message	Date
Rafi Khan	742f72fd0a	Merge branch 'beta' of https://github.com/z3t0/Arduino-IRremote into beta	2017-09-23 23:16:52 -04:00
Rafi Khan	3ab30887f4	Merge branch 'LarsWH-master' into beta	2017-09-23 23:15:34 -04:00
Rafi Khan	bdb9f1c1f5	Added support for RC5 extended Credits: https://github.com/LarsWH Excerpt from PR: ``` Hi, I added support for 'RC5 extended' in order to make this project: https://www.instructables.com/id/Remote-Control-for-Lava-mMotion-Swing-Mounting-Bra/ The modification is working nicely in this single application. It has not been tested elsewhere. (I am new to Git and this is my first pull request ever. So please excuse me if I have messed something up) Kind regards, Lars ``` Merged #522	2017-09-23 21:03:07 -04:00
Rafi Khan	71f6daca4f	Revert "Merge pull request #519 from PaulStoffregen/master" This reverts commit `20a4d97f61`, reversing changes made to `47aadf559d`.	2017-09-14 22:13:50 -04:00
Rafi Khan	2b3188e40a	Merge branch 'master' of https://github.com/z3t0/Arduino-IRremote	2017-09-14 21:57:46 -04:00
Rafi Khan	d719c27f95	Changed default send pin on ATmega32u4 from 13 to 9 The reason for this change is that I was informed by a community member that the Pro Micro board does not have the default pin 13. This causes many issues for beginners that are not familiar with the inner workings of the library. However, I am concerned about this being a breaking change. If there are serious issues I may just end up adding a tutorial in the FAQ for beginners, informing them how they may change the default pins.	2017-09-14 21:57:01 -04: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
Rafi Khan	d2939e2366	Updated README.md for API doc. (#515 ) Credits: @bengtmartensson	2017-09-06 20:59:17 -06:00
PaulStoffregen	1154607b69	Fix minor compiler warnings in examples	2017-09-04 20:48:37 -07:00
Bengt Martensson	c6a2fcd8c9	Updated README.md for API doc.	2017-08-27 13:41:28 +02:00
Bengt Martensson	e206e122e5	Doxygen API documentation in the sense of #461 (#512 ) * new file: Doxyfile; #461. * Doxygen related documentation to two files. (Not complete.) #461.	2017-08-23 13:57:05 -06:00
Rafi Khan	5bbd55c650	Fix #510	2017-08-22 15:47:20 -06:00
Bengt Martensson	24dd940107	Moving private includes to sub-directory, #464 (#507 ) * Add missing "paragraph" to library.properties. * Move not-to-be-exported includes to subdirectory. Remove #include "IRremoteInt.h" from a number of files since it now does not work any more, and since IRremote.h #includes it already. This resolves #464. * Remove #include <IRremoteInt.h> from examples, too. * Make ir_Lego_PF_BitStreamEncoder.h exported (again). * Revoked fe24095 (paragraph) to keep 1-1 correspondance to #464.	2017-08-20 15:49:57 -06:00
Bengt Martensson	7245efd2f5	Fix some minor problems in boarddefs.h and IRremote.cpp (#505 ) * Removed some trailing spaces in IRremote.cpp. * IRremote.cpp: fix some compiler warnings (-Wall -Wextra). Remark: braces necessitated by the macro nature of DBG_PRINTLN. * boarddefs.h: removed spurious #. Nuked trailing spaces. Credits: bengtmartensson	2017-08-17 17:32:01 -06:00
Rafi Khan	4eb95a3272	Revert "Removed blinking led" This reverts commit `a406f3b9f9`.	2017-08-14 17:12:02 -06:00
Rafi Khan	542516f116	Revert "Removed pronto "protocol"" This reverts commit `563c82c6c4`.	2017-08-13 12:03:54 -06:00
Rafi Khan	563c82c6c4	Removed pronto "protocol" Fixes #466	2017-08-13 11:46:58 -06:00
Rafi Khan	a406f3b9f9	Removed blinking led It is difficult to maintain this over different architectures and also not entirely that useful. Fixes #462	2017-08-13 11:43:32 -06:00
Rafi Khan	31968a4875	Removed redundant preprocessor directives In the newer versions of the IDE it is sufficient to simply include the Arduino.h header file. Fixes #463	2017-08-13 11:30:06 -06:00
Rafi Khan	635e8a923d	Restructuring directory as per #464	2017-08-13 11:19:20 -06:00
Rafi Khan	b0d15b6020	Modified library.json	2017-08-13 11:05:50 -06:00
Rafi Khan	622e28bf69	Update library.properties	2017-08-13 11:05:12 -06:00
Rafi Khan	e1768b4deb	Added changelog info	2017-08-10 17:01:44 -06:00
Rafi Khan	679348568d	merge #437	2017-08-10 16:57:54 -06: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