Revert "Added ESP32 IR receive support (IRsend not implemented yet)."

Added ESP32 IR receive support (IRsend not implemented yet).

Contributors.md

@@ -16,7 +16,7 @@ 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
 
 Note: This list is being updated constantly so please let [z3t0](https://github.com/z3t0) know if you have been missed.

IRremote.cpp

@@ -22,7 +22,7 @@
 
 // Defining IR_GLOBAL here allows us to declare the instantiation of global variables
 #define IR_GLOBAL
-#	include "AIRremote.h"
+#	include "IRremote.h"
 #	include "IRremoteInt.h"
 #undef IR_GLOBAL
 

IRremote.h

@@ -15,8 +15,8 @@
 // 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

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!

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.
@@ -65,7 +65,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)

changelog.md

@@ -1,3 +1,9 @@
+## 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)
 

examples/AiwaRCT501SendDemo/AiwaRCT501SendDemo.ino

@@ -6,7 +6,7 @@
  * http://arcfn.com
  */
 
-#include "AIRremote.h"
+#include "IRremote.h"
 
 #define POWER 0x7F80
 #define AIWA_RC_T501

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);
   }

examples/IRrecvDemo/IRrecvDemo.ino

@@ -6,7 +6,7 @@
  * http://arcfn.com
  */
 
-#include <AIRremote.h>
+#include <IRremote.h>
 
 int RECV_PIN = 11;
 

examples/IRrecvDump/IRrecvDump.ino

@@ -8,7 +8,7 @@
  * LG added by Darryl Smith (based on the JVC protocol)
  */
 
-#include <AIRremote.h>
+#include <IRremote.h>
 
 /* 
 *  Default is Arduino pin D11. 

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;
   }
 

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;

examples/IRremoteInfo/IRremoteInfo.ino

@@ -11,7 +11,7 @@
  */
 
 
-#include <AIRremote.h>
+#include <IRremote.h>
 
 void setup()
 {
@@ -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"));
 }

examples/IRsendDemo/IRsendDemo.ino

@@ -7,7 +7,7 @@
  */
 
 
-#include <AIRremote.h>
+#include <IRremote.h>
 
 IRsend irsend;
 

examples/IRsendRawDemo/IRsendRawDemo.ino

@@ -18,7 +18,7 @@
  */
 
 
-#include <AIRremote.h>
+#include <IRremote.h>
 
 IRsend irsend;
 

examples/IRtest/IRtest.ino

@@ -4,12 +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 <IRremote.h>
 #include <IRremoteInt.h>
 
 // Dumps out the decode_results structure.

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;

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

examples/LGACSendDemo/LGACSendDemo.ino

@@ -1,4 +1,4 @@
-#include <AIRremote.h>
+#include <IRremote.h>
 #include <Wire.h>
 
 

examples/LegoPowerFunctionsSendDemo/LegoPowerFunctionsSendDemo.ino

@@ -3,7 +3,7 @@
  * Copyright (c) 2016 Philipp Henkel
  */
 
-#include <AIRremote.h>
+#include <IRremote.h>
 #include <IRremoteInt.h>
 
 IRsend irsend;

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);
 }
-
-
-
-

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
 
 //+=============================================================================

irRecv.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //+=============================================================================

irSend.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //+=============================================================================

ir_Aiwa.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

ir_Denon.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 // Reverse Engineered by looking at RAW dumps generated by IRremote

ir_Dish.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

ir_JVC.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

ir_LG.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

ir_Lego_PF.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 #include "ir_Lego_PF_BitStreamEncoder.h"
 

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;
     }

ir_Mitsubishi.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

ir_NEC.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

ir_Panasonic.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

ir_RC5_RC6.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //+=============================================================================

ir_Samsung.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

ir_Sanyo.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

ir_Sharp.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

ir_Sony.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

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,7 +91,7 @@ Regards,
   BlueChip
 */
 
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

ir_Whynter.cpp

@@ -1,4 +1,4 @@
-#include "AIRremote.h"
+#include "IRremote.h"
 #include "IRremoteInt.h"
 
 //==============================================================================

library.json

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

library.properties

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