Split the library into smaller separate files similar to upstream. (#196

) - Enable #define flags to enable/disable protocols as needed. - No material changes to program flow etc were made. - Tonnes & tonnes of modifications to support the new structure. - Loads of comments added/changed. - Changes to #include order, and correct mistaken usage of #include <> vs. #include "" per c++ library writting guides. - Move directories and location to make it work with both Platformio and the Arduino IDE. - Update platform.ini files for new dir structure. - Update Travis for new path.
crankyoldgit · May 7, 2017 · 2b96fc7 · 2b96fc7
1 parent 178b09d
commit 2b96fc7
Show file tree

Hide file tree

Showing 64 changed files with 5,049 additions and 4,546 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ before_install:
   - sudo ln -s /usr/local/share/arduino/arduino /usr/local/bin/arduino
   - wget https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py
 install:
-  - ln -s $PWD/lib/IRremoteESP8266 /usr/local/share/arduino/libraries/
+  - ln -s $PWD /usr/local/share/arduino/libraries/
   - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs
   - arduino --install-boards esp8266:esp8266
   - arduino --board $BD --save-prefs

diff --git a/CPPLINT.cfg b/CPPLINT.cfg
@@ -1,3 +1,3 @@
 set noparent
-root=lib/IRremoteESP8266
+root=src
 linelength=80
diff --git a/examples/IRGCSendDemo/IRGCSendDemo.ino b/examples/IRGCSendDemo/IRGCSendDemo.ino
@@ -10,7 +10,7 @@
  * http://arcfn.com
  */
 
-#include <IRremoteESP8266.h>
+#include <IRsend.h>
 
 // Codes are in Global Cache format less the emitter ID and request ID.
 // These codes can be found in GC's Control Tower database.

diff --git a/examples/IRGCSendDemo/platformio.ini b/examples/IRGCSendDemo/platformio.ini
@@ -1,7 +1,6 @@
 [platformio]
-lib_extra_dirs = ../../lib/
+lib_extra_dirs = ../../
 src_dir=.
-;lib_dir=~/Arduino/libraries
 
 [common]
 build_flags =

diff --git a/examples/IRGCTCPServer/IRGCTCPServer.ino b/examples/IRGCTCPServer/IRGCTCPServer.ino
@@ -7,10 +7,8 @@
  * Example command - Samsung TV power toggle: 38000,1,1,170,170,20,63,20,63,20,63,20,20,20,20,20,20,20,20,20,20,20,63,20,63,20,63,20,20,20,20,20,20,20,20,20,20,20,20,20,63,20,20,20,20,20,20,20,20,20,20,20,20,20,63,20,20,20,63,20,63,20,63,20,63,20,63,20,63,20,1798\r\n
  */
 
-#include <IRremoteESP8266.h>
-#include <IRremoteInt.h>
-
 #include <ESP8266WiFi.h>
+#include <IRsend.h>
 #include <WiFiClient.h>
 #include <WiFiServer.h>
 

diff --git a/examples/IRGCTCPServer/platformio.ini b/examples/IRGCTCPServer/platformio.ini
@@ -1,7 +1,6 @@
 [platformio]
-lib_extra_dirs = ../../lib/
+lib_extra_dirs = ../../
 src_dir=.
-;lib_dir=~/Arduino/libraries
 
 [common]
 build_flags =

diff --git a/examples/IRServer/IRServer.ino b/examples/IRServer/IRServer.ino
@@ -6,10 +6,10 @@
  */
 
 #include <ESP8266WiFi.h>
-#include <WiFiClient.h>
 #include <ESP8266WebServer.h>
 #include <ESP8266mDNS.h>
-#include <IRremoteESP8266.h>
+#include <IRsend.h>
+#include <WiFiClient.h>
 
 const char* ssid = ".....";
 const char* password = ".....";

diff --git a/examples/IRServer/platformio.ini b/examples/IRServer/platformio.ini
@@ -1,7 +1,6 @@
 [platformio]
-lib_extra_dirs = ../../lib/
+lib_extra_dirs = ../../
 src_dir=.
-;lib_dir=~/Arduino/libraries
 
 [common]
 build_flags =

diff --git a/examples/IRrecvDemo/IRrecvDemo.ino b/examples/IRrecvDemo/IRrecvDemo.ino
@@ -7,7 +7,7 @@
  * Copyright 2009 Ken Shirriff, http://arcfn.com
  */
 
-#include <IRremoteESP8266.h>
+#include <IRrecv.h>
 
 // an IR detector/demodulator is connected to GPIO pin 2
 uint16_t RECV_PIN = 2;

diff --git a/examples/IRrecvDemo/platformio.ini b/examples/IRrecvDemo/platformio.ini
@@ -1,7 +1,6 @@
 [platformio]
-lib_extra_dirs = ../../lib/
+lib_extra_dirs = ../../
 src_dir=.
-;lib_dir=~/Arduino/libraries
 
 [common]
 build_flags =

diff --git a/examples/IRrecvDump/IRrecvDump.ino b/examples/IRrecvDump/IRrecvDump.ino
@@ -9,7 +9,7 @@
  * LG added by Darryl Smith (based on the JVC protocol)
  */
 
-#include <IRremoteESP8266.h>
+#include <IRrecv.h>
 
 // an IR detector/demodulator is connected to GPIO pin 2
 uint16_t RECV_PIN = 2;

diff --git a/examples/IRrecvDump/platformio.ini b/examples/IRrecvDump/platformio.ini
@@ -1,7 +1,6 @@
 [platformio]
-lib_extra_dirs = ../../lib/
+lib_extra_dirs = ../../
 src_dir=.
-;lib_dir=~/Arduino/libraries
 
 [common]
 build_flags =

diff --git a/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/examples/IRrecvDumpV2/IRrecvDumpV2.ino
@@ -10,7 +10,7 @@
  * Based on Ken Shirriff's IrsendDemo Version 0.1 July, 2009, Copyright 2009 Ken Shirriff, http://arcfn.com
  */
 
-#include <IRremoteESP8266.h>
+#include <IRrecv.h>
 
 // An IR detector/demodulator is connected to GPIO pin 14(D5 on a NodeMCU
 // board).

diff --git a/examples/IRrecvDumpV2/platformio.ini b/examples/IRrecvDumpV2/platformio.ini
@@ -1,7 +1,6 @@
 [platformio]
-lib_extra_dirs = ../../lib/
+lib_extra_dirs = ../../
 src_dir=.
-;lib_dir=~/Arduino/libraries
 
 [common]
 build_flags =

diff --git a/examples/IRsendDemo/IRsendDemo.ino b/examples/IRsendDemo/IRsendDemo.ino
@@ -27,7 +27,7 @@
  *     for your first time. e.g. ESP-12 etc.
  */
 
-#include <IRremoteESP8266.h>
+#include <IRsend.h>
 
 IRsend irsend(4);  // an IR led is connected to GPIO pin 4 (D2)
 

diff --git a/examples/IRsendDemo/platformio.ini b/examples/IRsendDemo/platformio.ini
@@ -1,7 +1,6 @@
 [platformio]
-lib_extra_dirs = ../../lib/
+lib_extra_dirs = ../../
 src_dir=.
-;lib_dir=~/Arduino/libraries
 
 [common]
 build_flags =

diff --git a/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino b/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
@@ -5,7 +5,7 @@
  * Based on Ken Shirriff's IrsendDemo Version 0.1 July, 2009, Copyright 2009 Ken Shirriff, http://arcfn.com
  * JVC and Panasonic protocol added by Kristian Lauszus (Thanks to zenwheel and other people at the original blog post)
  */
-#include <IRremoteESP8266.h>
+#include <IRsend.h>
 
 #define PanasonicAddress      0x4004     // Panasonic address (Pre data)
 #define PanasonicPower        0x100BCBD  // Panasonic Power button

diff --git a/examples/JVCPanasonicSendDemo/platformio.ini b/examples/JVCPanasonicSendDemo/platformio.ini
@@ -1,7 +1,6 @@
 [platformio]
-lib_extra_dirs = ../../lib/
+lib_extra_dirs = ../../
 src_dir=.
-;lib_dir=~/Arduino/libraries
 
 [common]
 build_flags =

diff --git a/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino b/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
@@ -1,5 +1,6 @@
 /* Copyright 2016 sillyfrog */
-#include <IRDaikinESP.h>
+#include <IRsend.h>
+#include <ir_Daikin.h>
 
 IRDaikinESP dakinir(D1);
 
@@ -12,7 +13,7 @@ void setup() {
 void loop() {
   Serial.println("Sending...");
 
-  // Set up what we want to send. See IRDaikinESP.cpp for all the options.
+  // Set up what we want to send. See ir_Daikin.cpp for all the options.
   dakinir.on();
   dakinir.setFan(1);
   dakinir.setMode(DAIKIN_COOL);

diff --git a/examples/TurnOnDaikinAC/platformio.ini b/examples/TurnOnDaikinAC/platformio.ini
@@ -1,7 +1,6 @@
 [platformio]
-lib_extra_dirs = ../../lib/
+lib_extra_dirs = ../../
 src_dir=.
-;lib_dir=~/Arduino/libraries
 
 [common]
 build_flags =

diff --git a/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino b/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
@@ -1,5 +1,6 @@
 /* Copyright 2016 David Conran */
-#include <IRKelvinator.h>
+#include <IRsend.h>
+#include <ir_Kelvinator.h>
 
 IRKelvinatorAC kelvir(D1);  // IR led controlled by Pin D1.
 
@@ -27,7 +28,7 @@ void setup() {
   Serial.begin(115200);
   delay(200);
 
-  // Set up what we want to send. See IRKelvinator.cpp for all the options.
+  // Set up what we want to send. See ir_Kelvinator.cpp for all the options.
   // Most things default to off.
   Serial.println("Default state of the remote.");
   printState();

diff --git a/examples/TurnOnKelvinatorAC/platformio.ini b/examples/TurnOnKelvinatorAC/platformio.ini
@@ -1,5 +1,5 @@
 [platformio]
-lib_extra_dirs = ../../lib/
+lib_extra_dirs = ../../
 src_dir=.
 
 [common]

diff --git a/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino b/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
@@ -1,6 +1,6 @@
 /* Copyright 2017 David Conran */
-
-#include <IRMitsubishiAC.h>
+#include <IRsend.h>
+#include <ir_Mitsubishi.h>
 
 IRMitsubishiAC mitsubir(D1);  // IR led controlled by Pin D1.
 
@@ -24,7 +24,7 @@ void setup() {
   Serial.begin(115200);
   delay(200);
 
-  // Set up what we want to send. See IRMitsubishiAC.cpp for all the options.
+  // Set up what we want to send. See ir_Mitsubishi.cpp for all the options.
   Serial.println("Default state of the remote.");
   printState();
   Serial.println("Setting desired state for A/C.");

diff --git a/examples/TurnOnMitsubishiAC/platformio.ini b/examples/TurnOnMitsubishiAC/platformio.ini
@@ -1,7 +1,6 @@
 [platformio]
-lib_extra_dirs = ../../lib/
+lib_extra_dirs = ../../
 src_dir=.
-;lib_dir=~/Arduino/libraries
 
 [common]
 build_flags =

diff --git a/lib/IRremoteESP8266/IRDaikinESP.cpp b/lib/IRremoteESP8266/IRDaikinESP.cpp