diff --git a/lib/IRremoteESP8266-2.6.3.10/.github/CONTRIBUTING.md b/lib/IRremoteESP8266-2.6.4/.github/CONTRIBUTING.md
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/.github/CONTRIBUTING.md
rename to lib/IRremoteESP8266-2.6.4/.github/CONTRIBUTING.md
diff --git a/lib/IRremoteESP8266-2.6.3.10/.github/Contributors.md b/lib/IRremoteESP8266-2.6.4/.github/Contributors.md
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/.github/Contributors.md
rename to lib/IRremoteESP8266-2.6.4/.github/Contributors.md
diff --git a/lib/IRremoteESP8266-2.6.3.10/.github/issue_template.md b/lib/IRremoteESP8266-2.6.4/.github/issue_template.md
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/.github/issue_template.md
rename to lib/IRremoteESP8266-2.6.4/.github/issue_template.md
diff --git a/lib/IRremoteESP8266-2.6.3.10/.gitignore b/lib/IRremoteESP8266-2.6.4/.gitignore
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/.gitignore
rename to lib/IRremoteESP8266-2.6.4/.gitignore
diff --git a/lib/IRremoteESP8266-2.6.3.10/.gitmodules b/lib/IRremoteESP8266-2.6.4/.gitmodules
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/.gitmodules
rename to lib/IRremoteESP8266-2.6.4/.gitmodules
diff --git a/lib/IRremoteESP8266-2.6.3.10/.style.yapf b/lib/IRremoteESP8266-2.6.4/.style.yapf
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/.style.yapf
rename to lib/IRremoteESP8266-2.6.4/.style.yapf
diff --git a/lib/IRremoteESP8266-2.6.3.10/.travis.yml b/lib/IRremoteESP8266-2.6.4/.travis.yml
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/.travis.yml
rename to lib/IRremoteESP8266-2.6.4/.travis.yml
diff --git a/lib/IRremoteESP8266-2.6.3.10/CPPLINT.cfg b/lib/IRremoteESP8266-2.6.4/CPPLINT.cfg
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/CPPLINT.cfg
rename to lib/IRremoteESP8266-2.6.4/CPPLINT.cfg
diff --git a/lib/IRremoteESP8266-2.6.3.10/LICENSE.txt b/lib/IRremoteESP8266-2.6.4/LICENSE.txt
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/LICENSE.txt
rename to lib/IRremoteESP8266-2.6.4/LICENSE.txt
diff --git a/lib/IRremoteESP8266-2.6.3.10/README.md b/lib/IRremoteESP8266-2.6.4/README.md
similarity index 98%
rename from lib/IRremoteESP8266-2.6.3.10/README.md
rename to lib/IRremoteESP8266-2.6.4/README.md
index f3249b801..4aa0093c6 100644
--- a/lib/IRremoteESP8266-2.6.3.10/README.md
+++ b/lib/IRremoteESP8266-2.6.4/README.md
@@ -9,8 +9,8 @@
 This library enables you to **send _and_ receive** infra-red signals on an [ESP8266](https://github.com/esp8266/Arduino) or an
 [ESP32](https://github.com/espressif/arduino-esp32) using the [Arduino framework](https://www.arduino.cc/) using common 940nm IR LEDs and common IR receiver modules. e.g. TSOP{17,22,24,36,38,44,48}* demodulators etc.
 
-## v2.6.3 Now Available
-Version 2.6.3 of the library is now [available](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). You can view the [Release Notes](ReleaseNotes.md) for all the significant changes.
+## v2.6.4 Now Available
+Version 2.6.4 of the library is now [available](https://github.com/crankyoldgit/IRremoteESP8266/releases/latest). You can view the [Release Notes](ReleaseNotes.md) for all the significant changes.
 
 #### Upgrading from pre-v2.0
 Usage of the library has been slightly changed in v2.0. You will need to change your usage to work with v2.0 and beyond. You can read more about the changes required on our [Upgrade to v2.0](https://github.com/crankyoldgit/IRremoteESP8266/wiki/Upgrading-to-v2.0) page.
diff --git a/lib/IRremoteESP8266-2.6.3.10/ReleaseNotes.md b/lib/IRremoteESP8266-2.6.4/ReleaseNotes.md
similarity index 93%
rename from lib/IRremoteESP8266-2.6.3.10/ReleaseNotes.md
rename to lib/IRremoteESP8266-2.6.4/ReleaseNotes.md
index 17e92adbf..1526303a2 100644
--- a/lib/IRremoteESP8266-2.6.3.10/ReleaseNotes.md
+++ b/lib/IRremoteESP8266-2.6.4/ReleaseNotes.md
@@ -1,5 +1,33 @@
 # Release Notes
 
+## _v2.6.4 (20190726)_
+
+**[Bug Fixes]**
+- Fix some swing problems with the Mitsubishi HAVC protocol (#831)
+- Fix parameter ordering for Gree in common a/c code. (#815)
+- Fix parameters for Coolix in IRac::sendAc() (#829)
+- IRMQTTServer: Fix sending >64 bit codes. (#811)
+
+**[Features]**
+- Daikin128: Full detailed support & common a/c support. (#832)
+- Midea: Support native temp units of Celsius & SwingV. (#823)
+- Gree: Support `YBOFB` models and bug fix. (#815)
+- Pioneer: Fix sendPioneer with Pioneer specific timings (#830)
+- Daikin128: Initial support for Daikin 17 Series/BRC52B63 (#828)
+- Coolix: Better `toCommon()` support. (#825)
+- Experimental detailed support for Daikin 176 bits (#816)
+- Add setting of output options to A/C classes. (#808)
+- Add invert flag support to Samsung AC (#807)
+
+**[Misc]**
+- Daikin176: making some change on Daikin176 to work with IRMQTTServer (#826)
+- Reduce duplicate code to save (3K+) space. (#813)
+- Daikin176: Experiment Daikin176bits with IRMQTTServer (#824)
+- Update platformio.ini files for PlatformIO v4.0.0 (#812)
+- Change repo URLs to new location. (#806)
+- Move `htmlEscape()` to the IRutils namespace (#801)
+
+
 ## _v2.6.3 (20190704)_
 
 **[Bug Fixes]**
diff --git a/lib/IRremoteESP8266-2.6.3.10/SupportedProtocols.md b/lib/IRremoteESP8266-2.6.4/SupportedProtocols.md
similarity index 88%
rename from lib/IRremoteESP8266-2.6.3.10/SupportedProtocols.md
rename to lib/IRremoteESP8266-2.6.4/SupportedProtocols.md
index 2438abfeb..9d297d523 100644
--- a/lib/IRremoteESP8266-2.6.3.10/SupportedProtocols.md
+++ b/lib/IRremoteESP8266-2.6.4/SupportedProtocols.md
@@ -1,6 +1,6 @@
 <!--- WARNING: Do NOT edit this file directly.
       It is generated by './tools/scrape_supported_devices.py'.
-      Last generated: Thu Jul  4 13:48:54 2019 --->
+      Last generated: Fri Jul 26 17:01:16 2019 --->
 # IR Protocols supported by this library
 
 | Protocol | Brand | Model | A/C Model | Detailed A/C Support |
@@ -10,7 +10,7 @@
 | [Carrier](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Carrier.cpp) | **Carrier/Surrey** | 42QG5A55970 remote<BR>53NGK009/012 Inverter<BR>619EGX0090E0 A/C<BR>619EGX0120E0 A/C<BR>619EGX0180E0 A/C<BR>619EGX0220E0 A/C |  | - |
 | [Coolix](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.cpp) | **[Beko](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.h)** | BINR 070/071 split-type A/C<BR>BINR 070/071 split-type A/C<BR>RG57K7(B)/BGEF Remote<BR>RG57K7(B)/BGEF Remote |  | Yes |
 | [Coolix](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.cpp) | **[Midea](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Coolix.h)** | MS12FU-10HRDN1-QRD0GW(B) A/C<BR>MS12FU-10HRDN1-QRD0GW(B) A/C<BR>MSABAU-07HRFN1-QRD0GW A/C (circa 2016)<BR>MSABAU-07HRFN1-QRD0GW A/C (circa 2016)<BR>RG52D/BGE Remote<BR>RG52D/BGE Remote |  | Yes |
-| [Daikin](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Daikin.cpp) | **[Daikin](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Daikin.h)** | ARC423A5 remote<BR>ARC433** remote<BR>ARC433B69 remote<BR>ARC477A1 remote<BR>FTE12HV2S A/C<BR>FTXZ25NV1B A/C<BR>FTXZ35NV1B A/C<BR>FTXZ50NV1B A/C |  | Yes |
+| [Daikin](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Daikin.cpp) | **[Daikin](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Daikin.h)** | 17 Series A/C (DAIKIN128)<BR>ARC423A5 remote<BR>ARC433** remote<BR>ARC433B69 remote<BR>ARC477A1 remote<BR>BRC4C153 remote<BR>BRC52B63 remote (DAIKIN128)<BR>FTE12HV2S A/C<BR>FTXB09AXVJU A/C (DAIKIN128)<BR>FTXB12AXVJU A/C (DAIKIN128)<BR>FTXZ25NV1B A/C<BR>FTXZ35NV1B A/C<BR>FTXZ50NV1B A/C |  | Yes |
 | [Denon](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Denon.cpp) | **Unknown** |  |  | - |
 | [Dish](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Dish.cpp) | **DISH NETWORK** | echostar 301 |  | - |
 | [Electra](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Electra.cpp) | **[AUX](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Electra.h)** | KFR-35GW/BpNFW=3 A/C<BR>YKR-T/011 remote |  | Yes |
@@ -19,13 +19,15 @@
 | [GICable](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_GICable.cpp) | **Unknown** |  |  | - |
 | [GlobalCache](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_GlobalCache.cpp) | **Unknown** |  |  | - |
 | [Goodweather](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Goodweather.cpp) | **[Goodweather](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Goodweather.h)** | ZH/JT-03 remote |  | Yes |
-| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[EKOKAI](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | A/C |  | Yes |
-| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[RusClimate](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | EACS/I-09HAR_X/N3 A/C<BR>YAW1F remote |  | Yes |
-| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[Ultimate](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | Heat Pump |  | Yes |
+| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[EKOKAI](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | A/C | YAW1F<BR>YBOFB | Yes |
+| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[Green](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | YBOFB remote<BR>YBOFB2 remote | YAW1F<BR>YBOFB | Yes |
+| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[RusClimate](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | EACS/I-09HAR_X/N3 A/C<BR>YAW1F remote | YAW1F<BR>YBOFB | Yes |
+| [Gree](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.cpp) | **[Ultimate](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Gree.h)** | Heat Pump | YAW1F<BR>YBOFB | Yes |
 | [Haier](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Haier.cpp) | **[Haier](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Haier.h)** | HSU-09HMC203 A/C<BR>HSU07-HEA03 remote<BR>YR-W02 remote |  | Yes |
 | [Hitachi](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Hitachi.cpp) | **[Hitachi](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Hitachi.h)** | LT0541-HTA remote<BR>RAS-35THA6 remote<BR>Series VI A/C (Circa 2007) |  | Yes |
 | [Inax](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Inax.cpp) | **Lixil** | Inax DT-BA283 Toilet |  | - |
 | [JVC](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_JVC.cpp) | **Unknown** |  |  | - |
+| [Kelvinator](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Kelvinator.cpp) | **[Green](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Kelvinator.h)** | YAPOF3 remote |  | Yes |
 | [Kelvinator](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Kelvinator.cpp) | **[Kelvinator](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Kelvinator.h)** | KSV26CRC A/C<BR>KSV26HRC A/C<BR>KSV35CRC A/C<BR>KSV35HRC A/C<BR>KSV53HRC A/C<BR>KSV62HRC A/C<BR>KSV70CRC A/C<BR>KSV70HRC A/C<BR>KSV80HRC A/C<BR>YALIF Remote |  | Yes |
 | [LG](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_LG.cpp) | **[LG](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_LG.h)** | 6711A20083V remote<BR>6711A20083V remote<BR>AKB74395308 remote<BR>AKB74395308 remote |  | Yes |
 | [Lasertag](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Lasertag.cpp) | **Unknown** |  |  | - |
@@ -33,6 +35,8 @@
 | [Lutron](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Lutron.cpp) | **Unknown** |  |  | - |
 | [MWM](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_MWM.cpp) | **Unknown** |  |  | - |
 | [Magiquest](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Magiquest.cpp) | **[Unknown](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Magiquest.h)** |  |  | Yes |
+| [Midea](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.cpp) | **[Comfee](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.h)** | MPD1-12CRN7 A/C |  | Yes |
+| [Midea](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.cpp) | **[Keystone](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.h)** | RG57H4(B)BGEF remote |  | Yes |
 | [Midea](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.cpp) | **[Pioneer System](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Midea.h)** | RUBO18GMFILCAD A/C (18K BTU)<BR>RYBO12GMFILCAD A/C (12K BTU) |  | Yes |
 | [Mitsubishi](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Mitsubishi.cpp) | **[Mitsubishi](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_Mitsubishi.h)** | HC3000 Projector<BR>TV |  | Yes |
 | [MitsubishiHeavy](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_MitsubishiHeavy.cpp) | **[Mitsubishi Heavy Industries](https://github.com/crankyoldgit/IRremoteESP8266/blob/master/src/ir_MitsubishiHeavy.h)** | RKX502A001C remote<BR>RLA502A700B remote<BR>SRKxxZJ-S A/C<BR>SRKxxZM-S A/C<BR>SRKxxZMXA-S A/C |  | Yes |
@@ -73,7 +77,9 @@
 - CARRIER_AC
 - COOLIX
 - DAIKIN
+- DAIKIN128
 - DAIKIN160
+- DAIKIN176
 - DAIKIN2
 - DAIKIN216
 - DENON
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/ControlSamsungAC/ControlSamsungAC.ino b/lib/IRremoteESP8266-2.6.4/examples/ControlSamsungAC/ControlSamsungAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/ControlSamsungAC/ControlSamsungAC.ino
rename to lib/IRremoteESP8266-2.6.4/examples/ControlSamsungAC/ControlSamsungAC.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/ControlSamsungAC/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/ControlSamsungAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/ControlSamsungAC/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/ControlSamsungAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/DumbIRRepeater/DumbIRRepeater.ino b/lib/IRremoteESP8266-2.6.4/examples/DumbIRRepeater/DumbIRRepeater.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/DumbIRRepeater/DumbIRRepeater.ino
rename to lib/IRremoteESP8266-2.6.4/examples/DumbIRRepeater/DumbIRRepeater.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/DumbIRRepeater/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/DumbIRRepeater/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/DumbIRRepeater/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/DumbIRRepeater/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRGCSendDemo/IRGCSendDemo.ino b/lib/IRremoteESP8266-2.6.4/examples/IRGCSendDemo/IRGCSendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRGCSendDemo/IRGCSendDemo.ino
rename to lib/IRremoteESP8266-2.6.4/examples/IRGCSendDemo/IRGCSendDemo.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRGCSendDemo/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/IRGCSendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRGCSendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/IRGCSendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRGCTCPServer/IRGCTCPServer.ino b/lib/IRremoteESP8266-2.6.4/examples/IRGCTCPServer/IRGCTCPServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRGCTCPServer/IRGCTCPServer.ino
rename to lib/IRremoteESP8266-2.6.4/examples/IRGCTCPServer/IRGCTCPServer.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRGCTCPServer/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/IRGCTCPServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRGCTCPServer/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/IRGCTCPServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRMQTTServer/IRMQTTServer.h b/lib/IRremoteESP8266-2.6.4/examples/IRMQTTServer/IRMQTTServer.h
similarity index 99%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRMQTTServer/IRMQTTServer.h
rename to lib/IRremoteESP8266-2.6.4/examples/IRMQTTServer/IRMQTTServer.h
index 6f63cbd5e..de3158a4b 100644
--- a/lib/IRremoteESP8266-2.6.3.10/examples/IRMQTTServer/IRMQTTServer.h
+++ b/lib/IRremoteESP8266-2.6.4/examples/IRMQTTServer/IRMQTTServer.h
@@ -206,7 +206,7 @@ const uint8_t kPasswordLength = 20;
 // ----------------- End of User Configuration Section -------------------------
 
 // Constants
-#define _MY_VERSION_ "v1.3.2-testing"
+#define _MY_VERSION_ "v1.3.3"
 
 const uint8_t kRebootTime = 15;  // Seconds
 const uint8_t kQuickDisplayTime = 2;  // Seconds
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRMQTTServer/IRMQTTServer.ino b/lib/IRremoteESP8266-2.6.4/examples/IRMQTTServer/IRMQTTServer.ino
similarity index 99%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRMQTTServer/IRMQTTServer.ino
rename to lib/IRremoteESP8266-2.6.4/examples/IRMQTTServer/IRMQTTServer.ino
index 4b457cb29..c4208af45 100644
--- a/lib/IRremoteESP8266-2.6.3.10/examples/IRMQTTServer/IRMQTTServer.ino
+++ b/lib/IRremoteESP8266-2.6.4/examples/IRMQTTServer/IRMQTTServer.ino
@@ -735,6 +735,7 @@ void handleRoot(void) {
       "<select name='type'>"
         "<option value='27'>Argo</option>"
         "<option value='16'>Daikin (35 bytes)</option>"
+        "<option value='68'>Daikin128 (16 bytes)</option>"
         "<option value='65'>Daikin160 (20 bytes)</option>"
         "<option value='67'>Daikin176 (22 bytes)</option>"
         "<option value='53'>Daikin2 (39 bytes)</option>"
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRMQTTServer/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/IRMQTTServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRMQTTServer/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/IRMQTTServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRServer/IRServer.ino b/lib/IRremoteESP8266-2.6.4/examples/IRServer/IRServer.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRServer/IRServer.ino
rename to lib/IRremoteESP8266-2.6.4/examples/IRServer/IRServer.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRServer/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/IRServer/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRServer/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/IRServer/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDemo/IRrecvDemo.ino b/lib/IRremoteESP8266-2.6.4/examples/IRrecvDemo/IRrecvDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDemo/IRrecvDemo.ino
rename to lib/IRremoteESP8266-2.6.4/examples/IRrecvDemo/IRrecvDemo.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDemo/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/IRrecvDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDemo/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/IRrecvDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDump/IRrecvDump.ino b/lib/IRremoteESP8266-2.6.4/examples/IRrecvDump/IRrecvDump.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDump/IRrecvDump.ino
rename to lib/IRremoteESP8266-2.6.4/examples/IRrecvDump/IRrecvDump.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDump/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/IRrecvDump/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDump/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/IRrecvDump/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/lib/IRremoteESP8266-2.6.4/examples/IRrecvDumpV2/IRrecvDumpV2.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDumpV2/IRrecvDumpV2.ino
rename to lib/IRremoteESP8266-2.6.4/examples/IRrecvDumpV2/IRrecvDumpV2.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDumpV2/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/IRrecvDumpV2/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRrecvDumpV2/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/IRrecvDumpV2/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRsendDemo/IRsendDemo.ino b/lib/IRremoteESP8266-2.6.4/examples/IRsendDemo/IRsendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRsendDemo/IRsendDemo.ino
rename to lib/IRremoteESP8266-2.6.4/examples/IRsendDemo/IRsendDemo.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRsendDemo/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/IRsendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRsendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/IRsendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRsendProntoDemo/IRsendProntoDemo.ino b/lib/IRremoteESP8266-2.6.4/examples/IRsendProntoDemo/IRsendProntoDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRsendProntoDemo/IRsendProntoDemo.ino
rename to lib/IRremoteESP8266-2.6.4/examples/IRsendProntoDemo/IRsendProntoDemo.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/IRsendProntoDemo/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/IRsendProntoDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/IRsendProntoDemo/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/IRsendProntoDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino b/lib/IRremoteESP8266-2.6.4/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
rename to lib/IRremoteESP8266-2.6.4/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/JVCPanasonicSendDemo/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/JVCPanasonicSendDemo/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/JVCPanasonicSendDemo/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/JVCPanasonicSendDemo/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/LGACSend/LGACSend.ino b/lib/IRremoteESP8266-2.6.4/examples/LGACSend/LGACSend.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/LGACSend/LGACSend.ino
rename to lib/IRremoteESP8266-2.6.4/examples/LGACSend/LGACSend.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/LGACSend/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/LGACSend/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/LGACSend/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/LGACSend/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/SmartIRRepeater/SmartIRRepeater.ino b/lib/IRremoteESP8266-2.6.4/examples/SmartIRRepeater/SmartIRRepeater.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/SmartIRRepeater/SmartIRRepeater.ino
rename to lib/IRremoteESP8266-2.6.4/examples/SmartIRRepeater/SmartIRRepeater.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/SmartIRRepeater/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/SmartIRRepeater/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/SmartIRRepeater/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/SmartIRRepeater/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnArgoAC/TurnOnArgoAC.ino b/lib/IRremoteESP8266-2.6.4/examples/TurnOnArgoAC/TurnOnArgoAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnArgoAC/TurnOnArgoAC.ino
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnArgoAC/TurnOnArgoAC.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnArgoAC/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/TurnOnArgoAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnArgoAC/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnArgoAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino b/lib/IRremoteESP8266-2.6.4/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnDaikinAC/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/TurnOnDaikinAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnDaikinAC/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnDaikinAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino b/lib/IRremoteESP8266-2.6.4/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnFujitsuAC/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/TurnOnFujitsuAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnFujitsuAC/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnFujitsuAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino b/lib/IRremoteESP8266-2.6.4/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnKelvinatorAC/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/TurnOnKelvinatorAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnKelvinatorAC/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnKelvinatorAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino b/lib/IRremoteESP8266-2.6.4/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnMitsubishiAC/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/TurnOnMitsubishiAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnMitsubishiAC/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnMitsubishiAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino b/lib/IRremoteESP8266-2.6.4/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnMitsubishiHeavyAc/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/TurnOnMitsubishiHeavyAc/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnMitsubishiHeavyAc/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnMitsubishiHeavyAc/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino b/lib/IRremoteESP8266-2.6.4/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnPanasonicAC/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/TurnOnPanasonicAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnPanasonicAC/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnPanasonicAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino b/lib/IRremoteESP8266-2.6.4/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnToshibaAC/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/TurnOnToshibaAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnToshibaAC/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnToshibaAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino b/lib/IRremoteESP8266-2.6.4/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
diff --git a/lib/IRremoteESP8266-2.6.3.10/examples/TurnOnTrotecAC/platformio.ini b/lib/IRremoteESP8266-2.6.4/examples/TurnOnTrotecAC/platformio.ini
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/examples/TurnOnTrotecAC/platformio.ini
rename to lib/IRremoteESP8266-2.6.4/examples/TurnOnTrotecAC/platformio.ini
diff --git a/lib/IRremoteESP8266-2.6.3.10/keywords.txt b/lib/IRremoteESP8266-2.6.4/keywords.txt
similarity index 94%
rename from lib/IRremoteESP8266-2.6.3.10/keywords.txt
rename to lib/IRremoteESP8266-2.6.4/keywords.txt
index 84244f714..6edef1937 100644
--- a/lib/IRremoteESP8266-2.6.3.10/keywords.txt
+++ b/lib/IRremoteESP8266-2.6.4/keywords.txt
@@ -22,7 +22,9 @@
 
 IRArgoAC	KEYWORD1
 IRCoolixAC	KEYWORD1
+IRDaikin128	KEYWORD1
 IRDaikin160	KEYWORD1
+IRDaikin176	KEYWORD1
 IRDaikin2	KEYWORD1
 IRDaikin216	KEYWORD1
 IRDaikinESP	KEYWORD1
@@ -57,6 +59,7 @@ decode_results	KEYWORD1
 decode_type_t	KEYWORD1
 fanspeed_t	KEYWORD1
 fujitsu_ac_remote_model_t	KEYWORD1
+gree_ac_remote_model_t	KEYWORD1
 irparams_t	KEYWORD1
 match_result_t	KEYWORD1
 opmode_t	KEYWORD1
@@ -74,17 +77,24 @@ _delayMicroseconds	KEYWORD2
 _matchGeneric	KEYWORD2
 _setMode	KEYWORD2
 _setTemp	KEYWORD2
-acBoolToString	KEYWORD2
-acModeToString	KEYWORD2
 add	KEYWORD2
+addBoolToString	KEYWORD2
+addFanToString	KEYWORD2
+addIntToString	KEYWORD2
+addLabeledString	KEYWORD2
+addModeToString	KEYWORD2
+addTempToString	KEYWORD2
 argo	KEYWORD2
+bcdToUint8	KEYWORD2
 begin	KEYWORD2
 boolToString	KEYWORD2
 buildFromState	KEYWORD2
 buildState	KEYWORD2
 calcBlockChecksum	KEYWORD2
 calcChecksum	KEYWORD2
+calcFirstChecksum	KEYWORD2
 calcLGChecksum	KEYWORD2
+calcSecondChecksum	KEYWORD2
 calcUSecPeriod	KEYWORD2
 calculateChecksum	KEYWORD2
 calibrate	KEYWORD2
@@ -108,7 +118,9 @@ coolix	KEYWORD2
 copyIrParams	KEYWORD2
 countBits	KEYWORD2
 daikin	KEYWORD2
+daikin128	KEYWORD2
 daikin160	KEYWORD2
+daikin176	KEYWORD2
 daikin2	KEYWORD2
 daikin216	KEYWORD2
 decode	KEYWORD2
@@ -118,7 +130,9 @@ decodeCOOLIX	KEYWORD2
 decodeCarrierAC	KEYWORD2
 decodeDISH	KEYWORD2
 decodeDaikin	KEYWORD2
+decodeDaikin128	KEYWORD2
 decodeDaikin160	KEYWORD2
+decodeDaikin176	KEYWORD2
 decodeDaikin2	KEYWORD2
 decodeDaikin216	KEYWORD2
 decodeDenon	KEYWORD2
@@ -234,6 +248,7 @@ getIon	KEYWORD2
 getIonFilter	KEYWORD2
 getLed	KEYWORD2
 getLight	KEYWORD2
+getLightToggle	KEYWORD2
 getMax	KEYWORD2
 getMode	KEYWORD2
 getMold	KEYWORD2
@@ -269,6 +284,7 @@ getSwing	KEYWORD2
 getSwingH	KEYWORD2
 getSwingHorizontal	KEYWORD2
 getSwingV	KEYWORD2
+getSwingVToggle	KEYWORD2
 getSwingVertical	KEYWORD2
 getSwingVerticalAuto	KEYWORD2
 getSwingVerticalPosition	KEYWORD2
@@ -278,9 +294,11 @@ getTempRaw	KEYWORD2
 getTime	KEYWORD2
 getTimer	KEYWORD2
 getTurbo	KEYWORD2
+getUseCelsius	KEYWORD2
 getVane	KEYWORD2
 getWeeklyTimerEnable	KEYWORD2
 getWiFi	KEYWORD2
+getWideVane	KEYWORD2
 getXFan	KEYWORD2
 getZoneFollow	KEYWORD2
 getiFeel	KEYWORD2
@@ -298,6 +316,7 @@ isOnTimerActive	KEYWORD2
 isOnTimerEnabled	KEYWORD2
 isProtocolSupported	KEYWORD2
 isSpecialState	KEYWORD2
+isSwingVToggle	KEYWORD2
 isTimeCommand	KEYWORD2
 isTimerActive	KEYWORD2
 isTimerEnabled	KEYWORD2
@@ -314,16 +333,17 @@ matchMark	KEYWORD2
 matchSpace	KEYWORD2
 midea	KEYWORD2
 minRepeats	KEYWORD2
+minsToString	KEYWORD2
 mitsubishi	KEYWORD2
 mitsubishiHeavy152	KEYWORD2
 mitsubishiHeavy88	KEYWORD2
+msToString	KEYWORD2
 neoclima	KEYWORD2
 off	KEYWORD2
 on	KEYWORD2
 opmodeToString	KEYWORD2
 panasonic	KEYWORD2
 recoverSavedState	KEYWORD2
-renderTime	KEYWORD2
 reset	KEYWORD2
 resultAcToString	KEYWORD2
 resultToHexidecimal	KEYWORD2
@@ -342,7 +362,9 @@ sendCOOLIX	KEYWORD2
 sendCarrierAC	KEYWORD2
 sendDISH	KEYWORD2
 sendDaikin	KEYWORD2
+sendDaikin128	KEYWORD2
 sendDaikin160	KEYWORD2
+sendDaikin176	KEYWORD2
 sendDaikin2	KEYWORD2
 sendDaikin216	KEYWORD2
 sendData	KEYWORD2
@@ -438,6 +460,7 @@ setIon	KEYWORD2
 setIonFilter	KEYWORD2
 setLed	KEYWORD2
 setLight	KEYWORD2
+setLightToggle	KEYWORD2
 setMax	KEYWORD2
 setMode	KEYWORD2
 setModel	KEYWORD2
@@ -445,8 +468,10 @@ setMold	KEYWORD2
 setNight	KEYWORD2
 setOffTimer	KEYWORD2
 setOffTimerActive	KEYWORD2
+setOffTimerEnabled	KEYWORD2
 setOnTimer	KEYWORD2
 setOnTimerActive	KEYWORD2
+setOnTimerEnabled	KEYWORD2
 setOutsideQuiet	KEYWORD2
 setPower	KEYWORD2
 setPowerToggle	KEYWORD2
@@ -468,6 +493,7 @@ setSwing	KEYWORD2
 setSwingH	KEYWORD2
 setSwingHorizontal	KEYWORD2
 setSwingV	KEYWORD2
+setSwingVToggle	KEYWORD2
 setSwingVertical	KEYWORD2
 setTemp	KEYWORD2
 setTempRaw	KEYWORD2
@@ -476,9 +502,11 @@ setTimer	KEYWORD2
 setTimerActive	KEYWORD2
 setTurbo	KEYWORD2
 setUnknownThreshold	KEYWORD2
+setUseCelsius	KEYWORD2
 setVane	KEYWORD2
 setWeeklyTimerEnable	KEYWORD2
 setWiFi	KEYWORD2
+setWideVane	KEYWORD2
 setXFan	KEYWORD2
 setZoneFollow	KEYWORD2
 setiFeel	KEYWORD2
@@ -491,13 +519,13 @@ strToBool	KEYWORD2
 strToDecodeType	KEYWORD2
 strToModel	KEYWORD2
 sumBytes	KEYWORD2
+sumNibbles	KEYWORD2
 swinghToString	KEYWORD2
 swingvToString	KEYWORD2
 tcl112	KEYWORD2
 teco	KEYWORD2
 ticksHigh	KEYWORD2
 ticksLow	KEYWORD2
-timeToString	KEYWORD2
 toString	KEYWORD2
 toggleRC5	KEYWORD2
 toggleRC6	KEYWORD2
@@ -507,6 +535,7 @@ toshiba	KEYWORD2
 trotec	KEYWORD2
 typeToString	KEYWORD2
 uint64ToString	KEYWORD2
+uint8ToBcd	KEYWORD2
 updateSavedState	KEYWORD2
 validChecksum	KEYWORD2
 vestel	KEYWORD2
@@ -553,7 +582,9 @@ CARRIER_AC_BITS	LITERAL1
 COOLIX	LITERAL1
 COOLIX_BITS	LITERAL1
 DAIKIN	LITERAL1
+DAIKIN128	LITERAL1
 DAIKIN160	LITERAL1
+DAIKIN176	LITERAL1
 DAIKIN2	LITERAL1
 DAIKIN216	LITERAL1
 DAIKIN_AUTO	LITERAL1
@@ -574,7 +605,9 @@ DECODE_ARGO	LITERAL1
 DECODE_CARRIER_AC	LITERAL1
 DECODE_COOLIX	LITERAL1
 DECODE_DAIKIN	LITERAL1
+DECODE_DAIKIN128	LITERAL1
 DECODE_DAIKIN160	LITERAL1
+DECODE_DAIKIN176	LITERAL1
 DECODE_DAIKIN2	LITERAL1
 DECODE_DAIKIN216	LITERAL1
 DECODE_DENON	LITERAL1
@@ -860,7 +893,9 @@ SEND_ARGO	LITERAL1
 SEND_CARRIER_AC	LITERAL1
 SEND_COOLIX	LITERAL1
 SEND_DAIKIN	LITERAL1
+SEND_DAIKIN128	LITERAL1
 SEND_DAIKIN160	LITERAL1
+SEND_DAIKIN176	LITERAL1
 SEND_DAIKIN2	LITERAL1
 SEND_DAIKIN216	LITERAL1
 SEND_DENON	LITERAL1
@@ -958,6 +993,8 @@ VESTEL_AC	LITERAL1
 WHIRLPOOL_AC	LITERAL1
 WHYNTER	LITERAL1
 WHYNTER_BITS	LITERAL1
+YAW1F	LITERAL1
+YBOFB	LITERAL1
 kAiwaRcT501Bits	LITERAL1
 kAiwaRcT501MinRepeats	LITERAL1
 kAiwaRcT501PostBits	LITERAL1
@@ -1066,6 +1103,54 @@ kCoolixUnknown	LITERAL1
 kCoolixZeroSpace	LITERAL1
 kCoolixZeroSpaceTicks	LITERAL1
 kCoolixZoneFollowMask	LITERAL1
+kDaikin128Auto	LITERAL1
+kDaikin128BitCeiling	LITERAL1
+kDaikin128BitEcono	LITERAL1
+kDaikin128BitHalfHour	LITERAL1
+kDaikin128BitMark	LITERAL1
+kDaikin128BitPowerToggle	LITERAL1
+kDaikin128BitSleep	LITERAL1
+kDaikin128BitSwing	LITERAL1
+kDaikin128BitTimerEnabled	LITERAL1
+kDaikin128BitWall	LITERAL1
+kDaikin128Bits	LITERAL1
+kDaikin128ByteClockHours	LITERAL1
+kDaikin128ByteClockMins	LITERAL1
+kDaikin128ByteEconoLight	LITERAL1
+kDaikin128ByteModeFan	LITERAL1
+kDaikin128ByteOffTimer	LITERAL1
+kDaikin128ByteOnTimer	LITERAL1
+kDaikin128BytePowerSwingSleep	LITERAL1
+kDaikin128ByteTemp	LITERAL1
+kDaikin128Cool	LITERAL1
+kDaikin128DefaultRepeat	LITERAL1
+kDaikin128Dry	LITERAL1
+kDaikin128Fan	LITERAL1
+kDaikin128FanAuto	LITERAL1
+kDaikin128FanHigh	LITERAL1
+kDaikin128FanLow	LITERAL1
+kDaikin128FanMed	LITERAL1
+kDaikin128FanPowerful	LITERAL1
+kDaikin128FanQuiet	LITERAL1
+kDaikin128FooterMark	LITERAL1
+kDaikin128Freq	LITERAL1
+kDaikin128Gap	LITERAL1
+kDaikin128HdrMark	LITERAL1
+kDaikin128HdrSpace	LITERAL1
+kDaikin128Heat	LITERAL1
+kDaikin128LeaderMark	LITERAL1
+kDaikin128LeaderSpace	LITERAL1
+kDaikin128MaskFan	LITERAL1
+kDaikin128MaskHours	LITERAL1
+kDaikin128MaskLight	LITERAL1
+kDaikin128MaskMode	LITERAL1
+kDaikin128MaxTemp	LITERAL1
+kDaikin128MinTemp	LITERAL1
+kDaikin128OneSpace	LITERAL1
+kDaikin128SectionLength	LITERAL1
+kDaikin128Sections	LITERAL1
+kDaikin128StateLength	LITERAL1
+kDaikin128ZeroSpace	LITERAL1
 kDaikin160BitMark	LITERAL1
 kDaikin160Bits	LITERAL1
 kDaikin160ByteFan	LITERAL1
@@ -1094,6 +1179,35 @@ kDaikin160SwingVLow	LITERAL1
 kDaikin160SwingVLowest	LITERAL1
 kDaikin160SwingVMiddle	LITERAL1
 kDaikin160ZeroSpace	LITERAL1
+kDaikin176BitMark	LITERAL1
+kDaikin176Bits	LITERAL1
+kDaikin176ByteFan	LITERAL1
+kDaikin176ByteMode	LITERAL1
+kDaikin176ByteModeButton	LITERAL1
+kDaikin176BytePower	LITERAL1
+kDaikin176ByteSwingH	LITERAL1
+kDaikin176ByteTemp	LITERAL1
+kDaikin176Cool	LITERAL1
+kDaikin176DefaultRepeat	LITERAL1
+kDaikin176DryFanTemp	LITERAL1
+kDaikin176FanMax	LITERAL1
+kDaikin176Freq	LITERAL1
+kDaikin176Gap	LITERAL1
+kDaikin176HdrMark	LITERAL1
+kDaikin176HdrSpace	LITERAL1
+kDaikin176MaskFan	LITERAL1
+kDaikin176MaskMode	LITERAL1
+kDaikin176MaskSwingH	LITERAL1
+kDaikin176MaskTemp	LITERAL1
+kDaikin176ModeButton	LITERAL1
+kDaikin176OneSpace	LITERAL1
+kDaikin176Section1Length	LITERAL1
+kDaikin176Section2Length	LITERAL1
+kDaikin176Sections	LITERAL1
+kDaikin176StateLength	LITERAL1
+kDaikin176SwingHAuto	LITERAL1
+kDaikin176SwingHOff	LITERAL1
+kDaikin176ZeroSpace	LITERAL1
 kDaikin216BitMark	LITERAL1
 kDaikin216Bits	LITERAL1
 kDaikin216ByteFan	LITERAL1
@@ -1203,6 +1317,7 @@ kDaikinDry	LITERAL1
 kDaikinFan	LITERAL1
 kDaikinFanAuto	LITERAL1
 kDaikinFanMax	LITERAL1
+kDaikinFanMed	LITERAL1
 kDaikinFanMin	LITERAL1
 kDaikinFanQuiet	LITERAL1
 kDaikinFirstHeader64	LITERAL1
@@ -1412,6 +1527,7 @@ kGreeFan	LITERAL1
 kGreeFanAuto	LITERAL1
 kGreeFanMask	LITERAL1
 kGreeFanMax	LITERAL1
+kGreeFanMed	LITERAL1
 kGreeFanMin	LITERAL1
 kGreeHdrMark	LITERAL1
 kGreeHdrSpace	LITERAL1
@@ -1537,6 +1653,7 @@ kHitachiAcFan	LITERAL1
 kHitachiAcFanAuto	LITERAL1
 kHitachiAcFanHigh	LITERAL1
 kHitachiAcFanLow	LITERAL1
+kHitachiAcFanMed	LITERAL1
 kHitachiAcHdrMark	LITERAL1
 kHitachiAcHdrSpace	LITERAL1
 kHitachiAcHeat	LITERAL1
@@ -1589,6 +1706,7 @@ kKelvinatorFan	LITERAL1
 kKelvinatorFanAuto	LITERAL1
 kKelvinatorFanMask	LITERAL1
 kKelvinatorFanMax	LITERAL1
+kKelvinatorFanMin	LITERAL1
 kKelvinatorFanOffset	LITERAL1
 kKelvinatorGapSpace	LITERAL1
 kKelvinatorGapSpaceTicks	LITERAL1
@@ -1702,6 +1820,7 @@ kMaxTimeoutMs	LITERAL1
 kMedium	LITERAL1
 kMiddle	LITERAL1
 kMideaACAuto	LITERAL1
+kMideaACCelsiusBit	LITERAL1
 kMideaACChecksumMask	LITERAL1
 kMideaACCool	LITERAL1
 kMideaACDry	LITERAL1
@@ -1721,6 +1840,7 @@ kMideaACPower	LITERAL1
 kMideaACSleep	LITERAL1
 kMideaACStateMask	LITERAL1
 kMideaACTempMask	LITERAL1
+kMideaACToggleSwingV	LITERAL1
 kMideaBitMark	LITERAL1
 kMideaBitMarkTicks	LITERAL1
 kMideaBits	LITERAL1
@@ -1753,6 +1873,7 @@ kMitsubishiAcCool	LITERAL1
 kMitsubishiAcDry	LITERAL1
 kMitsubishiAcFanAuto	LITERAL1
 kMitsubishiAcFanMax	LITERAL1
+kMitsubishiAcFanQuiet	LITERAL1
 kMitsubishiAcFanRealMax	LITERAL1
 kMitsubishiAcFanSilent	LITERAL1
 kMitsubishiAcHdrMark	LITERAL1
@@ -1770,6 +1891,7 @@ kMitsubishiAcStartTimer	LITERAL1
 kMitsubishiAcStopTimer	LITERAL1
 kMitsubishiAcVaneAuto	LITERAL1
 kMitsubishiAcVaneAutoMove	LITERAL1
+kMitsubishiAcWideVaneAuto	LITERAL1
 kMitsubishiAcZeroSpace	LITERAL1
 kMitsubishiBitMark	LITERAL1
 kMitsubishiBitMarkTicks	LITERAL1
@@ -1968,6 +2090,7 @@ kPanasonicAcExcess	LITERAL1
 kPanasonicAcFan	LITERAL1
 kPanasonicAcFanAuto	LITERAL1
 kPanasonicAcFanMax	LITERAL1
+kPanasonicAcFanMed	LITERAL1
 kPanasonicAcFanMin	LITERAL1
 kPanasonicAcFanModeTemp	LITERAL1
 kPanasonicAcFanOffset	LITERAL1
@@ -2027,7 +2150,22 @@ kPanasonicUnknown	LITERAL1
 kPanasonicZeroSpace	LITERAL1
 kPanasonicZeroSpaceTicks	LITERAL1
 kPeriodOffset	LITERAL1
+kPioneerBitMark	LITERAL1
+kPioneerBitMarkTicks	LITERAL1
 kPioneerBits	LITERAL1
+kPioneerHdrMark	LITERAL1
+kPioneerHdrMarkTicks	LITERAL1
+kPioneerHdrSpace	LITERAL1
+kPioneerHdrSpaceTicks	LITERAL1
+kPioneerMinCommandLength	LITERAL1
+kPioneerMinCommandLengthTicks	LITERAL1
+kPioneerMinGap	LITERAL1
+kPioneerMinGapTicks	LITERAL1
+kPioneerOneSpace	LITERAL1
+kPioneerOneSpaceTicks	LITERAL1
+kPioneerTick	LITERAL1
+kPioneerZeroSpace	LITERAL1
+kPioneerZeroSpaceTicks	LITERAL1
 kProntoDataOffset	LITERAL1
 kProntoFreqFactor	LITERAL1
 kProntoFreqOffset	LITERAL1
@@ -2307,6 +2445,8 @@ kToshibaAcCool	LITERAL1
 kToshibaAcDry	LITERAL1
 kToshibaAcFanAuto	LITERAL1
 kToshibaAcFanMax	LITERAL1
+kToshibaAcFanMed	LITERAL1
+kToshibaAcFanMin	LITERAL1
 kToshibaAcHdrMark	LITERAL1
 kToshibaAcHdrSpace	LITERAL1
 kToshibaAcHeat	LITERAL1
diff --git a/lib/IRremoteESP8266-2.6.3.10/library.json b/lib/IRremoteESP8266-2.6.4/library.json
similarity index 97%
rename from lib/IRremoteESP8266-2.6.3.10/library.json
rename to lib/IRremoteESP8266-2.6.4/library.json
index 7db457702..b678372d7 100644
--- a/lib/IRremoteESP8266-2.6.3.10/library.json
+++ b/lib/IRremoteESP8266-2.6.4/library.json
@@ -1,6 +1,6 @@
 {
   "name": "IRremoteESP8266",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "keywords": "infrared, ir, remote, esp8266, esp32",
   "description": "Send and receive infrared signals with multiple protocols (ESP8266/ESP32)",
   "repository":
diff --git a/lib/IRremoteESP8266-2.6.3.10/library.properties b/lib/IRremoteESP8266-2.6.4/library.properties
similarity index 97%
rename from lib/IRremoteESP8266-2.6.3.10/library.properties
rename to lib/IRremoteESP8266-2.6.4/library.properties
index ce12cef8b..7ab396d1f 100644
--- a/lib/IRremoteESP8266-2.6.3.10/library.properties
+++ b/lib/IRremoteESP8266-2.6.4/library.properties
@@ -1,5 +1,5 @@
 name=IRremoteESP8266
-version=2.6.3
+version=2.6.4
 author=David Conran, Sebastien Warin, Mark Szabo, Ken Shirriff
 maintainer=Mark Szabo, David Conran, Sebastien Warin, Roi Dayan, Massimiliano Pinto
 sentence=Send and receive infrared signals with multiple protocols (ESP8266/ESP32)
diff --git a/lib/IRremoteESP8266-2.6.3.10/pylintrc b/lib/IRremoteESP8266-2.6.4/pylintrc
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/pylintrc
rename to lib/IRremoteESP8266-2.6.4/pylintrc
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/CPPLINT.cfg b/lib/IRremoteESP8266-2.6.4/src/CPPLINT.cfg
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/CPPLINT.cfg
rename to lib/IRremoteESP8266-2.6.4/src/CPPLINT.cfg
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/IRac.cpp b/lib/IRremoteESP8266-2.6.4/src/IRac.cpp
similarity index 95%
rename from lib/IRremoteESP8266-2.6.3.10/src/IRac.cpp
rename to lib/IRremoteESP8266-2.6.4/src/IRac.cpp
index 6ea543ade..4483357bc 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/IRac.cpp
+++ b/lib/IRremoteESP8266-2.6.4/src/IRac.cpp
@@ -55,6 +55,9 @@ bool IRac::isProtocolSupported(const decode_type_t protocol) {
 #if SEND_DAIKIN
     case decode_type_t::DAIKIN:
 #endif
+#if SEND_DAIKIN128
+    case decode_type_t::DAIKIN128:
+#endif
 #if SEND_DAIKIN160
     case decode_type_t::DAIKIN160:
 #endif
@@ -231,6 +234,32 @@ void IRac::daikin(IRDaikinESP *ac,
 }
 #endif  // SEND_DAIKIN
 
+#if SEND_DAIKIN128
+void IRac::daikin128(IRDaikin128 *ac,
+                  const bool on, const stdAc::opmode_t mode,
+                  const float degrees, const stdAc::fanspeed_t fan,
+                  const stdAc::swingv_t swingv,
+                  const bool quiet, const bool turbo, const bool light,
+                  const bool econo, const int16_t sleep, const int16_t clock) {
+  ac->setPowerToggle(on);
+  ac->setMode(ac->convertMode(mode));
+  ac->setTemp(degrees);
+  ac->setFan(ac->convertFan(fan));
+  ac->setSwingVertical((int8_t)swingv >= 0);
+  // No Horizontal Swing setting avaliable.
+  ac->setQuiet(quiet);
+  ac->setLightToggle(light ? kDaikin128BitWall : 0);
+  // No Filter setting available.
+  ac->setPowerful(turbo);
+  ac->setEcono(econo);
+  // No Clean setting available.
+  // No Beep setting available.
+  ac->setSleep(sleep > 0);
+  if (clock >= 0) ac->setClock(clock);
+  ac->send();
+}
+#endif  // SEND_DAIKIN128
+
 #if SEND_DAIKIN160
 void IRac::daikin160(IRDaikin160 *ac,
                      const bool on, const stdAc::opmode_t mode,
@@ -408,11 +437,12 @@ void IRac::goodweather(IRGoodweatherAc *ac,
 #endif  // SEND_GOODWEATHER
 
 #if SEND_GREE
-void IRac::gree(IRGreeAC *ac,
+void IRac::gree(IRGreeAC *ac, const gree_ac_remote_model_t model,
                 const bool on, const stdAc::opmode_t mode, const float degrees,
                 const stdAc::fanspeed_t fan, const stdAc::swingv_t swingv,
                 const bool turbo, const bool light, const bool clean,
                 const int16_t sleep) {
+  ac->setModel(model);
   ac->setPower(on);
   ac->setMode(ac->convertMode(mode));
   ac->setTemp(degrees);
@@ -533,13 +563,15 @@ void IRac::kelvinator(IRKelvinatorAC *ac,
 
 #if SEND_MIDEA
 void IRac::midea(IRMideaAC *ac,
-                 const bool on, const stdAc::opmode_t mode, const float degrees,
-                 const stdAc::fanspeed_t fan, const int16_t sleep) {
+                 const bool on, const stdAc::opmode_t mode, const bool celsius,
+                 const float degrees, const stdAc::fanspeed_t fan,
+                 const stdAc::swingv_t swingv, const int16_t sleep) {
   ac->setPower(on);
   ac->setMode(ac->convertMode(mode));
-  ac->setTemp(degrees, true);  // true means use Celsius.
+  ac->setUseCelsius(celsius);
+  ac->setTemp(degrees, celsius);
   ac->setFan(ac->convertFan(fan));
-  // No Vertical swing setting available.
+  ac->setSwingVToggle(swingv != stdAc::swingv_t::kOff);
   // No Horizontal swing setting available.
   // No Quiet setting available.
   // No Turbo setting available.
@@ -558,13 +590,14 @@ void IRac::mitsubishi(IRMitsubishiAC *ac,
                       const bool on, const stdAc::opmode_t mode,
                       const float degrees,
                       const stdAc::fanspeed_t fan, const stdAc::swingv_t swingv,
+                      const stdAc::swingh_t swingh,
                       const bool quiet, const int16_t clock) {
   ac->setPower(on);
   ac->setMode(ac->convertMode(mode));
   ac->setTemp(degrees);
   ac->setFan(ac->convertFan(fan));
   ac->setVane(ac->convertSwingV(swingv));
-  // No Horizontal swing setting available.
+  ac->setWideVane(ac->convertSwingH(swingh));
   if (quiet) ac->setFan(kMitsubishiAcFanSilent);
   // No Turbo setting available.
   // No Light setting available.
@@ -911,7 +944,18 @@ stdAc::state_t IRac::handleToggles(const stdAc::state_t desired,
         result.turbo = desired.turbo ^ prev->turbo;
         result.light = desired.light ^ prev->light;
         result.clean = desired.clean ^ prev->clean;
-        result.sleep = (desired.sleep ^ prev->sleep) ? 0 : -1;
+        result.sleep = ((desired.sleep >= 0) ^ (prev->sleep >= 0)) ? 0 : -1;
+        break;
+      case decode_type_t::DAIKIN128:
+        result.power = desired.power ^ prev->power;
+        result.light = desired.light ^ prev->light;
+        break;
+      case decode_type_t::MIDEA:
+        if ((desired.swingv == stdAc::swingv_t::kOff) ^
+            (prev->swingv == stdAc::swingv_t::kOff))  // It changed, so toggle.
+          result.swingv = stdAc::swingv_t::kAuto;
+        else
+          result.swingv = stdAc::swingv_t::kOff;  // No change, so no toggle.
         break;
       case decode_type_t::WHIRLPOOL_AC:
         result.power = desired.power ^ prev->power;
@@ -977,16 +1021,16 @@ bool IRac::sendAc(const decode_type_t vendor, const int16_t model,
       argo(&ac, on, mode, degC, fan, swingv, turbo, sleep);
       break;
     }
-#endif  // SEND_DAIKIN
+#endif  // SEND_ARGO
 #if SEND_COOLIX
     case COOLIX:
     {
       IRCoolixAC ac(_pin, _inverted, _modulation);
       coolix(&ac, on, mode, degC, fan, swingv, swingh,
-             quiet, turbo, econo, clean);
+             turbo, light, clean, sleep);
       break;
     }
-#endif  // SEND_DAIKIN
+#endif  // SEND_COOLIX
 #if SEND_DAIKIN
     case DAIKIN:
     {
@@ -996,6 +1040,15 @@ bool IRac::sendAc(const decode_type_t vendor, const int16_t model,
       break;
     }
 #endif  // SEND_DAIKIN
+#if SEND_DAIKIN128
+    case DAIKIN128:
+    {
+      IRDaikin128 ac(_pin, _inverted, _modulation);
+      daikin128(&ac, on, mode, degC, fan, swingv, quiet, turbo,
+                light, econo, sleep, clock);
+      break;
+    }
+#endif  // SEND_DAIKIN2
 #if SEND_DAIKIN160
     case DAIKIN160:
     {
@@ -1007,7 +1060,7 @@ bool IRac::sendAc(const decode_type_t vendor, const int16_t model,
 #if SEND_DAIKIN176
     case DAIKIN176:
     {
-      IRDaikin176 ac(_pin);
+      IRDaikin176 ac(_pin, _inverted, _modulation);
       daikin176(&ac, on, mode, degC, fan, swingh);
       break;
     }
@@ -1020,7 +1073,7 @@ bool IRac::sendAc(const decode_type_t vendor, const int16_t model,
               light, econo, filter, clean, beep, sleep, clock);
       break;
     }
-#endif  // SEND_DAIKIN216
+#endif  // SEND_DAIKIN2
 #if SEND_DAIKIN216
     case DAIKIN216:
     {
@@ -1061,9 +1114,10 @@ bool IRac::sendAc(const decode_type_t vendor, const int16_t model,
 #if SEND_GREE
     case GREE:
     {
-      IRGreeAC ac(_pin, _inverted, _modulation);
+      IRGreeAC ac(_pin, (gree_ac_remote_model_t)model, _inverted, _modulation);
       ac.begin();
-      gree(&ac, on, mode, degC, fan, swingv, light, turbo, clean, sleep);
+      gree(&ac, (gree_ac_remote_model_t)model, on, mode, degC, fan, swingv,
+           turbo, light, clean, sleep);
       break;
     }
 #endif  // SEND_GREE
@@ -1109,7 +1163,7 @@ bool IRac::sendAc(const decode_type_t vendor, const int16_t model,
     {
       IRMideaAC ac(_pin, _inverted, _modulation);
       ac.begin();
-      midea(&ac, on, mode, degC, fan, sleep);
+      midea(&ac, on, mode, celsius, degrees, fan, swingv, sleep);
       break;
     }
 #endif  // SEND_MIDEA
@@ -1118,7 +1172,7 @@ bool IRac::sendAc(const decode_type_t vendor, const int16_t model,
     {
       IRMitsubishiAC ac(_pin, _inverted, _modulation);
       ac.begin();
-      mitsubishi(&ac, on, mode, degC, fan, swingv, quiet, clock);
+      mitsubishi(&ac, on, mode, degC, fan, swingv, swingh, quiet, clock);
       break;
     }
 #endif  // SEND_MITSUBISHI_AC
@@ -1515,6 +1569,13 @@ namespace IRAcUtils {
         return ac.toString();
       }
 #endif  // DECODE_DAIKIN
+#if DECODE_DAIKIN128
+      case decode_type_t::DAIKIN128: {
+        IRDaikin128 ac(0);
+        ac.setRaw(result->state);
+        return ac.toString();
+      }
+#endif  // DECODE_DAIKIN128
 #if DECODE_DAIKIN160
       case decode_type_t::DAIKIN160: {
         IRDaikin160 ac(0);
@@ -1847,7 +1908,7 @@ namespace IRAcUtils {
       case decode_type_t::MIDEA: {
         IRMideaAC ac(kGpioUnused);
         ac.setRaw(decode->value);  // Uses value instead of state.
-        *result = ac.toCommon();
+        *result = ac.toCommon(prev);
         break;
       }
 #endif  // DECODE_MIDEA
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/IRac.h b/lib/IRremoteESP8266-2.6.4/src/IRac.h
similarity index 94%
rename from lib/IRremoteESP8266-2.6.3.10/src/IRac.h
rename to lib/IRremoteESP8266-2.6.4/src/IRac.h
index 74b2e01ab..d02ce43af 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/IRac.h
+++ b/lib/IRremoteESP8266-2.6.4/src/IRac.h
@@ -95,6 +95,15 @@ class IRac {
               const bool quiet, const bool turbo, const bool econo,
               const bool clean);
 #endif  // SEND_DAIKIN
+#if SEND_DAIKIN128
+  void daikin128(IRDaikin128 *ac,
+                 const bool on, const stdAc::opmode_t mode,
+                 const float degrees, const stdAc::fanspeed_t fan,
+                 const stdAc::swingv_t swingv,
+                 const bool quiet, const bool turbo, const bool light,
+                 const bool econo, const int16_t sleep = -1,
+                 const int16_t clock = -1);
+#endif  // SEND_DAIKIN128
 #if SEND_DAIKIN160
 void daikin160(IRDaikin160 *ac,
                const bool on, const stdAc::opmode_t mode,
@@ -148,7 +157,7 @@ void electra(IRElectraAc *ac,
                    const int16_t sleep = -1);
 #endif  // SEND_GOODWEATHER
 #if SEND_GREE
-  void gree(IRGreeAC *ac,
+  void gree(IRGreeAC *ac, const gree_ac_remote_model_t model,
             const bool on, const stdAc::opmode_t mode, const float degrees,
             const stdAc::fanspeed_t fan, const stdAc::swingv_t swingv,
             const bool turbo, const bool light, const bool clean,
@@ -185,14 +194,16 @@ void electra(IRElectraAc *ac,
 #endif  // SEND_KELVINATOR
 #if SEND_MIDEA
   void midea(IRMideaAC *ac,
-             const bool on, const stdAc::opmode_t mode, const float degrees,
-             const stdAc::fanspeed_t fan, const int16_t sleep = -1);
+             const bool on, const stdAc::opmode_t mode, const bool celsius,
+             const float degrees, const stdAc::fanspeed_t fan,
+             const stdAc::swingv_t swingv, const int16_t sleep = -1);
 #endif  // SEND_MIDEA
 #if SEND_MITSUBISHI_AC
   void mitsubishi(IRMitsubishiAC *ac,
                   const bool on, const stdAc::opmode_t mode,
                   const float degrees,
                   const stdAc::fanspeed_t fan, const stdAc::swingv_t swingv,
+                  const stdAc::swingh_t swingh,
                   const bool quiet, const int16_t clock = -1);
 #endif  // SEND_MITSUBISHI_AC
 #if SEND_MITSUBISHIHEAVY
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/IRrecv.cpp b/lib/IRremoteESP8266-2.6.4/src/IRrecv.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.6.3.10/src/IRrecv.cpp
rename to lib/IRremoteESP8266-2.6.4/src/IRrecv.cpp
index 5f3971439..70360f0ec 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/IRrecv.cpp
+++ b/lib/IRremoteESP8266-2.6.4/src/IRrecv.cpp
@@ -647,6 +647,10 @@ bool IRrecv::decode(decode_results *results, irparams_t *save) {
   DPRINTLN("Attempting Daikin176 decode");
   if (decodeDaikin176(results)) return true;
 #endif  // DECODE_DAIKIN176
+#if DECODE_DAIKIN128
+  DPRINTLN("Attempting Daikin128 decode");
+  if (decodeDaikin128(results)) return true;
+#endif  // DECODE_DAIKIN128
 #if DECODE_HASH
   // decodeHash returns a hash on any input.
   // Thus, it needs to be last in the list.
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/IRrecv.h b/lib/IRremoteESP8266-2.6.4/src/IRrecv.h
similarity index 98%
rename from lib/IRremoteESP8266-2.6.3.10/src/IRrecv.h
rename to lib/IRremoteESP8266-2.6.4/src/IRrecv.h
index f330d0a6c..30fa8b120 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/IRrecv.h
+++ b/lib/IRremoteESP8266-2.6.4/src/IRrecv.h
@@ -343,15 +343,20 @@ class IRrecv {
   bool decodeDaikin(decode_results *results, const uint16_t nbits = kDaikinBits,
                     const bool strict = true);
 #endif
+#if DECODE_DAIKIN128
+  bool decodeDaikin128(decode_results *results,
+                       const uint16_t nbits = kDaikin128Bits,
+                       const bool strict = true);
+#endif  // DECODE_DAIKIN128
 #if DECODE_DAIKIN160
   bool decodeDaikin160(decode_results *results,
                        const uint16_t nbits = kDaikin160Bits,
                        const bool strict = true);
 #endif  // DECODE_DAIKIN160
 #if DECODE_DAIKIN176
-    bool decodeDaikin176(decode_results *results,
-                         const uint16_t nbits = kDaikin176Bits,
-                         const bool strict = true);
+  bool decodeDaikin176(decode_results *results,
+                       const uint16_t nbits = kDaikin176Bits,
+                       const bool strict = true);
 #endif  // DECODE_DAIKIN176
 #if DECODE_DAIKIN2
   bool decodeDaikin2(decode_results *results, uint16_t nbits = kDaikin2Bits,
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/IRremoteESP8266.h b/lib/IRremoteESP8266-2.6.4/src/IRremoteESP8266.h
similarity index 98%
rename from lib/IRremoteESP8266-2.6.3.10/src/IRremoteESP8266.h
rename to lib/IRremoteESP8266-2.6.4/src/IRremoteESP8266.h
index 5c74cbb99..6c982af74 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/IRremoteESP8266.h
+++ b/lib/IRremoteESP8266-2.6.4/src/IRremoteESP8266.h
@@ -51,7 +51,7 @@
 #endif  // UNIT_TEST
 
 // Library Version
-#define _IRREMOTEESP8266_VERSION_ "2.6.3"
+#define _IRREMOTEESP8266_VERSION_ "2.6.4"
 // Supported IR protocols
 // Each protocol you include costs memory and, during decode, costs time
 // Disable (set to false) all the protocols you do not need/want!
@@ -244,6 +244,9 @@
 
 #define DECODE_DAIKIN176       true
 #define SEND_DAIKIN176         true
+
+#define DECODE_DAIKIN128       true
+#define SEND_DAIKIN128         true
 */
 
 // Tasmota supported protocols (less protocols is less code size)
@@ -434,6 +437,9 @@
 #define DECODE_DAIKIN176       false
 #define SEND_DAIKIN176         true
 
+#define DECODE_DAIKIN128       false
+#define SEND_DAIKIN128         true
+
 #if (DECODE_ARGO || DECODE_DAIKIN || DECODE_FUJITSU_AC || DECODE_GREE || \
      DECODE_KELVINATOR || DECODE_MITSUBISHI_AC || DECODE_TOSHIBA_AC || \
      DECODE_TROTEC || DECODE_HAIER_AC || DECODE_HITACHI_AC || \
@@ -442,7 +448,7 @@
      DECODE_PANASONIC_AC || DECODE_MWM || DECODE_DAIKIN2 || \
      DECODE_VESTEL_AC || DECODE_TCL112AC || DECODE_MITSUBISHIHEAVY || \
      DECODE_DAIKIN216 || DECODE_SHARP_AC || DECODE_DAIKIN160 || \
-     DECODE_NEOCLIMA || DECODE_DAIKIN176)
+     DECODE_NEOCLIMA || DECODE_DAIKIN176 || DECODE_DAIKIN128)
 #define DECODE_AC true  // We need some common infrastructure for decoding A/Cs.
 #else
 #define DECODE_AC false   // We don't need that infrastructure.
@@ -529,8 +535,9 @@ enum decode_type_t {
   DAIKIN160,  // 65
   NEOCLIMA,
   DAIKIN176,
+  DAIKIN128,
   // Add new entries before this one, and update it to point to the last entry.
-  kLastDecodeType = DAIKIN176,
+  kLastDecodeType = DAIKIN128,
 };
 
 // Message lengths & required repeat values
@@ -557,6 +564,9 @@ const uint16_t kDaikin2DefaultRepeat = kNoRepeat;
 const uint16_t kDaikin160StateLength = 20;
 const uint16_t kDaikin160Bits = kDaikin160StateLength * 8;
 const uint16_t kDaikin160DefaultRepeat = kNoRepeat;
+const uint16_t kDaikin128StateLength = 16;
+const uint16_t kDaikin128Bits = kDaikin128StateLength * 8;
+const uint16_t kDaikin128DefaultRepeat = kNoRepeat;
 const uint16_t kDaikin176StateLength = 22;
 const uint16_t kDaikin176Bits = kDaikin176StateLength * 8;
 const uint16_t kDaikin176DefaultRepeat = kNoRepeat;
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/IRsend.cpp b/lib/IRremoteESP8266-2.6.4/src/IRsend.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.6.3.10/src/IRsend.cpp
rename to lib/IRremoteESP8266-2.6.4/src/IRsend.cpp
index 89cf3e512..6e36c7809 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/IRsend.cpp
+++ b/lib/IRremoteESP8266-2.6.4/src/IRsend.cpp
@@ -580,10 +580,12 @@ uint16_t IRsend::defaultBits(const decode_type_t protocol) {
       return kArgoBits;
     case DAIKIN:
       return kDaikinBits;
+    case DAIKIN128:
+        return kDaikin128Bits;
     case DAIKIN160:
       return kDaikin160Bits;
     case DAIKIN176:
-        return kDaikin176Bits;
+      return kDaikin176Bits;
     case DAIKIN2:
       return kDaikin2Bits;
     case DAIKIN216:
@@ -849,15 +851,20 @@ bool IRsend::send(const decode_type_t type, const unsigned char *state,
       sendDaikin(state, nbytes);
       break;
 #endif  // SEND_DAIKIN
+#if SEND_DAIKIN128
+    case DAIKIN128:
+        sendDaikin128(state, nbytes);
+        break;
+#endif  // SEND_DAIKIN128
 #if SEND_DAIKIN160
     case DAIKIN160:
       sendDaikin160(state, nbytes);
       break;
 #endif  // SEND_DAIKIN160
 #if SEND_DAIKIN176
-      case DAIKIN176:
-          sendDaikin176(state, nbytes);
-          break;
+    case DAIKIN176:
+      sendDaikin176(state, nbytes);
+      break;
 #endif  // SEND_DAIKIN176
 #if SEND_DAIKIN2
     case DAIKIN2:
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/IRsend.h b/lib/IRremoteESP8266-2.6.4/src/IRsend.h
similarity index 97%
rename from lib/IRremoteESP8266-2.6.3.10/src/IRsend.h
rename to lib/IRremoteESP8266-2.6.4/src/IRsend.h
index 276a7be15..8984e612a 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/IRsend.h
+++ b/lib/IRremoteESP8266-2.6.4/src/IRsend.h
@@ -306,15 +306,20 @@ class IRsend {
                   const uint16_t nbytes = kDaikinStateLength,
                   const uint16_t repeat = kDaikinDefaultRepeat);
 #endif
+#if SEND_DAIKIN128
+  void sendDaikin128(const unsigned char data[],
+                     const uint16_t nbytes = kDaikin128StateLength,
+                     const uint16_t repeat = kDaikin128DefaultRepeat);
+#endif  // SEND_DAIKIN128
 #if SEND_DAIKIN160
   void sendDaikin160(const unsigned char data[],
                      const uint16_t nbytes = kDaikin160StateLength,
                      const uint16_t repeat = kDaikin160DefaultRepeat);
 #endif  // SEND_DAIKIN160
 #if SEND_DAIKIN176
-    void sendDaikin176(const unsigned char data[],
-                       const uint16_t nbytes = kDaikin176StateLength,
-                       const uint16_t repeat = kDaikin176DefaultRepeat);
+  void sendDaikin176(const unsigned char data[],
+                     const uint16_t nbytes = kDaikin176StateLength,
+                     const uint16_t repeat = kDaikin176DefaultRepeat);
 #endif  // SEND_DAIKIN176
 #if SEND_DAIKIN2
   void sendDaikin2(const unsigned char data[],
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/IRtimer.cpp b/lib/IRremoteESP8266-2.6.4/src/IRtimer.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/IRtimer.cpp
rename to lib/IRremoteESP8266-2.6.4/src/IRtimer.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/IRtimer.h b/lib/IRremoteESP8266-2.6.4/src/IRtimer.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/IRtimer.h
rename to lib/IRremoteESP8266-2.6.4/src/IRtimer.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/IRutils.cpp b/lib/IRremoteESP8266-2.6.4/src/IRutils.cpp
similarity index 96%
rename from lib/IRremoteESP8266-2.6.3.10/src/IRutils.cpp
rename to lib/IRremoteESP8266-2.6.4/src/IRutils.cpp
index 10ff9f1cd..cd7c72307 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/IRutils.cpp
+++ b/lib/IRremoteESP8266-2.6.4/src/IRutils.cpp
@@ -103,6 +103,8 @@ decode_type_t strToDecodeType(const char * const str) {
     return decode_type_t::COOLIX;
   else if (!strcasecmp(str, "DAIKIN"))
     return decode_type_t::DAIKIN;
+  else if (!strcasecmp(str, "DAIKIN128"))
+    return decode_type_t::DAIKIN128;
   else if (!strcasecmp(str, "DAIKIN160"))
     return decode_type_t::DAIKIN160;
   else if (!strcasecmp(str, "DAIKIN176"))
@@ -264,6 +266,9 @@ String typeToString(const decode_type_t protocol, const bool isRepeat) {
     case DAIKIN:
       result = F("DAIKIN");
       break;
+    case DAIKIN128:
+      result = F("DAIKIN128");
+      break;
     case DAIKIN160:
       result = F("DAIKIN160");
       break;
@@ -464,6 +469,7 @@ bool hasACState(const decode_type_t protocol) {
   switch (protocol) {
     case ARGO:
     case DAIKIN:
+    case DAIKIN128:
     case DAIKIN160:
     case DAIKIN176:
     case DAIKIN2:
@@ -917,4 +923,30 @@ namespace irutils {
     result += uint64ToString(mins % 60);
     return result;
   }
+
+  // Sum all the nibbles together in a series of bytes.
+  // Args:
+  //   start: PTR to the start of the bytes.
+  //   length: Nr of bytes to sum the nibbles of.
+  //   init: Starting value of the sum.
+  // Returns:
+  //   A uint8_t sum of all the nibbles inc the init.
+  uint8_t sumNibbles(const uint8_t * const start, const uint16_t length,
+                     const uint8_t init) {
+    uint8_t sum = init;
+    const uint8_t *ptr;
+    for (ptr = start; ptr - start < length; ptr++)
+      sum += (*ptr >> 4) + (*ptr & 0xF);
+    return sum;
+  }
+
+  uint8_t bcdToUint8(const uint8_t bcd) {
+    if (bcd > 0x99) return 255;  // Too big.
+    return (bcd >> 4) * 10 + (bcd & 0xF);
+  }
+
+  uint8_t uint8ToBcd(const uint8_t integer) {
+    if (integer > 99) return 255;  // Too big.
+    return ((integer / 10) << 4) + (integer % 10);
+  }
 }  // namespace irutils
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/IRutils.h b/lib/IRremoteESP8266-2.6.4/src/IRutils.h
similarity index 93%
rename from lib/IRremoteESP8266-2.6.3.10/src/IRutils.h
rename to lib/IRremoteESP8266-2.6.4/src/IRutils.h
index bb7a1266f..8d4226577 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/IRutils.h
+++ b/lib/IRremoteESP8266-2.6.4/src/IRutils.h
@@ -56,5 +56,9 @@ namespace irutils {
   String htmlEscape(const String unescaped);
   String msToString(uint32_t const msecs);
   String minsToString(const uint16_t mins);
+  uint8_t sumNibbles(const uint8_t * const start, const uint16_t length,
+                     const uint8_t init = 0);
+  uint8_t bcdToUint8(const uint8_t bcd);
+  uint8_t uint8ToBcd(const uint8_t integer);
 }  // namespace irutils
 #endif  // IRUTILS_H_
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Aiwa.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Aiwa.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Aiwa.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Aiwa.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Argo.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Argo.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Argo.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Argo.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Argo.h b/lib/IRremoteESP8266-2.6.4/src/ir_Argo.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Argo.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Argo.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Carrier.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Carrier.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Carrier.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Carrier.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Coolix.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Coolix.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Coolix.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Coolix.cpp
index 2b845733c..616b417ce 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_Coolix.cpp
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_Coolix.cpp
@@ -87,6 +87,7 @@ void IRsend::sendCOOLIX(uint64_t data, uint16_t nbits, uint16_t repeat) {
     mark(kCoolixBitMark);
     space(kCoolixMinGap);  // Pause before repeating
   }
+  space(kDefaultMessageGap);
 }
 #endif
 
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Coolix.h b/lib/IRremoteESP8266-2.6.4/src/ir_Coolix.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Coolix.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Coolix.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Daikin.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Daikin.cpp
similarity index 77%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Daikin.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Daikin.cpp
index 8bd9ea3fe..bca94841c 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_Daikin.cpp
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_Daikin.cpp
@@ -34,7 +34,11 @@ using irutils::addLabeledString;
 using irutils::addModeToString;
 using irutils::addTempToString;
 using irutils::addFanToString;
+using irutils::bcdToUint8;
 using irutils::minsToString;
+using irutils::sumNibbles;
+using irutils::uint8ToBcd;
+
 
 #if SEND_DAIKIN
 // Send a Daikin A/C message.
@@ -2019,6 +2023,7 @@ bool IRrecv::decodeDaikin160(decode_results *results, const uint16_t nbits,
   return true;
 }
 #endif  // DECODE_DAIKIN160
+
 #if SEND_DAIKIN176
 // Send a Daikin 176 bit A/C message.
 //
@@ -2059,7 +2064,9 @@ void IRsend::sendDaikin176(const unsigned char data[], const uint16_t nbytes,
 //
 // Supported Remotes: Daikin BRC4C153 remote
 //
-IRDaikin176::IRDaikin176(uint16_t pin) : _irsend(pin) { stateReset(); }
+IRDaikin176::IRDaikin176(const uint16_t pin, const bool inverted,
+                         const bool use_modulation)
+    : _irsend(pin, inverted, use_modulation) { stateReset(); }
 
 void IRDaikin176::begin() { _irsend.begin(); }
 
@@ -2103,10 +2110,12 @@ void IRDaikin176::stateReset() {
   remote_state[8] =  0xDA;
   remote_state[9] =  0x17;
   remote_state[10] = 0x18;
-  remote_state[12] = 0x03;
+  remote_state[12] = 0x73;
   remote_state[14] = 0x20;
+  remote_state[18] = 0x16;  // Fan speed and swing
   remote_state[20] = 0x20;
   // remote_state[21] is a checksum byte, it will be set by checksum().
+  _saved_temp = getTemp();
 }
 
 uint8_t *IRDaikin176::getRaw() {
@@ -2117,6 +2126,7 @@ uint8_t *IRDaikin176::getRaw() {
 void IRDaikin176::setRaw(const uint8_t new_code[]) {
   for (uint8_t i = 0; i < kDaikin176StateLength; i++)
     remote_state[i] = new_code[i];
+  _saved_temp = getTemp();
 }
 
 #if SEND_DAIKIN176
@@ -2126,19 +2136,16 @@ void IRDaikin176::send(const uint16_t repeat) {
 }
 #endif  // SEND_DAIKIN176
 
-void IRDaikin176::on() {
-  remote_state[kDaikin176BytePower] |= kDaikinBitPower;
-}
+void IRDaikin176::on() { setPower(true); }
 
-void IRDaikin176::off() {
-  remote_state[kDaikin176BytePower] &= ~kDaikinBitPower;
-}
+void IRDaikin176::off() { setPower(false); }
 
 void IRDaikin176::setPower(const bool state) {
+  remote_state[kDaikin176ByteModeButton] = 0;
   if (state)
-    on();
+    remote_state[kDaikin176BytePower] |= kDaikinBitPower;
   else
-    off();
+    remote_state[kDaikin176BytePower] &= ~kDaikinBitPower;
 }
 
 bool IRDaikin176::getPower() {
@@ -2150,42 +2157,60 @@ uint8_t IRDaikin176::getMode() {
 }
 
 void IRDaikin176::setMode(const uint8_t mode) {
+  uint8_t altmode = 0;
   switch (mode) {
-    case kDaikinAuto:
-    case kDaikin176Cool:
-    case kDaikinHeat:
-    case kDaikinFan:
-    case kDaikinDry:
-      remote_state[kDaikin176ByteMode] &= kDaikin176MaskMode;
-      remote_state[kDaikin176ByteMode] |= (mode << 4);
-      break;
-    default:
-      this->setMode(kDaikinAuto);
+    case kDaikinFan: altmode = 0; break;
+    case kDaikinDry: altmode = 7; break;
+    case kDaikin176Cool: altmode = 2; break;
+    default: this->setMode(kDaikin176Cool); return;
   }
+  // Set the mode.
+  remote_state[kDaikin176ByteMode] &= ~kDaikin176MaskMode;
+  remote_state[kDaikin176ByteMode] |= (mode << 4);
+  // Set the altmode
+  remote_state[kDaikin176BytePower] &= ~kDaikin176MaskMode;
+  remote_state[kDaikin176BytePower] |= (altmode << 4);
+  setTemp(_saved_temp);
+  // Needs to happen after setTemp() as it will clear it.
+  remote_state[kDaikin176ByteModeButton] = kDaikin176ModeButton;
 }
 
 // Convert a standard A/C mode into its native mode.
 uint8_t IRDaikin176::convertMode(const stdAc::opmode_t mode) {
   switch (mode) {
-    case stdAc::opmode_t::kCool:
-      return kDaikin176Cool;
-    case stdAc::opmode_t::kHeat:
-      return kDaikinHeat;
     case stdAc::opmode_t::kDry:
       return kDaikinDry;
+    case stdAc::opmode_t::kHeat:  // Heat not supported, but fan is the closest.
     case stdAc::opmode_t::kFan:
       return kDaikinFan;
     default:
-      return kDaikinAuto;
+      return kDaikin176Cool;
+  }
+}
+
+// Convert a native mode to it's common equivalent.
+stdAc::opmode_t IRDaikin176::toCommonMode(const uint8_t mode) {
+  switch (mode) {
+    case kDaikinDry: return stdAc::opmode_t::kDry;
+    case kDaikinHeat:  // There is no heat mode, but fan is the closest.
+    case kDaikinFan: return stdAc::opmode_t::kFan;
+    default: return stdAc::opmode_t::kCool;
   }
 }
 
 // Set the temp in deg C
 void IRDaikin176::setTemp(const uint8_t temp) {
-  uint8_t degrees = std::max(temp, kDaikinMinTemp);
-  degrees = std::min(degrees, kDaikinMaxTemp) * 2 - 18;
+  uint8_t degrees = std::min(kDaikinMaxTemp, std::max(temp, kDaikinMinTemp));
+  _saved_temp = degrees;
+  switch (getMode()) {
+    case kDaikinDry:
+    case kDaikinFan:
+      degrees = kDaikin176DryFanTemp;
+  }
+  degrees = degrees * 2 - 18;
   remote_state[kDaikin176ByteTemp] &= ~kDaikin176MaskTemp;
   remote_state[kDaikin176ByteTemp] |= degrees;
+  remote_state[kDaikin176ByteModeButton] = 0;
 }
 
 uint8_t IRDaikin176::getTemp(void) {
@@ -2194,45 +2219,43 @@ uint8_t IRDaikin176::getTemp(void) {
 
 // Set the speed of the fan, 1 for Min or 3 for Max
 void IRDaikin176::setFan(const uint8_t fan) {
-  uint8_t fanset;
-  if (fan == kDaikinFanQuiet || fan == kDaikinFanAuto)
-    fanset = fan;
-  else if (fan < kDaikinFanMin || fan > kDaikinFanMax)
-    fanset = kDaikinFanAuto;
-  else
-    fanset = 2 + fan;
-  // Set the fan speed bits, leave *lower* 4 bits alone
-  remote_state[kDaikin176ByteFan] &= ~kDaikin176MaskFan;
-  remote_state[kDaikin176ByteFan] |= (fanset << 4);
+  switch (fan) {
+    case kDaikinFanMin:
+    case kDaikin176FanMax:
+      remote_state[kDaikin176ByteFan] &= ~kDaikin176MaskFan;
+      remote_state[kDaikin176ByteFan] |= (fan << 4);
+      remote_state[kDaikin176ByteModeButton] = 0;
+      break;
+    default:
+      setFan(kDaikin176FanMax);
+  }
 }
 
-uint8_t IRDaikin176::getFan() {
-  uint8_t fan = remote_state[kDaikin176ByteFan] >> 4;
-  return fan;
-}
+uint8_t IRDaikin176::getFan() { return remote_state[kDaikin176ByteFan] >> 4; }
 
 // Convert a standard A/C Fan speed into its native fan speed.
 uint8_t IRDaikin176::convertFan(const stdAc::fanspeed_t speed) {
-     switch (speed) {
-    case stdAc::fanspeed_t::kMin: return kDaikinFanMin;
-    case stdAc::fanspeed_t::kLow: return kDaikinFanMin + 1;
-    case stdAc::fanspeed_t::kMedium: return kDaikinFanMin + 2;
-    case stdAc::fanspeed_t::kHigh: return kDaikinFanMax - 1;
-    case stdAc::fanspeed_t::kMax: return kDaikinFanMax;
+  switch (speed) {
+    case stdAc::fanspeed_t::kMin:
+    case stdAc::fanspeed_t::kLow:
+      return kDaikinFanMin;
     default:
-      return kDaikinFanAuto;
+      return kDaikin176FanMax;
   }
 }
 
 void IRDaikin176::setSwingHorizontal(const uint8_t position) {
   switch (position) {
-    case kDaikin176SwingHSwing:
-    remote_state[kDaikin176ByteSwingH] &= kDaikin176MaskSwingH;
-    remote_state[kDaikin176ByteSwingH] |= position;
-    break;
-     default: setSwingHorizontal(kDaikin176SwingHAuto);
+    case kDaikin176SwingHOff:
+    case kDaikin176SwingHAuto:
+      remote_state[kDaikin176ByteSwingH] &= ~kDaikin176MaskSwingH;
+      remote_state[kDaikin176ByteSwingH] |= position;
+      break;
+    default:
+      setSwingHorizontal(kDaikin176SwingHAuto);
   }
 }
+
 uint8_t IRDaikin176::getSwingHorizontal() {
   return remote_state[kDaikin176ByteSwingH] & kDaikin176MaskSwingH;
 }
@@ -2241,7 +2264,9 @@ uint8_t IRDaikin176::getSwingHorizontal() {
 uint8_t IRDaikin176::convertSwingH(const stdAc::swingh_t position) {
   switch (position) {
     case stdAc::swingh_t::kOff:
-      return kDaikin176SwingHSwing;
+      return kDaikin176SwingHOff;
+    case stdAc::swingh_t::kAuto:
+      return kDaikin176SwingHAuto;
     default:
       return kDaikin176SwingHAuto;
   }
@@ -2249,21 +2274,29 @@ uint8_t IRDaikin176::convertSwingH(const stdAc::swingh_t position) {
 // Convert a native horizontal swing to it's common equivalent.
 stdAc::swingh_t IRDaikin176::toCommonSwingH(const uint8_t setting) {
   switch (setting) {
-    case kDaikin176SwingHSwing: return stdAc::swingh_t::kOff;
-    default: return stdAc::swingh_t::kAuto;
+    case kDaikin176SwingHOff: return stdAc::swingh_t::kOff;
+    case kDaikin176SwingHAuto: return stdAc::swingh_t::kAuto;
+    default:
+      return stdAc::swingh_t::kAuto;
   }
 }
 
+// Convert a native fan speed to it's common equivalent.
+stdAc::fanspeed_t IRDaikin176::toCommonFanSpeed(const uint8_t speed) {
+  return (speed == kDaikinFanMin) ? stdAc::fanspeed_t::kMin
+                                  : stdAc::fanspeed_t::kMax;
+}
+
 // Convert the A/C state to it's common equivalent.
 stdAc::state_t IRDaikin176::toCommon(void) {
   stdAc::state_t result;
   result.protocol = decode_type_t::DAIKIN176;
   result.model = -1;  // No models used.
   result.power = this->getPower();
-  result.mode = IRDaikinESP::toCommonMode(this->getMode());
+  result.mode = IRDaikin176::toCommonMode(this->getMode());
   result.celsius = true;
   result.degrees = this->getTemp();
-  result.fanspeed = IRDaikinESP::toCommonFanSpeed(this->getFan());
+  result.fanspeed = this->toCommonFanSpeed(this->getFan());
   result.swingh = this->toCommonSwingH(this->getSwingHorizontal());
 
   // Not supported.
@@ -2283,60 +2316,24 @@ stdAc::state_t IRDaikin176::toCommon(void) {
 // Convert the internal state into a human readable string.
 String IRDaikin176::toString() {
   String result = "";
-  result.reserve(120);  // Reserve some heap for the string to reduce fragging.
-  result += F("Power: ");
-  if (this->getPower())
-    result += F("On");
-  else
-    result += F("Off");
-  result += F(", Mode: ");
-  result += uint64ToString(this->getMode());
-  switch (getMode()) {
-    case kDaikinAuto:
-      result += F(" (AUTO)");
-      break;
-    case kDaikinCool + 4:
-      result += F(" (COOL)");
-      break;
-    case kDaikinHeat:
-      result += F(" (HEAT)");
-      break;
-    case kDaikinDry:
-      result += F(" (DRY)");
-      break;
-    case kDaikinFan:
-      result += F(" (FAN)");
-      break;
-    default:
-      result += F(" (UNKNOWN)");
-  }
-  result += F(", Temp: ");
-  result += uint64ToString(this->getTemp());
-  result += F("C, Fan: ");
-  result += uint64ToString(this->getFan());
-  switch (this->getFan()) {
-    case kDaikinFanAuto:
-      result += F(" (AUTO)");
-      break;
-    case kDaikinFanQuiet:
-      result += F(" (QUIET)");
-      break;
-    case kDaikinFanMin:
-      result += F(" (MIN)");
-      break;
-    case kDaikinFanMax - 2:
-      result += F(" (MAX)");
-      break;
-  }
+  result.reserve(80);  // Reserve some heap for the string to reduce fragging.
+  result += addBoolToString(getPower(), F("Power"), false);
+  result += addModeToString(getMode(), kDaikinAuto, kDaikin176Cool, kDaikinHeat,
+                            kDaikinDry, kDaikinFan);
+  result += addTempToString(getTemp());
+  result += addFanToString(getFan(), kDaikin176FanMax, kDaikinFanMin,
+                           kDaikinFanMin, kDaikinFanMin, kDaikinFanMin);
   result += F(", Swing (H): ");
   result += uint64ToString(getSwingHorizontal());
   switch (getSwingHorizontal()) {
     case kDaikin176SwingHAuto:
-    result += F(" (Auto)");
-    break;
-    case kDaikin176SwingHSwing:
-    result += F(" (Off)");
-    break;
+      result += F(" (Auto)");
+      break;
+    case kDaikin176SwingHOff:
+      result += F(" (Off)");
+      break;
+    default:
+      result += F(" (UNKNOWN)");
   }
   return result;
 }
@@ -2400,3 +2397,519 @@ bool IRrecv::decodeDaikin176(decode_results *results, const uint16_t nbits,
   return true;
 }
 #endif  // DECODE_DAIKIN176
+
+#if SEND_DAIKIN128
+// Send a Daikin 128 bit A/C message.
+//
+// Args:
+//   data: An array of kDaikin128StateLength bytes containing the IR command.
+//
+// Status: STABLE / Known Working.
+//
+// Supported devices:
+// - Daikin BRC52B63 remote.
+//
+// Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/827
+void IRsend::sendDaikin128(const unsigned char data[], const uint16_t nbytes,
+                           const uint16_t repeat) {
+  if (nbytes < kDaikin128SectionLength)
+    return;  // Not enough bytes to send a partial message.
+
+  for (uint16_t r = 0; r <= repeat; r++) {
+    enableIROut(kDaikin128Freq);
+    // Leader
+    for (uint8_t i = 0; i < 2; i++) {
+      mark(kDaikin128LeaderMark);
+      space(kDaikin128LeaderSpace);
+    }
+    // Section #1 (Header + Data)
+    sendGeneric(kDaikin128HdrMark, kDaikin128HdrSpace, kDaikin128BitMark,
+                kDaikin128OneSpace, kDaikin128BitMark, kDaikin128ZeroSpace,
+                kDaikin128BitMark, kDaikin128Gap, data,
+                kDaikin128SectionLength,
+                kDaikin128Freq, false, 0, kDutyDefault);
+    // Section #2 (Data + Footer)
+    sendGeneric(0, 0, kDaikin128BitMark,
+                kDaikin128OneSpace, kDaikin128BitMark, kDaikin128ZeroSpace,
+                kDaikin128FooterMark, kDaikin128Gap,
+                data + kDaikin128SectionLength,
+                nbytes - kDaikin128SectionLength,
+                kDaikin128Freq, false, 0, kDutyDefault);
+  }
+}
+#endif  // SEND_DAIKIN128
+
+// Class for handling Daikin 128 bit / 16 byte A/C messages.
+//
+// Code by crankyoldgit.
+// Analysis by Daniel Vena
+//
+// Status: STABLE / Known Working.
+//
+// Supported Remotes: Daikin BRC52B63 remote
+//
+IRDaikin128::IRDaikin128(const uint16_t pin, const bool inverted,
+                         const bool use_modulation)
+    : _irsend(pin, inverted, use_modulation) { stateReset(); }
+
+void IRDaikin128::begin() { _irsend.begin(); }
+
+uint8_t IRDaikin128::calcFirstChecksum(const uint8_t state[]) {
+  return sumNibbles(state, kDaikin128SectionLength - 1,
+                    state[kDaikin128SectionLength - 1] & 0x0F) & 0x0F;
+}
+
+uint8_t IRDaikin128::calcSecondChecksum(const uint8_t state[]) {
+  return sumNibbles(state + kDaikin128SectionLength,
+                    kDaikin128SectionLength - 1);
+}
+
+// Verify the checksum is valid for a given state.
+// Args:
+//   state:  The array to verify the checksum of.
+// Returns:
+//   A boolean.
+bool IRDaikin128::validChecksum(uint8_t state[]) {
+  // Validate the checksum of section #1.
+  if (state[kDaikin128SectionLength - 1] >> 4 != calcFirstChecksum(state))
+    return false;
+  // Validate the checksum of section #2
+  if (state[kDaikin128StateLength - 1] != calcSecondChecksum(state))
+    return false;
+  return true;
+}
+
+// Calculate and set the checksum values for the internal state.
+void IRDaikin128::checksum() {
+  remote_state[kDaikin128SectionLength - 1] &= 0x0F;  // Clear upper half.
+  remote_state[kDaikin128SectionLength - 1] |=
+      (calcFirstChecksum(remote_state) << 4);
+  remote_state[kDaikin128StateLength - 1] = calcSecondChecksum(remote_state);
+}
+
+void IRDaikin128::stateReset() {
+  for (uint8_t i = 0; i < kDaikin128StateLength; i++) remote_state[i] = 0x00;
+  remote_state[0] = 0x16;
+  remote_state[7] = 0x04;  // Most significant nibble is a checksum.
+  remote_state[8] = 0xA1;
+  // remote_state[15] is a checksum byte, it will be set by checksum().
+}
+
+uint8_t *IRDaikin128::getRaw() {
+  checksum();  // Ensure correct settings before sending.
+  return remote_state;
+}
+
+void IRDaikin128::setRaw(const uint8_t new_code[]) {
+  for (uint8_t i = 0; i < kDaikin128StateLength; i++)
+    remote_state[i] = new_code[i];
+}
+
+#if SEND_DAIKIN128
+void IRDaikin128::send(const uint16_t repeat) {
+  checksum();
+  _irsend.sendDaikin128(remote_state, kDaikin128StateLength, repeat);
+}
+#endif  // SEND_DAIKIN128
+
+void IRDaikin128::setPowerToggle(const bool toggle) {
+  if (toggle)
+    remote_state[kDaikin128BytePowerSwingSleep] |= kDaikin128BitPowerToggle;
+  else
+    remote_state[kDaikin128BytePowerSwingSleep] &= ~kDaikin128BitPowerToggle;
+}
+
+bool IRDaikin128::getPowerToggle(void) {
+  return remote_state[kDaikin128BytePowerSwingSleep] & kDaikin128BitPowerToggle;
+}
+
+uint8_t IRDaikin128::getMode() {
+  return remote_state[kDaikin128ByteModeFan] & kDaikin128MaskMode;
+}
+
+void IRDaikin128::setMode(const uint8_t mode) {
+  switch (mode) {
+    case kDaikin128Auto:
+    case kDaikin128Cool:
+    case kDaikin128Heat:
+    case kDaikin128Fan:
+    case kDaikin128Dry:
+      remote_state[kDaikin128ByteModeFan] &= ~kDaikin128MaskMode;
+      remote_state[kDaikin128ByteModeFan] |= mode;
+      break;
+    default:
+      this->setMode(kDaikin128Auto);
+      return;
+  }
+  // Force a reset of mode dependant things.
+  setFan(getFan());  // Covers Quiet & Powerful too.
+  setEcono(getEcono());
+}
+
+// Convert a standard A/C mode into its native mode.
+uint8_t IRDaikin128::convertMode(const stdAc::opmode_t mode) {
+  switch (mode) {
+    case stdAc::opmode_t::kCool:
+      return kDaikin128Cool;
+    case stdAc::opmode_t::kHeat:
+      return kDaikin128Heat;
+    case stdAc::opmode_t::kDry:
+      return kDaikinDry;
+    case stdAc::opmode_t::kFan:
+      return kDaikin128Fan;
+    default:
+      return kDaikin128Auto;
+  }
+}
+
+// Convert a native mode to it's common equivalent.
+stdAc::opmode_t IRDaikin128::toCommonMode(const uint8_t mode) {
+  switch (mode) {
+    case kDaikin128Cool: return stdAc::opmode_t::kCool;
+    case kDaikin128Heat: return stdAc::opmode_t::kHeat;
+    case kDaikin128Dry: return stdAc::opmode_t::kDry;
+    case kDaikin128Fan: return stdAc::opmode_t::kFan;
+    default: return stdAc::opmode_t::kAuto;
+  }
+}
+
+// Set the temp in deg C
+void IRDaikin128::setTemp(const uint8_t temp) {
+  remote_state[kDaikin128ByteTemp] = uint8ToBcd(
+    std::min(kDaikin128MaxTemp, std::max(temp, kDaikin128MinTemp)));
+}
+
+uint8_t IRDaikin128::getTemp(void) {
+  return bcdToUint8(remote_state[kDaikin128ByteTemp]);
+}
+
+uint8_t IRDaikin128::getFan() {
+  return (remote_state[kDaikin128ByteModeFan] & kDaikin128MaskFan) >> 4;
+}
+
+void IRDaikin128::setFan(const uint8_t speed) {
+  uint8_t new_speed = speed;
+  uint8_t mode = getMode();
+  switch (speed) {
+    case kDaikin128FanQuiet:
+    case kDaikin128FanPowerful:
+      if (mode == kDaikin128Auto) new_speed = kDaikin128FanAuto;
+      // FALL-THRU
+    case kDaikin128FanAuto:
+    case kDaikin128FanHigh:
+    case kDaikin128FanMed:
+    case kDaikin128FanLow:
+      // if (mode == kDaikinDry) new_speed = kDaikin128FanMed;
+      remote_state[kDaikin128ByteModeFan] &= ~kDaikin128MaskFan;
+      remote_state[kDaikin128ByteModeFan] |= (new_speed << 4);
+      break;
+    default:
+      this->setFan(kDaikin128FanAuto);
+  }
+}
+
+// Convert a standard A/C Fan speed into its native fan speed.
+uint8_t IRDaikin128::convertFan(const stdAc::fanspeed_t speed) {
+  switch (speed) {
+    case stdAc::fanspeed_t::kMin: return kDaikinFanQuiet;
+    case stdAc::fanspeed_t::kLow: return kDaikin128FanLow;
+    case stdAc::fanspeed_t::kMedium: return kDaikin128FanMed;
+    case stdAc::fanspeed_t::kHigh: return kDaikin128FanHigh;
+    case stdAc::fanspeed_t::kMax: return kDaikin128FanPowerful;
+    default: return kDaikin128FanAuto;
+  }
+}
+
+// Convert a native fan speed to it's common equivalent.
+stdAc::fanspeed_t IRDaikin128::toCommonFanSpeed(const uint8_t speed) {
+  switch (speed) {
+    case kDaikin128FanPowerful: return stdAc::fanspeed_t::kMax;
+    case kDaikin128FanHigh: return stdAc::fanspeed_t::kHigh;
+    case kDaikin128FanMed: return stdAc::fanspeed_t::kMedium;
+    case kDaikin128FanLow: return stdAc::fanspeed_t::kLow;
+    case kDaikinFanQuiet: return stdAc::fanspeed_t::kMin;
+    default: return stdAc::fanspeed_t::kAuto;
+  }
+}
+
+void IRDaikin128::setSwingVertical(const bool on) {
+  if (on)
+    remote_state[kDaikin128BytePowerSwingSleep] |= kDaikin128BitSwing;
+  else
+    remote_state[kDaikin128BytePowerSwingSleep] &= ~kDaikin128BitSwing;
+}
+
+bool IRDaikin128::getSwingVertical(void) {
+  return remote_state[kDaikin128BytePowerSwingSleep] & kDaikin128BitSwing;
+}
+
+void IRDaikin128::setSleep(const bool on) {
+  if (on)
+    remote_state[kDaikin128BytePowerSwingSleep] |= kDaikin128BitSleep;
+  else
+    remote_state[kDaikin128BytePowerSwingSleep] &= ~kDaikin128BitSleep;
+}
+
+bool IRDaikin128::getSleep(void) {
+  return remote_state[kDaikin128BytePowerSwingSleep] & kDaikin128BitSleep;
+}
+
+void IRDaikin128::setEcono(const bool on) {
+  uint8_t mode = getMode();
+  if (on && (mode == kDaikin128Cool || mode == kDaikin128Heat))
+    remote_state[kDaikin128ByteEconoLight] |= kDaikin128BitEcono;
+  else
+    remote_state[kDaikin128ByteEconoLight] &= ~kDaikin128BitEcono;
+}
+
+bool IRDaikin128::getEcono(void) {
+  return remote_state[kDaikin128ByteEconoLight] & kDaikin128BitEcono;
+}
+
+void IRDaikin128::setQuiet(const bool on) {
+  uint8_t mode = getMode();
+  if (on && (mode == kDaikin128Cool || mode == kDaikin128Heat))
+    setFan(kDaikin128FanQuiet);
+  else if (getFan() == kDaikin128FanQuiet)
+    setFan(kDaikin128FanAuto);
+}
+
+bool IRDaikin128::getQuiet(void) {
+  return getFan() == kDaikin128FanQuiet;
+}
+
+void IRDaikin128::setPowerful(const bool on) {
+  uint8_t mode = getMode();
+  if (on && (mode == kDaikin128Cool || mode == kDaikin128Heat))
+    setFan(kDaikin128FanPowerful);
+  else if (getFan() == kDaikin128FanPowerful)
+    setFan(kDaikin128FanAuto);
+}
+
+bool IRDaikin128::getPowerful(void) {
+  return getFan() == kDaikin128FanPowerful;
+}
+
+// Set the clock in mins since midnight
+void IRDaikin128::setClock(const uint16_t mins_since_midnight) {
+  uint16_t mins = mins_since_midnight;
+  if (mins_since_midnight >= 24 * 60) mins = 0;  // Bounds check.
+  // Hours.
+  remote_state[kDaikin128ByteClockHours] = uint8ToBcd(mins / 60);
+  // Minutes.
+  remote_state[kDaikin128ByteClockMins] = uint8ToBcd(mins % 60);
+}
+
+uint16_t IRDaikin128::getClock(void) {
+  return bcdToUint8(remote_state[kDaikin128ByteClockHours]) * 60 +
+      bcdToUint8(remote_state[kDaikin128ByteClockMins]);
+}
+
+void IRDaikin128::setOnTimerEnabled(const bool on) {
+  if (on)
+    remote_state[kDaikin128ByteOnTimer] |= kDaikin128BitTimerEnabled;
+  else
+    remote_state[kDaikin128ByteOnTimer] &= ~kDaikin128BitTimerEnabled;
+}
+
+bool IRDaikin128::getOnTimerEnabled(void) {
+  return remote_state[kDaikin128ByteOnTimer] & kDaikin128BitTimerEnabled;
+}
+
+// Timer is rounds down to the nearest half hour.
+// Args:
+//   ptr: A PTR to the byte containing the Timer value to be updated.
+//   mins_since_midnight: The number of minutes the new timer should be set to.
+void IRDaikin128::setTimer(uint8_t *ptr, const uint16_t mins_since_midnight) {
+  uint16_t mins = mins_since_midnight;
+  if (mins_since_midnight >= 24 * 60) mins = 0;  // Bounds check.
+  // Clear the time component
+  *ptr &= kDaikin128BitTimerEnabled;
+  uint8_t bcdhours = uint8ToBcd(mins / 60);
+  bool addhalf = (mins % 60) >= 30;
+  *ptr |= ((addhalf << 6) | bcdhours);
+}
+
+// Timer is stored in nr of half hours internally.
+// Args:
+//   ptr: A PTR to the byte containing the Timer value.
+// Returns:
+//   A uint16_t containing the number of minutes since midnight.
+uint16_t IRDaikin128::getTimer(const uint8_t *ptr) {
+  uint8_t bcdhours = *ptr & kDaikin128MaskHours;
+  bool addhalf = *ptr & kDaikin128BitHalfHour;
+  return bcdToUint8(bcdhours) * 60 + (addhalf ? 30 : 0);
+}
+
+void IRDaikin128::setOnTimer(const uint16_t mins_since_midnight) {
+  setTimer(remote_state + kDaikin128ByteOnTimer, mins_since_midnight);
+}
+
+uint16_t IRDaikin128::getOnTimer(void) {
+  return getTimer(remote_state + kDaikin128ByteOnTimer);
+}
+
+void IRDaikin128::setOffTimerEnabled(const bool on) {
+  if (on)
+    remote_state[kDaikin128ByteOffTimer] |= kDaikin128BitTimerEnabled;
+  else
+    remote_state[kDaikin128ByteOffTimer] &= ~kDaikin128BitTimerEnabled;
+}
+
+bool IRDaikin128::getOffTimerEnabled(void) {
+  return remote_state[kDaikin128ByteOffTimer] & kDaikin128BitTimerEnabled;
+}
+
+void IRDaikin128::setOffTimer(const uint16_t mins_since_midnight) {
+  setTimer(remote_state + kDaikin128ByteOffTimer, mins_since_midnight);
+}
+
+uint16_t IRDaikin128::getOffTimer(void) {
+  return getTimer(remote_state + kDaikin128ByteOffTimer);
+}
+
+void IRDaikin128::setLightToggle(const uint8_t unit) {
+  switch (unit) {
+    case kDaikin128BitCeiling:
+    case kDaikin128BitWall:
+    case 0:
+      remote_state[kDaikin128ByteEconoLight] &= ~kDaikin128MaskLight;
+      remote_state[kDaikin128ByteEconoLight] |= unit;
+      break;
+    default: setLightToggle(0);
+  }
+}
+
+uint8_t IRDaikin128::getLightToggle(void) {
+  return remote_state[kDaikin128ByteEconoLight] & kDaikin128MaskLight;
+}
+
+// Convert the internal state into a human readable string.
+String IRDaikin128::toString(void) {
+  String result = "";
+  result.reserve(240);  // Reserve some heap for the string to reduce fragging.
+  result += addBoolToString(getPowerToggle(), F("Power Toggle"), false);
+  result += addModeToString(getMode(), kDaikin128Auto, kDaikin128Cool,
+                            kDaikin128Heat, kDaikin128Dry, kDaikin128Fan);
+  result += addTempToString(getTemp());
+  result += addFanToString(getFan(), kDaikin128FanHigh, kDaikin128FanLow,
+                           kDaikin128FanAuto, kDaikin128FanQuiet,
+                           kDaikin128FanMed);
+  result += addBoolToString(getPowerful(), F("Powerful"));
+  result += addBoolToString(getQuiet(), F("Quiet"));
+  result += addBoolToString(getSwingVertical(), F("Swing (V)"));
+  result += addBoolToString(getSleep(), F("Sleep"));
+  result += addBoolToString(getEcono(), F("Econo"));
+  result += addLabeledString(minsToString(getClock()), F("Clock"));
+  result += addBoolToString(getOnTimerEnabled(), F("On Timer"));
+  result += addLabeledString(minsToString(getOnTimer()), F("On Time"));
+  result += addBoolToString(getOffTimerEnabled(), F("Off Timer"));
+  result += addLabeledString(minsToString(getOffTimer()), F("Off Time"));
+  result += addIntToString(getLightToggle(), F("Light Toggle"));
+  result += F(" (");
+  switch (getLightToggle()) {
+    case kDaikin128BitCeiling: result += F("Ceiling"); break;
+    case kDaikin128BitWall: result += F("Wall"); break;
+    case 0: result += F("Off"); break;
+    default: result += F("UNKNOWN");
+  }
+  result += ')';
+  return result;
+}
+
+// Convert the A/C state to it's common equivalent.
+stdAc::state_t IRDaikin128::toCommon(const stdAc::state_t *prev) {
+  stdAc::state_t result;
+  if (prev != NULL) result = *prev;
+  result.protocol = decode_type_t::DAIKIN128;
+  result.model = -1;  // No models used.
+  result.power ^= getPowerToggle();
+  result.mode = toCommonMode(getMode());
+  result.celsius = true;
+  result.degrees = getTemp();
+  result.fanspeed = toCommonFanSpeed(getFan());
+  result.swingv = getSwingVertical() ? stdAc::swingv_t::kAuto
+                                     : stdAc::swingv_t::kOff;
+  result.quiet = getQuiet();
+  result.turbo = getPowerful();
+  result.econo = getEcono();
+  result.light ^= (getLightToggle() != 0);
+  result.sleep = getSleep() ? 0 : -1;
+  result.clock = getClock();
+  // Not supported.
+  result.swingh = stdAc::swingh_t::kOff;
+  result.clean = false;
+  result.filter = false;
+  result.beep = false;
+  return result;
+}
+
+#if DECODE_DAIKIN128
+// Decode the supplied Daikin 128 bit A/C message.
+// Args:
+//   results: Ptr to the data to decode and where to store the decode result.
+//   nbits:   Nr. of bits to expect in the data portion. (kDaikin128Bits)
+//   strict:  Flag to indicate if we strictly adhere to the specification.
+// Returns:
+//   boolean: True if it can decode it, false if it can't.
+//
+// Supported devices:
+// - Daikin BRC52B63 remote.
+//
+// Status: STABLE / Known Working.
+//
+// Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/827
+bool IRrecv::decodeDaikin128(decode_results *results, const uint16_t nbits,
+                             const bool strict) {
+  if (results->rawlen < 2 * (nbits + kHeader) + kFooter - 1)
+    return false;
+  if (nbits / 8 <= kDaikin128SectionLength) return false;
+
+  // Compliance
+  if (strict && nbits != kDaikin128Bits) return false;
+
+  uint16_t offset = kStartOffset;
+
+  // Leader
+  for (uint8_t i = 0; i < 2; i++) {
+    if (!matchMark(results->rawbuf[offset++], kDaikin128LeaderMark,
+                   kDaikinTolerance, kDaikinMarkExcess)) return false;
+    if (!matchSpace(results->rawbuf[offset++], kDaikin128LeaderSpace,
+                    kDaikinTolerance, kDaikinMarkExcess)) return false;
+  }
+  const uint16_t ksectionSize[kDaikin128Sections] = {
+      kDaikin128SectionLength, (uint16_t)(nbits / 8 - kDaikin128SectionLength)};
+  // Data Sections
+  uint16_t pos = 0;
+  for (uint8_t section = 0; section < kDaikin128Sections; section++) {
+    uint16_t used;
+    // Section Header (first section only) + Section Data (8 bytes) +
+    //     Section Footer (Not for first section)
+    used = matchGeneric(results->rawbuf + offset, results->state + pos,
+                        results->rawlen - offset, ksectionSize[section] * 8,
+                        section == 0 ? kDaikin128HdrMark : 0,
+                        section == 0 ? kDaikin128HdrSpace : 0,
+                        kDaikin128BitMark, kDaikin128OneSpace,
+                        kDaikin128BitMark, kDaikin128ZeroSpace,
+                        section > 0 ? kDaikin128FooterMark : kDaikin128BitMark,
+                        kDaikin128Gap,
+                        section > 0,
+                        kDaikinTolerance, kDaikinMarkExcess, false);
+    if (used == 0) return false;
+    offset += used;
+    pos += ksectionSize[section];
+  }
+  // Compliance
+  if (strict) {
+    if (!IRDaikin128::validChecksum(results->state)) return false;
+  }
+
+  // Success
+  results->decode_type = decode_type_t::DAIKIN128;
+  results->bits = nbits;
+  // No need to record the state as we stored it as we decoded it.
+  // As we use result->state, we don't record value, address, or command as it
+  // is a union data type.
+  return true;
+}
+#endif  // DECODE_DAIKIN128
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Daikin.h b/lib/IRremoteESP8266-2.6.4/src/ir_Daikin.h
similarity index 78%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Daikin.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Daikin.h
index c8398ac69..ad9e1c182 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_Daikin.h
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_Daikin.h
@@ -11,6 +11,12 @@
 //   Brand: Daikin,  Model: ARC433B69 remote
 //   Brand: Daikin,  Model: ARC423A5 remote
 //   Brand: Daikin,  Model: FTE12HV2S A/C
+//   Brand: Daikin,  Model: BRC4C153 remote
+//   Brand: Daikin,  Model: 17 Series A/C (DAIKIN128)
+//   Brand: Daikin,  Model: FTXB12AXVJU A/C (DAIKIN128)
+//   Brand: Daikin,  Model: FTXB09AXVJU A/C (DAIKIN128)
+//   Brand: Daikin,  Model: BRC52B63 remote (DAIKIN128)
+
 
 #ifndef IR_DAIKIN_H_
 #define IR_DAIKIN_H_
@@ -257,18 +263,70 @@ const uint16_t kDaikin176Sections = 2;
 const uint16_t kDaikin176Section1Length = 7;
 const uint16_t kDaikin176Section2Length = kDaikin176StateLength -
                                           kDaikin176Section1Length;
-const uint8_t kDaikin176Cool = 0b111;
+const uint8_t kDaikin176Cool = 0b111;  // 7
 const uint8_t kDaikin176BytePower = 14;
 const uint8_t kDaikin176ByteMode = 12;
-const uint8_t kDaikin176MaskMode = 0b01110011;
+const uint8_t kDaikin176MaskMode = 0b01110000;
+const uint8_t kDaikin176ByteModeButton = 13;
+const uint8_t kDaikin176ModeButton = 0b00000100;
 const uint8_t kDaikin176ByteTemp = 17;
 const uint8_t kDaikin176MaskTemp = 0b01111110;
+const uint8_t kDaikin176DryFanTemp = 17;  // Dry/Fan mode is always 17 Celsius.
 const uint8_t kDaikin176ByteFan = 18;
 const uint8_t kDaikin176MaskFan = 0b11110000;
+const uint8_t kDaikin176FanMax = 3;
 const uint8_t kDaikin176ByteSwingH = 18;
 const uint8_t kDaikin176MaskSwingH = 0b00001111;
 const uint8_t kDaikin176SwingHAuto =  0x5;
-const uint8_t kDaikin176SwingHSwing = 0x6;
+const uint8_t kDaikin176SwingHOff = 0x6;
+
+// Another variant of the protocol for the Daikin BRC52B63 remote.
+// Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/827
+const uint16_t kDaikin128Freq = 38000;  // Modulation Frequency in Hz.
+const uint16_t kDaikin128LeaderMark = 9800;
+const uint16_t kDaikin128LeaderSpace = 9800;
+const uint16_t kDaikin128HdrMark = 4600;
+const uint16_t kDaikin128HdrSpace = 2500;
+const uint16_t kDaikin128BitMark = 350;
+const uint16_t kDaikin128OneSpace = 954;
+const uint16_t kDaikin128ZeroSpace = 382;
+const uint16_t kDaikin128Gap = 20300;
+const uint16_t kDaikin128FooterMark = kDaikin128HdrMark;
+const uint16_t kDaikin128Sections = 2;
+const uint16_t kDaikin128SectionLength = 8;
+const uint8_t kDaikin128ByteModeFan = 1;
+const uint8_t kDaikin128MaskMode =        0b00001111;
+const uint8_t kDaikin128Dry =             0b00000001;
+const uint8_t kDaikin128Cool =            0b00000010;
+const uint8_t kDaikin128Fan =             0b00000100;
+const uint8_t kDaikin128Heat =            0b00001000;
+const uint8_t kDaikin128Auto =            0b00001010;
+const uint8_t kDaikin128MaskFan =         0b11110000;
+const uint8_t kDaikin128FanAuto =         0b0001;
+const uint8_t kDaikin128FanHigh =         0b0010;
+const uint8_t kDaikin128FanMed =          0b0100;
+const uint8_t kDaikin128FanLow =          0b1000;
+const uint8_t kDaikin128FanPowerful =     0b0011;
+const uint8_t kDaikin128FanQuiet =        0b1001;
+const uint8_t kDaikin128ByteClockMins = 2;
+const uint8_t kDaikin128ByteClockHours = 3;
+const uint8_t kDaikin128ByteOnTimer = 4;
+const uint8_t kDaikin128ByteOffTimer = 5;
+const uint8_t kDaikin128BitTimerEnabled = 0b10000000;
+const uint8_t kDaikin128BitHalfHour =     0b01000000;
+const uint8_t kDaikin128MaskHours =       0b00111111;
+const uint8_t kDaikin128ByteTemp = 6;
+const uint8_t kDaikin128MinTemp = 16;  // C
+const uint8_t kDaikin128MaxTemp = 30;  // C
+const uint8_t kDaikin128BytePowerSwingSleep = 7;
+const uint8_t kDaikin128BitSwing =        0b00000001;
+const uint8_t kDaikin128BitSleep =        0b00000010;
+const uint8_t kDaikin128BitPowerToggle =  0b00001000;
+const uint8_t kDaikin128ByteEconoLight = 9;
+const uint8_t kDaikin128BitEcono =        0b00000100;
+const uint8_t kDaikin128BitWall =         0b00001000;
+const uint8_t kDaikin128BitCeiling =      0b00000001;
+const uint8_t kDaikin128MaskLight = kDaikin128BitWall | kDaikin128BitCeiling;
 
 // Legacy defines.
 #define DAIKIN_COOL kDaikinCool
@@ -548,7 +606,8 @@ class IRDaikin160 {
 // Class to emulate a Daikin BRC4C153 remote.
 class IRDaikin176 {
  public:
-  explicit IRDaikin176(uint16_t pin);
+  explicit IRDaikin176(const uint16_t pin, const bool inverted = false,
+                       const bool use_modulation = true);
 
 #if SEND_DAIKIN176
   void send(const uint16_t repeat = kDaikin176DefaultRepeat);
@@ -572,8 +631,10 @@ class IRDaikin176 {
   uint8_t getFan(void);
   static uint8_t convertFan(const stdAc::fanspeed_t speed);
   void setSwingHorizontal(const uint8_t position);
-  uint8_t getSwingHorizontal();
+  uint8_t getSwingHorizontal(void);
   static uint8_t convertSwingH(const stdAc::swingh_t position);
+  static stdAc::fanspeed_t toCommonFanSpeed(const uint8_t speed);
+  static stdAc::opmode_t toCommonMode(const uint8_t mode);
   static stdAc::swingh_t toCommonSwingH(const uint8_t setting);
   stdAc::state_t toCommon(void);
   String toString(void);
@@ -587,8 +648,77 @@ class IRDaikin176 {
 #endif
   // # of bytes per command
   uint8_t remote_state[kDaikin176StateLength];
+  uint8_t _saved_temp;
   void stateReset();
   void checksum();
 };
 
+// Class to emulate a Daikin BRC52B63 remote / Daikin 17 series A/C.
+class IRDaikin128 {
+ public:
+  explicit IRDaikin128(const uint16_t pin, const bool inverted = false,
+                       const bool use_modulation = true);
+#if SEND_DAIKIN128
+  void send(const uint16_t repeat = kDaikin128DefaultRepeat);
+  uint8_t calibrate(void) { return _irsend.calibrate(); }
+#endif  // SEND_DAIKIN128
+  void begin();
+  void setPowerToggle(const bool toggle);
+  bool getPowerToggle(void);
+  void setTemp(const uint8_t temp);
+  uint8_t getTemp(void);
+  void setFan(const uint8_t fan);
+  uint8_t getFan(void);
+  uint8_t getMode(void);
+  void setMode(const uint8_t mode);
+  void setSwingVertical(const bool on);
+  bool getSwingVertical();
+  bool getSleep(void);
+  void setSleep(const bool on);
+  bool getQuiet(void);
+  void setQuiet(const bool on);
+  bool getPowerful(void);
+  void setPowerful(const bool on);
+  void setEcono(const bool on);
+  bool getEcono(void);
+  void setOnTimer(const uint16_t mins_since_midnight);
+  uint16_t getOnTimer(void);
+  bool getOnTimerEnabled(void);
+  void setOnTimerEnabled(const bool on);
+  void setOffTimer(const uint16_t mins_since_midnight);
+  uint16_t getOffTimer(void);
+  bool getOffTimerEnabled(void);
+  void setOffTimerEnabled(const bool on);
+  void setClock(const uint16_t mins_since_midnight);
+  uint16_t getClock(void);
+  void setLightToggle(const uint8_t unit_type);
+  uint8_t getLightToggle(void);
+  uint8_t* getRaw(void);
+  void setRaw(const uint8_t new_code[]);
+  static bool validChecksum(uint8_t state[]);
+  static uint8_t convertMode(const stdAc::opmode_t mode);
+  static uint8_t convertFan(const stdAc::fanspeed_t speed);
+  static stdAc::opmode_t toCommonMode(const uint8_t mode);
+  static stdAc::fanspeed_t toCommonFanSpeed(const uint8_t speed);
+  stdAc::state_t toCommon(const stdAc::state_t *prev = NULL);
+  String toString(void);
+#ifndef UNIT_TEST
+
+ private:
+  IRsend _irsend;
+#else
+  IRsendTest _irsend;
+#endif
+  // # of bytes per command
+  uint8_t remote_state[kDaikin128StateLength];
+  void stateReset(void);
+  static uint8_t calcFirstChecksum(const uint8_t state[]);
+  static uint8_t calcSecondChecksum(const uint8_t state[]);
+  static void setTimer(uint8_t *ptr, const uint16_t mins_since_midnight);
+  static uint16_t getTimer(const uint8_t *ptr);
+  void checksum(void);
+  void clearOnTimerFlag(void);
+  void clearSleepTimerFlag(void);
+};
+
 #endif  // IR_DAIKIN_H_
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Denon.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Denon.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Denon.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Denon.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Dish.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Dish.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Dish.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Dish.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Electra.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Electra.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Electra.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Electra.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Electra.h b/lib/IRremoteESP8266-2.6.4/src/ir_Electra.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Electra.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Electra.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Fujitsu.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Fujitsu.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Fujitsu.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Fujitsu.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Fujitsu.h b/lib/IRremoteESP8266-2.6.4/src/ir_Fujitsu.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Fujitsu.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Fujitsu.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_GICable.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_GICable.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_GICable.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_GICable.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_GlobalCache.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_GlobalCache.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_GlobalCache.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_GlobalCache.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Goodweather.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Goodweather.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Goodweather.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Goodweather.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Goodweather.h b/lib/IRremoteESP8266-2.6.4/src/ir_Goodweather.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Goodweather.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Goodweather.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Gree.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Gree.cpp
similarity index 89%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Gree.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Gree.cpp
index 34fc5bc91..2bfb8e8b5 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_Gree.cpp
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_Gree.cpp
@@ -113,9 +113,12 @@ void IRsend::sendGree(const uint64_t data, const uint16_t nbits,
 }
 #endif  // SEND_GREE
 
-IRGreeAC::IRGreeAC(const uint16_t pin, const bool inverted,
-                   const bool use_modulation)
-    : _irsend(pin, inverted, use_modulation) { stateReset(); }
+IRGreeAC::IRGreeAC(const uint16_t pin, const gree_ac_remote_model_t model,
+                   const bool inverted, const bool use_modulation)
+    : _irsend(pin, inverted, use_modulation) {
+  stateReset();
+  setModel(model);
+}
 
 void IRGreeAC::stateReset(void) {
   // This resets to a known-good state to Power Off, Fan Auto, Mode Auto, 25C.
@@ -128,6 +131,7 @@ void IRGreeAC::stateReset(void) {
 }
 
 void IRGreeAC::fixup(void) {
+  setPower(getPower());  // Redo the power bits as they differ between models.
   checksum();  // Calculate the checksums
 }
 
@@ -149,6 +153,13 @@ void IRGreeAC::setRaw(const uint8_t new_code[]) {
   for (uint8_t i = 0; i < kGreeStateLength; i++) {
     remote_state[i] = new_code[i];
   }
+  // We can only detect the difference between models when the power is on.
+  if (getPower()) {
+    if (remote_state[2] & kGreePower2Mask)
+      _model = gree_ac_remote_model_t::YAW1F;
+    else
+      _model = gree_ac_remote_model_t::YBOFB;
+  }
 }
 
 void IRGreeAC::checksum(const uint16_t length) {
@@ -165,33 +176,45 @@ void IRGreeAC::checksum(const uint16_t length) {
 //   A boolean.
 bool IRGreeAC::validChecksum(const uint8_t state[], const uint16_t length) {
   // Top 4 bits of the last byte in the state is the state's checksum.
-  if (state[length - 1] >> 4 ==
-      IRKelvinatorAC::calcBlockChecksum(state, length))
-    return true;
-  else
-    return false;
+  return (state[length - 1] >> 4 == IRKelvinatorAC::calcBlockChecksum(state,
+                                                                      length));
 }
 
-void IRGreeAC::on(void) {
-  remote_state[0] |= kGreePower1Mask;
-  remote_state[2] |= kGreePower2Mask;
+void IRGreeAC::setModel(const gree_ac_remote_model_t model) {
+  switch (model) {
+    case gree_ac_remote_model_t::YAW1F:
+    case gree_ac_remote_model_t::YBOFB:
+      _model = model; break;
+    default:
+      setModel(gree_ac_remote_model_t::YAW1F);
+  }
 }
 
-void IRGreeAC::off(void) {
-  remote_state[0] &= ~kGreePower1Mask;
-  remote_state[2] &= ~kGreePower2Mask;
+gree_ac_remote_model_t IRGreeAC::getModel(void) {
+  return _model;
 }
 
+void IRGreeAC::on(void) { setPower(true); }
+
+void IRGreeAC::off(void) { setPower(false); }
+
 void IRGreeAC::setPower(const bool on) {
-  if (on)
-    this->on();
-  else
-    this->off();
+  if (on) {
+    remote_state[0] |= kGreePower1Mask;
+    switch (_model) {
+      case gree_ac_remote_model_t::YBOFB: break;
+      default:
+        remote_state[2] |= kGreePower2Mask;
+    }
+  } else {
+    remote_state[0] &= ~kGreePower1Mask;
+    remote_state[2] &= ~kGreePower2Mask;  // May not be needed. See #814
+  }
 }
 
 bool IRGreeAC::getPower(void) {
-  return (remote_state[0] & kGreePower1Mask) &&
-         (remote_state[2] & kGreePower2Mask);
+  //  See #814. Not checking/requiring: (remote_state[2] & kGreePower2Mask)
+  return remote_state[0] & kGreePower1Mask;
 }
 
 // Set the temp. in deg C
@@ -424,7 +447,7 @@ stdAc::swingv_t IRGreeAC::toCommonSwingV(const uint8_t pos) {
 stdAc::state_t IRGreeAC::toCommon(void) {
   stdAc::state_t result;
   result.protocol = decode_type_t::GREE;
-  result.model = -1;  // No models used.
+  result.model = this->getModel();
   result.power = this->getPower();
   result.mode = this->toCommonMode(this->getMode());
   result.celsius = true;
@@ -452,7 +475,13 @@ stdAc::state_t IRGreeAC::toCommon(void) {
 String IRGreeAC::toString(void) {
   String result = "";
   result.reserve(150);  // Reserve some heap for the string to reduce fragging.
-  result += addBoolToString(getPower(), F("Power"), false);
+  result += addIntToString(getModel(), F("Model"), false);
+  switch (getModel()) {
+    case gree_ac_remote_model_t::YAW1F: result += F(" (YAW1F)"); break;
+    case gree_ac_remote_model_t::YBOFB: result += F(" (YBOFB)"); break;
+    default: result += F(" (UNKNOWN)");
+  }
+  result += addBoolToString(getPower(), F("Power"));
   result += addModeToString(getMode(), kGreeAuto, kGreeCool, kGreeHeat,
                             kGreeDry, kGreeFan);
   result += addTempToString(getTemp());
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Gree.h b/lib/IRremoteESP8266-2.6.4/src/ir_Gree.h
similarity index 87%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Gree.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Gree.h
index c25f40b41..9619c68e3 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_Gree.h
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_Gree.h
@@ -6,6 +6,8 @@
 //   Brand: EKOKAI,  Model: A/C
 //   Brand: RusClimate,  Model: EACS/I-09HAR_X/N3 A/C
 //   Brand: RusClimate,  Model: YAW1F remote
+//   Brand: Green,  Model: YBOFB remote
+//   Brand: Green,  Model: YBOFB2 remote
 
 #ifndef IR_GREE_H_
 #define IR_GREE_H_
@@ -22,6 +24,11 @@
 #endif
 
 // Constants
+enum gree_ac_remote_model_t {
+  YAW1F = 1,  // (1) Ultimate, EKOKAI, RusClimate (Default)
+  YBOFB,     // (2) Green, YBOFB2, YAPOF3
+};
+
 const uint8_t kGreeAuto = 0;
 const uint8_t kGreeCool = 1;
 const uint8_t kGreeDry = 2;
@@ -37,7 +44,7 @@ const uint8_t kGreeSleepMask = 0b10000000;
 // Byte 2
 const uint8_t kGreeTurboMask = 0b00010000;
 const uint8_t kGreeLightMask = 0b00100000;
-const uint8_t kGreePower2Mask = 0b01000000;
+const uint8_t kGreePower2Mask = 0b01000000;  // This might not be used. See #814
 const uint8_t kGreeXfanMask = 0b10000000;
 // Byte 4
 const uint8_t kGreeSwingPosMask = 0b00001111;
@@ -87,8 +94,10 @@ const uint8_t kGreeSwingUpAuto = 0b00001011;
 // Classes
 class IRGreeAC {
  public:
-  explicit IRGreeAC(const uint16_t pin, const bool inverted = false,
-                    const bool use_modulation = true);
+  explicit IRGreeAC(
+      const uint16_t pin,
+      const gree_ac_remote_model_t model = gree_ac_remote_model_t::YAW1F,
+      const bool inverted = false, const bool use_modulation = true);
 
   void stateReset(void);
 #if SEND_GREE
@@ -98,6 +107,8 @@ class IRGreeAC {
   void begin(void);
   void on(void);
   void off(void);
+  void setModel(const gree_ac_remote_model_t model);
+  gree_ac_remote_model_t getModel(void);
   void setPower(const bool on);
   bool getPower(void);
   void setTemp(const uint8_t temp);
@@ -142,6 +153,7 @@ class IRGreeAC {
 #endif  // UNIT_TEST
   // The state of the IR remote in IR code form.
   uint8_t remote_state[kGreeStateLength];
+  gree_ac_remote_model_t _model;
   void checksum(const uint16_t length = kGreeStateLength);
   void fixup(void);
 };
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Haier.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Haier.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Haier.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Haier.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Haier.h b/lib/IRremoteESP8266-2.6.4/src/ir_Haier.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Haier.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Haier.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Hitachi.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Hitachi.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Hitachi.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Hitachi.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Hitachi.h b/lib/IRremoteESP8266-2.6.4/src/ir_Hitachi.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Hitachi.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Hitachi.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Inax.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Inax.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Inax.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Inax.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_JVC.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_JVC.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_JVC.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_JVC.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Kelvinator.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Kelvinator.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Kelvinator.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Kelvinator.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Kelvinator.h b/lib/IRremoteESP8266-2.6.4/src/ir_Kelvinator.h
similarity index 99%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Kelvinator.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Kelvinator.h
index b30781649..fac26bf2e 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_Kelvinator.h
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_Kelvinator.h
@@ -13,6 +13,7 @@
 //   Brand: Kelvinator,  Model: KSV70CRC A/C
 //   Brand: Kelvinator,  Model: KSV70HRC A/C
 //   Brand: Kelvinator,  Model: KSV80HRC A/C
+//   Brand: Green,  Model: YAPOF3 remote
 
 #ifndef IR_KELVINATOR_H_
 #define IR_KELVINATOR_H_
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_LG.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_LG.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_LG.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_LG.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_LG.h b/lib/IRremoteESP8266-2.6.4/src/ir_LG.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_LG.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_LG.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Lasertag.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Lasertag.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Lasertag.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Lasertag.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Lego.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Lego.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Lego.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Lego.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Lutron.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Lutron.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Lutron.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Lutron.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_MWM.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_MWM.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_MWM.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_MWM.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Magiquest.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Magiquest.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Magiquest.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Magiquest.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Magiquest.h b/lib/IRremoteESP8266-2.6.4/src/ir_Magiquest.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Magiquest.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Magiquest.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Midea.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Midea.cpp
similarity index 77%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Midea.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Midea.cpp
index e14f21434..80744c9cb 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_Midea.cpp
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_Midea.cpp
@@ -101,6 +101,7 @@ IRMideaAC::IRMideaAC(const uint16_t pin, const bool inverted,
 void IRMideaAC::stateReset(void) {
   // Power On, Mode Auto, Fan Auto, Temp = 25C/77F
   remote_state = 0xA1826FFFFF62;
+  _SwingVToggle = false;
 }
 
 // Configure the pin for output.
@@ -111,6 +112,11 @@ void IRMideaAC::begin(void) { _irsend.begin(); }
 void IRMideaAC::send(const uint16_t repeat) {
   this->checksum();  // Ensure correct checksum before sending.
   _irsend.sendMidea(remote_state, kMideaBits, repeat);
+  // Handle toggling the swing if we need to.
+  if (_SwingVToggle && !isSwingVToggle()) {
+    _irsend.sendMidea(kMideaACToggleSwingV, kMideaBits, repeat);
+  }
+  _SwingVToggle = false;  // The toggle message has been sent, so reset.
 }
 #endif  // SEND_MIDEA
 
@@ -144,35 +150,59 @@ void IRMideaAC::setPower(const bool on) {
 // Return the requested power state of the A/C.
 bool IRMideaAC::getPower(void) { return (remote_state & kMideaACPower); }
 
+// Returns true if we want the A/C unit to work natively in Celsius.
+bool IRMideaAC::getUseCelsius(void) {
+  return !(remote_state & kMideaACCelsiusBit);
+}
+
+// Set the A/C unit to use Celsius natively.
+void IRMideaAC::setUseCelsius(const bool on) {
+  if (on != getUseCelsius()) {  // We need to change.
+    uint8_t native_temp = getTemp(!on);  // Get the old native temp.
+    if (on)
+      remote_state &= ~kMideaACCelsiusBit;  // Clear the bit
+    else
+      remote_state |= kMideaACCelsiusBit;  // Set the bit
+    setTemp(native_temp, !on);  // Reset temp using the old native temp.
+  }
+}
+
 // Set the temperature.
 // Args:
 //   temp:       Temp. in degrees.
 //   useCelsius: Degree type to use. Celsius (true) or Fahrenheit (false)
 void IRMideaAC::setTemp(const uint8_t temp, const bool useCelsius) {
-  uint8_t new_temp = temp;
+  uint8_t max_temp = kMideaACMaxTempF;
+  uint8_t min_temp = kMideaACMinTempF;
   if (useCelsius) {
-    new_temp = std::max(kMideaACMinTempC, new_temp);
-    new_temp = std::min(kMideaACMaxTempC, new_temp);
-    // Convert and add 0.5 for rounding.
-    new_temp = celsiusToFahrenheit(new_temp) + 0.5;
+    max_temp = kMideaACMaxTempC;
+    min_temp = kMideaACMinTempC;
   }
-  new_temp = std::max(kMideaACMinTempF, new_temp);
-  new_temp = std::min(kMideaACMaxTempF, new_temp);
-  new_temp -= kMideaACMinTempF;
+  uint8_t new_temp = std::min(max_temp, std::max(min_temp, temp));
+  if (getUseCelsius() && !useCelsius)  // Native is in C, new_temp is in F
+    new_temp = fahrenheitToCelsius(new_temp) - kMideaACMinTempC;
+  else if (!getUseCelsius() && useCelsius)  // Native is in F, new_temp is in C
+    new_temp = celsiusToFahrenheit(new_temp) - kMideaACMinTempF;
+  else  // Native and desired are the same units.
+    new_temp -= min_temp;
+  // Set the actual data.
   remote_state &= kMideaACTempMask;
   remote_state |= ((uint64_t)new_temp << 24);
 }
 
 // Return the set temp.
 // Args:
-//   useCelsius: Flag indicating if the results are in Celsius or Fahrenheit.
+//   celsius: Flag indicating if the results are in Celsius or Fahrenheit.
 // Returns:
 //   A uint8_t containing the temperature.
-uint8_t IRMideaAC::getTemp(const bool useCelsius) {
-  uint8_t temp = ((remote_state >> 24) & 0x1F) + kMideaACMinTempF;
-  if (useCelsius) {
-    temp = fahrenheitToCelsius(temp);
-  }
+uint8_t IRMideaAC::getTemp(const bool celsius) {
+  uint8_t temp = ((remote_state >> 24) & 0x1F);
+  if (getUseCelsius())
+    temp += kMideaACMinTempC;
+  else
+    temp += kMideaACMinTempF;
+  if (celsius && !getUseCelsius()) temp = fahrenheitToCelsius(temp) + 0.5;
+  if (!celsius && getUseCelsius()) temp = celsiusToFahrenheit(temp);
   return temp;
 }
 
@@ -228,6 +258,21 @@ void IRMideaAC::setSleep(const bool on) {
 // Return the Sleep state of the A/C.
 bool IRMideaAC::getSleep(void) { return (remote_state & kMideaACSleep); }
 
+// Set the A/C to toggle the vertical swing toggle for the next send.
+void IRMideaAC::setSwingVToggle(const bool on) {
+  _SwingVToggle = on;
+}
+
+// Return if the message/state is just a Swing V toggle message/command.
+bool IRMideaAC::isSwingVToggle(void) {
+  return remote_state == kMideaACToggleSwingV;
+}
+// Return the Swing V toggle state of the A/C.
+bool IRMideaAC::getSwingVToggle(void) {
+  _SwingVToggle |= isSwingVToggle();
+  return _SwingVToggle;
+}
+
 // Calculate the checksum for a given array.
 // Args:
 //   state:  The state to calculate the checksum over.
@@ -316,19 +361,16 @@ stdAc::fanspeed_t IRMideaAC::toCommonFanSpeed(const uint8_t speed) {
 }
 
 // Convert the A/C state to it's common equivalent.
-stdAc::state_t IRMideaAC::toCommon(void) {
+stdAc::state_t IRMideaAC::toCommon(const stdAc::state_t *prev) {
   stdAc::state_t result;
+  if (prev != NULL) {
+    result = *prev;
+  } else {
+  // Fixed/Not supported/Non-zero defaults.
   result.protocol = decode_type_t::MIDEA;
   result.model = -1;  // No models used.
-  result.power = this->getPower();
-  result.mode = this->toCommonMode(this->getMode());
-  result.celsius = true;
-  result.degrees = this->getTemp(result.celsius);
-  result.fanspeed = this->toCommonFanSpeed(this->getFan());
-  result.sleep = this->getSleep() ? 0 : -1;
-  // Not supported.
-  result.swingv = stdAc::swingv_t::kOff;
   result.swingh = stdAc::swingh_t::kOff;
+  result.swingv = stdAc::swingv_t::kOff;
   result.quiet = false;
   result.turbo = false;
   result.clean = false;
@@ -336,24 +378,42 @@ stdAc::state_t IRMideaAC::toCommon(void) {
   result.filter = false;
   result.light = false;
   result.beep = false;
+  result.sleep = -1;
   result.clock = -1;
+  }
+  if (this->isSwingVToggle()) {
+    result.swingv = result.swingv != stdAc::swingv_t::kOff ?
+        stdAc::swingv_t::kAuto : stdAc::swingv_t::kOff;
+    return result;
+  }
+  result.power = this->getPower();
+  result.mode = this->toCommonMode(this->getMode());
+  result.celsius = this->getUseCelsius();
+  result.degrees = this->getTemp(result.celsius);
+  result.fanspeed = this->toCommonFanSpeed(this->getFan());
+  result.sleep = this->getSleep() ? 0 : -1;
   return result;
 }
 
 // Convert the internal state into a human readable string.
 String IRMideaAC::toString(void) {
   String result = "";
-  result.reserve(70);  // Reserve some heap for the string to reduce fragging.
-  result += addBoolToString(getPower(), F("Power"), false);
-  result += addModeToString(getMode(), kMideaACAuto, kMideaACCool, kMideaACHeat,
-                            kMideaACDry, kMideaACFan);
-  result += addTempToString(getTemp(true));
-  result += '/';
-  result += uint64ToString(getTemp(false));
-  result += 'F';
-  result += addFanToString(getFan(), kMideaACFanHigh, kMideaACFanLow,
-                           kMideaACFanAuto, kMideaACFanAuto, kMideaACFanMed);
-  result += addBoolToString(getSleep(), F("Sleep"));
+  result.reserve(100);  // Reserve some heap for the string to reduce fragging.
+  if (!isSwingVToggle()) {
+    result += addBoolToString(getPower(), F("Power"), false);
+    result += addModeToString(getMode(), kMideaACAuto, kMideaACCool,
+                              kMideaACHeat, kMideaACDry, kMideaACFan);
+    result += addBoolToString(getUseCelsius(), F("Celsius"));
+    result += addTempToString(getTemp(true));
+    result += '/';
+    result += uint64ToString(getTemp(false));
+    result += 'F';
+    result += addFanToString(getFan(), kMideaACFanHigh, kMideaACFanLow,
+                             kMideaACFanAuto, kMideaACFanAuto, kMideaACFanMed);
+    result += addBoolToString(getSleep(), F("Sleep"));
+  }
+  result += addBoolToString(getSwingVToggle(), F("Swing(V) Toggle"),
+                            !isSwingVToggle());
   return result;
 }
 
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Midea.h b/lib/IRremoteESP8266-2.6.4/src/ir_Midea.h
similarity index 81%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Midea.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Midea.h
index 6689459a6..289821778 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_Midea.h
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_Midea.h
@@ -4,6 +4,8 @@
 // Supports:
 //   Brand: Pioneer System,  Model: RYBO12GMFILCAD A/C (12K BTU)
 //   Brand: Pioneer System,  Model: RUBO18GMFILCAD A/C (18K BTU)
+//   Brand: Comfee, Model: MPD1-12CRN7 A/C
+//   Brand: Keystone, Model: RG57H4(B)BGEF remote
 
 #ifndef IR_MIDEA_H_
 #define IR_MIDEA_H_
@@ -37,13 +39,15 @@ const uint64_t kMideaACPower = 1ULL << 39;
 const uint64_t kMideaACSleep = 1ULL << 38;
 const uint8_t kMideaACMinTempF = 62;  // Fahrenheit
 const uint8_t kMideaACMaxTempF = 86;  // Fahrenheit
-const uint8_t kMideaACMinTempC = 16;  // Celsius
+const uint8_t kMideaACMinTempC = 17;  // Celsius
 const uint8_t kMideaACMaxTempC = 30;  // Celsius
-const uint64_t kMideaACStateMask = 0x0000FFFFFFFFFFFF;
-const uint64_t kMideaACTempMask = 0x0000FFFFE0FFFFFF;
-const uint64_t kMideaACFanMask = 0x0000FFC7FFFFFFFF;
-const uint64_t kMideaACModeMask = 0x0000FFF8FFFFFFFF;
+const uint64_t kMideaACStateMask =    0x0000FFFFFFFFFFFF;
+const uint64_t kMideaACCelsiusBit =   0x0000000020000000;
+const uint64_t kMideaACTempMask =     0x0000FFFFE0FFFFFF;
+const uint64_t kMideaACFanMask =      0x0000FFC7FFFFFFFF;
+const uint64_t kMideaACModeMask =     0x0000FFF8FFFFFFFF;
 const uint64_t kMideaACChecksumMask = 0x0000FFFFFFFFFF00;
+const uint64_t kMideaACToggleSwingV = 0x0000A201FFFFFF7C;
 
 // Legacy defines. (Deprecated)
 #define MIDEA_AC_COOL kMideaACCool
@@ -77,6 +81,8 @@ class IRMideaAC {
   void off(void);
   void setPower(const bool on);
   bool getPower(void);
+  bool getUseCelsius(void);
+  void setUseCelsius(const bool celsius);
   void setTemp(const uint8_t temp, const bool useCelsius = false);
   uint8_t getTemp(const bool useCelsius = false);
   void setFan(const uint8_t fan);
@@ -88,11 +94,14 @@ class IRMideaAC {
   static bool validChecksum(const uint64_t state);
   void setSleep(const bool on);
   bool getSleep(void);
+  bool isSwingVToggle(void);
+  void setSwingVToggle(const bool on);
+  bool getSwingVToggle(void);
   uint8_t convertMode(const stdAc::opmode_t mode);
   uint8_t convertFan(const stdAc::fanspeed_t speed);
   static stdAc::opmode_t toCommonMode(const uint8_t mode);
   static stdAc::fanspeed_t toCommonFanSpeed(const uint8_t speed);
-  stdAc::state_t toCommon(void);
+  stdAc::state_t toCommon(const stdAc::state_t *prev = NULL);
   String toString(void);
 #ifndef UNIT_TEST
 
@@ -102,6 +111,7 @@ class IRMideaAC {
   IRsendTest _irsend;
 #endif
   uint64_t remote_state;
+  bool _SwingVToggle;
   void checksum(void);
   static uint8_t calcChecksum(const uint64_t state);
 };
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Mitsubishi.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Mitsubishi.cpp
similarity index 92%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Mitsubishi.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Mitsubishi.cpp
index b1c8e702c..14a0676fd 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_Mitsubishi.cpp
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_Mitsubishi.cpp
@@ -553,11 +553,24 @@ void IRMitsubishiAC::setVane(const uint8_t position) {
   remote_state[9] |= pos;
 }
 
+// Set the requested wide-vane operation mode of the a/c unit.
+void IRMitsubishiAC::setWideVane(const uint8_t position) {
+  uint8_t pos = std::min(position, kMitsubishiAcWideVaneAuto);  // bounds check
+  pos <<= 4;
+  remote_state[8] &= 0b00001111;  // Clear the previous setting.
+  remote_state[8] |= pos;
+}
+
 // Return the requested vane operation mode of the a/c unit.
 uint8_t IRMitsubishiAC::getVane(void) {
   return ((remote_state[9] & 0b00111000) >> 3);
 }
 
+// Return the requested wide vane operation mode of the a/c unit.
+uint8_t IRMitsubishiAC::getWideVane(void) {
+  return (remote_state[8] >> 4);
+}
+
 // Return the clock setting of the message. 1=1/6 hour. e.g. 4pm = 48
 uint8_t IRMitsubishiAC::getClock(void) { return remote_state[10]; }
 
@@ -630,13 +643,39 @@ uint8_t IRMitsubishiAC::convertFan(const stdAc::fanspeed_t speed) {
 uint8_t IRMitsubishiAC::convertSwingV(const stdAc::swingv_t position) {
   switch (position) {
     case stdAc::swingv_t::kHighest:
+      return kMitsubishiAcVaneAutoMove - 6;
     case stdAc::swingv_t::kHigh:
+      return kMitsubishiAcVaneAutoMove - 5;
     case stdAc::swingv_t::kMiddle:
+      return kMitsubishiAcVaneAutoMove - 4;
     case stdAc::swingv_t::kLow:
+      return kMitsubishiAcVaneAutoMove - 3;
     case stdAc::swingv_t::kLowest:
-      return kMitsubishiAcVaneAutoMove;
+      return kMitsubishiAcVaneAutoMove - 2;
+    case stdAc::swingv_t::kAuto:
+       return kMitsubishiAcVaneAutoMove;
     default:
-      return kMitsubishiAcVaneAuto;
+       return kMitsubishiAcVaneAuto;
+  }
+}
+
+// Convert a standard A/C wide wane swing into its native setting.
+uint8_t IRMitsubishiAC::convertSwingH(const stdAc::swingh_t position) {
+  switch (position) {
+    case stdAc::swingh_t::kLeftMax:
+      return kMitsubishiAcWideVaneAuto - 7;
+    case stdAc::swingh_t::kLeft:
+      return kMitsubishiAcWideVaneAuto - 6;
+    case stdAc::swingh_t::kMiddle:
+      return kMitsubishiAcWideVaneAuto - 5;
+    case stdAc::swingh_t::kRight:
+      return kMitsubishiAcWideVaneAuto - 4;
+    case stdAc::swingh_t::kRightMax:
+      return kMitsubishiAcWideVaneAuto - 3;
+    case stdAc::swingh_t::kAuto:
+      return kMitsubishiAcWideVaneAuto;
+    default:
+      return kMitsubishiAcWideVaneAuto - 5;
   }
 }
 
@@ -674,6 +713,18 @@ stdAc::swingv_t IRMitsubishiAC::toCommonSwingV(const uint8_t pos) {
   }
 }
 
+// Convert a native horizontal swing to it's common equivalent.
+stdAc::swingh_t IRMitsubishiAC::toCommonSwingH(const uint8_t pos) {
+  switch (pos) {
+    case 1: return stdAc::swingh_t::kLeftMax;
+    case 2: return stdAc::swingh_t::kLeft;
+    case 3: return stdAc::swingh_t::kMiddle;
+    case 4: return stdAc::swingh_t::kRight;
+    case 5: return stdAc::swingh_t::kRightMax;
+    default: return stdAc::swingh_t::kAuto;
+  }
+}
+
 // Convert the A/C state to it's common equivalent.
 stdAc::state_t IRMitsubishiAC::toCommon(void) {
   stdAc::state_t result;
@@ -685,9 +736,9 @@ stdAc::state_t IRMitsubishiAC::toCommon(void) {
   result.degrees = this->getTemp();
   result.fanspeed = this->toCommonFanSpeed(this->getFan());
   result.swingv = this->toCommonSwingV(this->getVane());
+  result.swingh = this->toCommonSwingH(this->getWideVane());
   result.quiet = this->getFan() == kMitsubishiAcFanSilent;
   // Not supported.
-  result.swingh = stdAc::swingh_t::kOff;
   result.turbo = false;
   result.clean = false;
   result.econo = false;
@@ -723,6 +774,14 @@ String IRMitsubishiAC::toString(void) {
     default:
       result += uint64ToString(this->getVane());
   }
+  result += F(", Wide Vane: ");
+  switch (this->getWideVane()) {
+    case kMitsubishiAcWideVaneAuto:
+      result += F("AUTO");
+      break;
+    default:
+      result += uint64ToString(this->getWideVane());
+  }
   result += addLabeledString(minsToString(getClock() * 10), F("Time"));
   result += addLabeledString(minsToString(getStartClock() * 10), F("On timer"));
   result += addLabeledString(minsToString(getStopClock() * 10), F("Off timer"));
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Mitsubishi.h b/lib/IRremoteESP8266-2.6.4/src/ir_Mitsubishi.h
similarity index 94%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Mitsubishi.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Mitsubishi.h
index af2baeea1..ac67082dc 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_Mitsubishi.h
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_Mitsubishi.h
@@ -43,6 +43,7 @@ const uint8_t kMitsubishiAcNoTimer = 0;
 const uint8_t kMitsubishiAcStartTimer = 5;
 const uint8_t kMitsubishiAcStopTimer = 3;
 const uint8_t kMitsubishiAcStartStopTimer = 7;
+const uint8_t kMitsubishiAcWideVaneAuto = 8;
 
 // Legacy defines (Deprecated)
 #define MITSUBISHI_AC_VANE_AUTO_MOVE kMitsubishiAcVaneAutoMove
@@ -83,7 +84,9 @@ class IRMitsubishiAC {
   void setMode(const uint8_t mode);
   uint8_t getMode(void);
   void setVane(const uint8_t position);
+  void setWideVane(const uint8_t position);
   uint8_t getVane(void);
+  uint8_t getWideVane(void);
   uint8_t* getRaw(void);
   void setRaw(const uint8_t* data);
   uint8_t getClock(void);
@@ -97,9 +100,11 @@ class IRMitsubishiAC {
   uint8_t convertMode(const stdAc::opmode_t mode);
   uint8_t convertFan(const stdAc::fanspeed_t speed);
   uint8_t convertSwingV(const stdAc::swingv_t position);
+  uint8_t convertSwingH(const stdAc::swingh_t position);
   static stdAc::opmode_t toCommonMode(const uint8_t mode);
   static stdAc::fanspeed_t toCommonFanSpeed(const uint8_t speed);
   static stdAc::swingv_t toCommonSwingV(const uint8_t pos);
+  static stdAc::swingh_t toCommonSwingH(const uint8_t pos);
   stdAc::state_t toCommon(void);
   String toString(void);
 #ifndef UNIT_TEST
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_MitsubishiHeavy.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_MitsubishiHeavy.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_MitsubishiHeavy.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_MitsubishiHeavy.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_MitsubishiHeavy.h b/lib/IRremoteESP8266-2.6.4/src/ir_MitsubishiHeavy.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_MitsubishiHeavy.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_MitsubishiHeavy.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_NEC.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_NEC.cpp
similarity index 98%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_NEC.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_NEC.cpp
index 9a3fdd2be..03f68c1d9 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_NEC.cpp
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_NEC.cpp
@@ -11,8 +11,7 @@
 #include "IRsend.h"
 #include "IRutils.h"
 
-#if (SEND_NEC || SEND_SHERWOOD || SEND_AIWA_RC_T501 || SEND_SANYO || \
-     SEND_PIONEER)
+#if (SEND_NEC || SEND_SHERWOOD || SEND_AIWA_RC_T501 || SEND_SANYO)
 // Send a raw NEC(Renesas) formatted message.
 //
 // Args:
@@ -62,7 +61,7 @@ uint32_t IRsend::encodeNEC(uint16_t address, uint16_t command) {
     return (address << 24) + ((address ^ 0xFF) << 16) + command;  // Normal.
   }
 }
-#endif
+#endif  // (SEND_NEC || SEND_SHERWOOD || SEND_AIWA_RC_T501 || SEND_SANYO )
 
 #if (DECODE_NEC || DECODE_SHERWOOD || DECODE_AIWA_RC_T501 || DECODE_SANYO)
 // Decode the supplied NEC message.
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_NEC.h b/lib/IRremoteESP8266-2.6.4/src/ir_NEC.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_NEC.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_NEC.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Neoclima.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Neoclima.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Neoclima.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Neoclima.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Neoclima.h b/lib/IRremoteESP8266-2.6.4/src/ir_Neoclima.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Neoclima.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Neoclima.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Nikai.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Nikai.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Nikai.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Nikai.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Panasonic.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Panasonic.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Panasonic.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Panasonic.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Panasonic.h b/lib/IRremoteESP8266-2.6.4/src/ir_Panasonic.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Panasonic.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Panasonic.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Pioneer.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Pioneer.cpp
similarity index 63%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Pioneer.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Pioneer.cpp
index 48197f2a5..490ea9440 100644
--- a/lib/IRremoteESP8266-2.6.3.10/src/ir_Pioneer.cpp
+++ b/lib/IRremoteESP8266-2.6.4/src/ir_Pioneer.cpp
@@ -1,6 +1,7 @@
 // Copyright 2009 Ken Shirriff
 // Copyright 2017, 2018 David Conran
 // Copyright 2018 Kamil Palczewski
+// Copyright 2019 s-hadinger
 
 // Pioneer remote emulation
 
@@ -10,10 +11,26 @@
 #include "IRrecv.h"
 #include "IRsend.h"
 #include "IRutils.h"
-#include "ir_NEC.h"
 
+// Constants
 // Ref:
-//  http://adrian-kingston.com/IRFormatPioneer.htm
+//  http://www.adrian-kingston.com/IRFormatPioneer.htm
+const uint16_t kPioneerTick = 534;
+const uint16_t kPioneerHdrMarkTicks = 16;
+const uint16_t kPioneerHdrMark = kPioneerHdrMarkTicks * kPioneerTick;
+const uint16_t kPioneerHdrSpaceTicks = 8;
+const uint16_t kPioneerHdrSpace = kPioneerHdrSpaceTicks * kPioneerTick;
+const uint16_t kPioneerBitMarkTicks = 1;
+const uint16_t kPioneerBitMark = kPioneerBitMarkTicks * kPioneerTick;
+const uint16_t kPioneerOneSpaceTicks = 3;
+const uint16_t kPioneerOneSpace = kPioneerOneSpaceTicks * kPioneerTick;
+const uint16_t kPioneerZeroSpaceTicks = 1;
+const uint16_t kPioneerZeroSpace = kPioneerZeroSpaceTicks * kPioneerTick;
+const uint16_t kPioneerMinCommandLengthTicks = 159;
+const uint32_t kPioneerMinCommandLength = kPioneerMinCommandLengthTicks *
+                                          kPioneerTick;
+const uint16_t kPioneerMinGapTicks = 47;
+const uint32_t kPioneerMinGap = kPioneerMinGapTicks * kPioneerTick;
 
 #if SEND_PIONEER
 // Send a raw Pioneer formatted message.
@@ -30,13 +47,25 @@
 //  http://adrian-kingston.com/IRFormatPioneer.htm
 void IRsend::sendPioneer(const uint64_t data, const uint16_t nbits,
                          const uint16_t repeat) {
-  // If nbits is to big, or is odd, abort.
-  if (nbits > sizeof(data) * 8 || nbits % 2 == 1) return;
-
-  // send 1st part of the code
-  sendNEC(data >> (nbits / 2), nbits / 2, 0);
-  // send 2nd part of the code
-  sendNEC(data & (((uint64_t)1 << (nbits / 2)) - 1), nbits / 2, repeat);
+  // If nbits is to big, abort.
+  if (nbits > sizeof(data) * 8) return;
+  for (uint16_t r = 0; r <= repeat; r++) {
+    // don't use NEC repeat but repeat the whole sequence
+    if (nbits > 32) {
+      sendGeneric(kPioneerHdrMark, kPioneerHdrSpace,
+                  kPioneerBitMark, kPioneerOneSpace,
+                  kPioneerBitMark, kPioneerZeroSpace,
+                  kPioneerBitMark, kPioneerMinGap,
+                  kPioneerMinCommandLength,
+                  data >> 32, nbits - 32, 40, true, 0, 33);
+    }
+    sendGeneric(kPioneerHdrMark, kPioneerHdrSpace,
+                kPioneerBitMark, kPioneerOneSpace,
+                kPioneerBitMark, kPioneerZeroSpace,
+                kPioneerBitMark, kPioneerMinGap,
+                kPioneerMinCommandLength,
+                data, nbits > 32 ? 32 : nbits, 40, true, 0, 33);
+  }
 }
 
 // Calculate the raw Pioneer data code based on two NEC sub-codes
@@ -89,10 +118,10 @@ bool IRrecv::decodePioneer(decode_results *results, const uint16_t nbits,
     uint16_t used;
     used = matchGeneric(results->rawbuf + offset, &data,
                         results->rawlen - offset, nbits / 2,
-                        kNecHdrMark, kNecHdrSpace,
-                        kNecBitMark, kNecOneSpace,
-                        kNecBitMark, kNecZeroSpace,
-                        kNecBitMark, kNecMinGap, true);
+                        kPioneerHdrMark, kPioneerHdrSpace,
+                        kPioneerBitMark, kPioneerOneSpace,
+                        kPioneerBitMark, kPioneerZeroSpace,
+                        kPioneerBitMark, kPioneerMinGap, true);
     if (!used) return false;
     offset += used;
     uint8_t command = data >> 8;
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Pronto.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Pronto.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Pronto.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Pronto.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_RC5_RC6.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_RC5_RC6.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_RC5_RC6.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_RC5_RC6.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_RCMM.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_RCMM.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_RCMM.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_RCMM.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Samsung.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Samsung.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Samsung.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Samsung.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Samsung.h b/lib/IRremoteESP8266-2.6.4/src/ir_Samsung.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Samsung.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Samsung.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Sanyo.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Sanyo.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Sanyo.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Sanyo.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Sharp.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Sharp.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Sharp.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Sharp.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Sharp.h b/lib/IRremoteESP8266-2.6.4/src/ir_Sharp.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Sharp.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Sharp.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Sherwood.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Sherwood.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Sherwood.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Sherwood.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Sony.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Sony.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Sony.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Sony.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Tcl.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Tcl.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Tcl.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Tcl.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Tcl.h b/lib/IRremoteESP8266-2.6.4/src/ir_Tcl.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Tcl.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Tcl.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Teco.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Teco.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Teco.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Teco.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Teco.h b/lib/IRremoteESP8266-2.6.4/src/ir_Teco.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Teco.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Teco.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Toshiba.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Toshiba.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Toshiba.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Toshiba.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Toshiba.h b/lib/IRremoteESP8266-2.6.4/src/ir_Toshiba.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Toshiba.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Toshiba.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Trotec.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Trotec.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Trotec.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Trotec.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Trotec.h b/lib/IRremoteESP8266-2.6.4/src/ir_Trotec.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Trotec.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Trotec.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Vestel.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Vestel.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Vestel.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Vestel.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Vestel.h b/lib/IRremoteESP8266-2.6.4/src/ir_Vestel.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Vestel.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Vestel.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Whirlpool.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Whirlpool.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Whirlpool.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Whirlpool.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Whirlpool.h b/lib/IRremoteESP8266-2.6.4/src/ir_Whirlpool.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Whirlpool.h
rename to lib/IRremoteESP8266-2.6.4/src/ir_Whirlpool.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/src/ir_Whynter.cpp b/lib/IRremoteESP8266-2.6.4/src/ir_Whynter.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/src/ir_Whynter.cpp
rename to lib/IRremoteESP8266-2.6.4/src/ir_Whynter.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/IRac_test.cpp b/lib/IRremoteESP8266-2.6.4/test/IRac_test.cpp
similarity index 86%
rename from lib/IRremoteESP8266-2.6.3.10/test/IRac_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/IRac_test.cpp
index f268f5ced..2b3129978 100644
--- a/lib/IRremoteESP8266-2.6.3.10/test/IRac_test.cpp
+++ b/lib/IRremoteESP8266-2.6.4/test/IRac_test.cpp
@@ -107,7 +107,7 @@ TEST(TestIRac, Coolix) {
       "m560s560m560s1680m560s1680m560s560m560s1680m560s1680m560s560m560s560"
       "m560s1680m560s560m560s560m560s1680m560s560m560s560m560s1680m560s1680"
       // Footer
-      "m560s5040",
+      "m560s105040",
       // End of message #2 (i.e. Repeat '1')
       // Note: the two messages (#1 & #2) are identical.
       ac._irsend.outputStr());
@@ -144,6 +144,37 @@ TEST(TestIRac, Daikin) {
   ASSERT_EQ(expected, IRAcUtils::resultAcToString(&ac._irsend.capture));
 }
 
+TEST(TestIRac, Daikin128) {
+  IRDaikin128 ac(0);
+  IRac irac(0);
+  IRrecv capture(0);
+  char expected[] =
+      "Power Toggle: On, Mode: 8 (HEAT), Temp: 27C, Fan: 9 (Quiet), "
+      "Powerful: Off, Quiet: On, Swing (V): On, Sleep: On, "
+      "Econo: Off, Clock: 21:57, On Timer: Off, On Time: 00:00, "
+      "Off Timer: Off, Off Time: 00:00, Light Toggle: 8 (Wall)";
+
+  ac.begin();
+  irac.daikin128(&ac,
+                 true,                        // Power
+                 stdAc::opmode_t::kHeat,      // Mode
+                 27,                          // Celsius
+                 stdAc::fanspeed_t::kMin,     // Fan speed
+                 stdAc::swingv_t::kAuto,       // Veritcal swing
+                 true,                        // Quiet
+                 false,                       // Turbo
+                 true,                        // Light
+                 false,                       // Econo
+                 18 * 60,                     // Sleep
+                 21 * 60 + 57);               // Clock
+  ASSERT_EQ(expected, ac.toString());
+  ac._irsend.makeDecodeResult();
+  EXPECT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(DAIKIN128, ac._irsend.capture.decode_type);
+  ASSERT_EQ(kDaikin128Bits, ac._irsend.capture.bits);
+  ASSERT_EQ(expected, IRAcUtils::resultAcToString(&ac._irsend.capture));
+}
+
 TEST(TestIRac, Daikin160) {
   IRDaikin160 ac(0);
   IRac irac(0);
@@ -167,6 +198,28 @@ TEST(TestIRac, Daikin160) {
   ASSERT_EQ(expected, IRAcUtils::resultAcToString(&ac._irsend.capture));
 }
 
+TEST(TestIRac, Daikin176) {
+  IRDaikin176 ac(0);
+  IRac irac(0);
+  IRrecv capture(0);
+  char expected[] =
+      "Power: On, Mode: 7 (COOL), Temp: 26C, Fan: 1 (Low), Swing (H): 5 (Auto)";
+
+  ac.begin();
+  irac.daikin176(&ac,
+                 true,                        // Power
+                 stdAc::opmode_t::kCool,      // Mode
+                 26,                          // Celsius
+                 stdAc::fanspeed_t::kLow,     // Fan speed
+                 stdAc::swingh_t::kAuto);     // Horizontal swing
+  ASSERT_EQ(expected, ac.toString());
+  ac._irsend.makeDecodeResult();
+  EXPECT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(DAIKIN176, ac._irsend.capture.decode_type);
+  ASSERT_EQ(kDaikin176Bits, ac._irsend.capture.bits);
+  ASSERT_EQ(expected, IRAcUtils::resultAcToString(&ac._irsend.capture));
+}
+
 TEST(TestIRac, Daikin2) {
   IRDaikin2 ac(0);
   IRac irac(0);
@@ -334,21 +387,23 @@ TEST(TestIRac, Gree) {
   IRac irac(0);
   IRrecv capture(0);
   char expected[] =
-      "Power: On, Mode: 1 (COOL), Temp: 22C, Fan: 2 (Medium), Turbo: Off, "
-      "IFeel: Off, WiFi: Off, XFan: On, Light: On, Sleep: On, "
-      "Swing Vertical Mode: Manual, Swing Vertical Pos: 3";
+      "Model: 1 (YAW1F), Power: On, Mode: 1 (COOL), Temp: 22C, "
+      "Fan: 2 (Medium), Turbo: Off, IFeel: Off, WiFi: Off, XFan: On, "
+      "Light: On, Sleep: On, Swing Vertical Mode: Manual, "
+      "Swing Vertical Pos: 3";
 
   ac.begin();
   irac.gree(&ac,
-            true,                        // Power
-            stdAc::opmode_t::kCool,      // Mode
-            22,                          // Celsius
-            stdAc::fanspeed_t::kMedium,  // Fan speed
-            stdAc::swingv_t::kHigh,      // Veritcal swing
-            false,                       // Turbo
-            true,                        // Light
-            true,                        // Clean (aka Mold/XFan)
-            8 * 60 + 0);                 // Sleep time
+            gree_ac_remote_model_t::YAW1F,  // Model
+            true,                           // Power
+            stdAc::opmode_t::kCool,         // Mode
+            22,                             // Celsius
+            stdAc::fanspeed_t::kMedium,     // Fan speed
+            stdAc::swingv_t::kHigh,         // Veritcal swing
+            false,                          // Turbo
+            true,                           // Light
+            true,                           // Clean (aka Mold/XFan)
+            8 * 60 + 0);                    // Sleep time
   ASSERT_EQ(expected, ac.toString());
   ac._irsend.makeDecodeResult();
   EXPECT_TRUE(capture.decode(&ac._irsend.capture));
@@ -472,14 +527,17 @@ TEST(TestIRac, Midea) {
   IRac irac(0);
   IRrecv capture(0);
   char expected[] =
-      "Power: On, Mode: 1 (DRY), Temp: 27C/81F, Fan: 2 (Medium), Sleep: On";
+      "Power: On, Mode: 1 (DRY), Celsius: On, Temp: 27C/80F, Fan: 2 (Medium), "
+      "Sleep: On, Swing(V) Toggle: Off";
 
   ac.begin();
   irac.midea(&ac,
              true,                        // Power
              stdAc::opmode_t::kDry,       // Mode
-             27,                          // Celsius
+             true,                        // Celsius
+             27,                          // Degrees
              stdAc::fanspeed_t::kMedium,  // Fan speed
+             stdAc::swingv_t::kOff,       // Swing (V)
              8 * 60 + 0);                 // Sleep time
 
   ASSERT_EQ(expected, ac.toString());
@@ -496,7 +554,7 @@ TEST(TestIRac, Mitsubishi) {
   IRrecv capture(0);
   char expected[] =
       "Power: On, Mode: 24 (COOL), Temp: 20C, Fan: 2 (Medium), Vane: AUTO, "
-      "Time: 14:30, On timer: 00:00, Off timer: 00:00, Timer: -";
+      "Wide Vane: 3, Time: 14:30, On timer: 00:00, Off timer: 00:00, Timer: -";
 
   ac.begin();
   irac.mitsubishi(&ac,
@@ -505,6 +563,7 @@ TEST(TestIRac, Mitsubishi) {
                   20,                          // Celsius
                   stdAc::fanspeed_t::kMedium,  // Fan speed
                   stdAc::swingv_t::kOff,       // Veritcal swing
+                  stdAc::swingh_t::kOff,       // Horizontal swing
                   false,                       // Silent
                   14 * 60 + 35);               // Clock
   ASSERT_EQ(expected, ac.toString());
@@ -1189,3 +1248,93 @@ TEST(TestIRac, CoolixDecodeToState) {
   ASSERT_EQ(20, result.degrees);
   ASSERT_EQ(stdAc::fanspeed_t::kLow, result.fanspeed);
 }
+
+// Check light on/off functionality in Coolix common a/c handling.
+TEST(TestIRac, Issue821) {
+  stdAc::state_t prev;
+  stdAc::state_t next;
+  stdAc::state_t result;
+  // state info from:
+  // https://github.com/crankyoldgit/IRremoteESP8266/issues/821#issuecomment-513708970
+  prev.protocol = decode_type_t::COOLIX;
+  prev.model = -1;
+  prev.power = true;
+  prev.mode = stdAc::opmode_t::kAuto;
+  prev.degrees = 24;
+  prev.celsius = true;
+  prev.fanspeed = stdAc::fanspeed_t::kAuto;
+  prev.swingv = stdAc::swingv_t::kOff;
+  prev.swingh = stdAc::swingh_t::kOff;
+  prev.quiet = false;
+  prev.turbo = false;
+  prev.econo = false;
+  prev.light = false;
+  prev.filter = false;
+  prev.clean = false;
+  prev.beep = false;
+
+  next = prev;
+  next.light = true;
+
+  IRac irac(0);
+  IRrecv capture(0);
+  IRCoolixAC ac(0);
+
+  ac.begin();
+  result = irac.handleToggles(next, &prev);
+  ASSERT_TRUE(result.light);
+  irac.sendAc(next, &prev);
+  ASSERT_TRUE(next.light);
+  irac.coolix(&ac,
+              result.power,     // Power
+              result.mode,      // Mode
+              result.degrees,   // Celsius
+              result.fanspeed,  // Fan speed
+              result.swingv,       // Veritcal swing
+              result.swingh,       // Horizontal swing
+              result.turbo,                       // Turbo
+              result.light,                       // Light
+              result.clean,                       // Clean
+              -1);                         // Sleep
+  ac._irsend.makeDecodeResult();
+  EXPECT_TRUE(capture.decode(&ac._irsend.capture));
+  ASSERT_EQ(COOLIX, ac._irsend.capture.decode_type);
+  ASSERT_EQ(kCoolixBits, ac._irsend.capture.bits);
+  ASSERT_EQ("Power: On, Led: Toggle",
+            IRAcUtils::resultAcToString(&ac._irsend.capture));
+  EXPECT_EQ(
+      "f38000d50m"
+      "4480s4480"
+      "m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s560m560s1680"
+      "m560s560m560s1680m560s560m560s560m560s1680m560s560m560s1680m560s560"
+      "m560s1680m560s1680m560s1680m560s1680m560s560m560s1680m560s560m560s1680"
+      "m560s560m560s560m560s560m560s560m560s1680m560s560m560s1680m560s560"
+      "m560s1680m560s560m560s1680m560s560m560s560m560s1680m560s560m560s1680"
+      "m560s560m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s560"
+      "m560s5040"
+      "m4480s4480"
+      "m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s560m560s1680"
+      "m560s560m560s1680m560s560m560s560m560s1680m560s560m560s1680m560s560"
+      "m560s1680m560s1680m560s1680m560s1680m560s560m560s1680m560s560m560s1680"
+      "m560s560m560s560m560s560m560s560m560s1680m560s560m560s1680m560s560"
+      "m560s1680m560s560m560s1680m560s560m560s560m560s1680m560s560m560s1680"
+      "m560s560m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s560"
+      "m560s105040"
+      "m4480s4480"
+      "m560s1680m560s560m560s1680m560s1680m560s560m560s560m560s1680m560s560"
+      "m560s560m560s1680m560s560m560s560m560s1680m560s1680m560s560m560s1680"
+      "m560s560m560s560m560s560m560s1680m560s1680m560s1680m560s1680m560s1680"
+      "m560s1680m560s1680m560s1680m560s560m560s560m560s560m560s560m560s560"
+      "m560s560m560s1680m560s560m560s560m560s1680m560s560m560s560m560s560"
+      "m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s1680m560s1680"
+      "m560s5040"
+      "m4480s4480"
+      "m560s1680m560s560m560s1680m560s1680m560s560m560s560m560s1680m560s560"
+      "m560s560m560s1680m560s560m560s560m560s1680m560s1680m560s560m560s1680"
+      "m560s560m560s560m560s560m560s1680m560s1680m560s1680m560s1680m560s1680"
+      "m560s1680m560s1680m560s1680m560s560m560s560m560s560m560s560m560s560"
+      "m560s560m560s1680m560s560m560s560m560s1680m560s560m560s560m560s560"
+      "m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s1680m560s1680"
+      "m560s105040",
+      ac._irsend.outputStr());
+}
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/IRrecv_test.cpp b/lib/IRremoteESP8266-2.6.4/test/IRrecv_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/IRrecv_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/IRrecv_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/IRrecv_test.h b/lib/IRremoteESP8266-2.6.4/test/IRrecv_test.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/IRrecv_test.h
rename to lib/IRremoteESP8266-2.6.4/test/IRrecv_test.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/IRsend_test.cpp b/lib/IRremoteESP8266-2.6.4/test/IRsend_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/IRsend_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/IRsend_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/IRsend_test.h b/lib/IRremoteESP8266-2.6.4/test/IRsend_test.h
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/IRsend_test.h
rename to lib/IRremoteESP8266-2.6.4/test/IRsend_test.h
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/IRutils_test.cpp b/lib/IRremoteESP8266-2.6.4/test/IRutils_test.cpp
similarity index 95%
rename from lib/IRremoteESP8266-2.6.3.10/test/IRutils_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/IRutils_test.cpp
index f8d1394cb..366deba32 100644
--- a/lib/IRremoteESP8266-2.6.3.10/test/IRutils_test.cpp
+++ b/lib/IRremoteESP8266-2.6.4/test/IRutils_test.cpp
@@ -516,3 +516,27 @@ TEST(TestUtils, MinsToString) {
   EXPECT_EQ("18:59", irutils::minsToString(18 * 60 + 59));
   EXPECT_EQ("23:59", irutils::minsToString(23 * 60 + 59));
 }
+
+TEST(TestUtils, sumNibbles) {
+  uint8_t testdata[] = {0x01, 0x23, 0x45};
+  EXPECT_EQ(0, irutils::sumNibbles(testdata, 0));
+  EXPECT_EQ(1, irutils::sumNibbles(testdata, 0, 1));
+  EXPECT_EQ(1, irutils::sumNibbles(testdata, 1));
+  EXPECT_EQ(2, irutils::sumNibbles(testdata, 1, 1));
+  EXPECT_EQ(15, irutils::sumNibbles(testdata, 3));
+  EXPECT_EQ(115, irutils::sumNibbles(testdata, 3, 100));
+}
+
+TEST(TestUtils, BCD) {
+  EXPECT_EQ(0, irutils::uint8ToBcd(0));
+  EXPECT_EQ(0, irutils::bcdToUint8(0));
+  EXPECT_EQ(1, irutils::uint8ToBcd(1));
+  EXPECT_EQ(10, irutils::bcdToUint8(0x10));
+  EXPECT_EQ(0x10, irutils::uint8ToBcd(10));
+  EXPECT_EQ(11, irutils::bcdToUint8(0x11));
+  EXPECT_EQ(0x11, irutils::uint8ToBcd(11));
+  EXPECT_EQ(99, irutils::bcdToUint8(0x99));
+  EXPECT_EQ(0x99, irutils::uint8ToBcd(99));
+  EXPECT_EQ(255, irutils::bcdToUint8(0x9A));
+  EXPECT_EQ(255, irutils::uint8ToBcd(100));
+}
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/Makefile b/lib/IRremoteESP8266-2.6.4/test/Makefile
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/Makefile
rename to lib/IRremoteESP8266-2.6.4/test/Makefile
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Aiwa_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Aiwa_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Aiwa_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Aiwa_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Argo_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Argo_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Argo_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Argo_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Carrier_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Carrier_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Carrier_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Carrier_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Coolix_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Coolix_test.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Coolix_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Coolix_test.cpp
index 4ab61b9a8..618d825a0 100644
--- a/lib/IRremoteESP8266-2.6.3.10/test/ir_Coolix_test.cpp
+++ b/lib/IRremoteESP8266-2.6.4/test/ir_Coolix_test.cpp
@@ -31,7 +31,7 @@ TEST(TestSendCoolix, SendDataOnly) {
       "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
       "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
       "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s5040",
+      "m560s105040",
       irsend.outputStr());
 
   irsend.reset();
@@ -53,7 +53,7 @@ TEST(TestSendCoolix, SendDataOnly) {
       "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
       "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
       "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s5040",
+      "m560s105040",
       irsend.outputStr());
 
   irsend.reset();
@@ -75,7 +75,7 @@ TEST(TestSendCoolix, SendDataOnly) {
       "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
       "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
       "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s5040",
+      "m560s105040",
       irsend.outputStr());
 }
 
@@ -103,7 +103,7 @@ TEST(TestSendCoolix, SendWithRepeats) {
       "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
       "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
       "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s5040",
+      "m560s105040",
       irsend.outputStr());
   irsend.sendCOOLIX(0xAA55AA, kCoolixBits, 2);  // 2 repeats.
   EXPECT_EQ(
@@ -131,7 +131,7 @@ TEST(TestSendCoolix, SendWithRepeats) {
       "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
       "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
       "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s5040",
+      "m560s105040",
       irsend.outputStr());
 }
 
@@ -151,7 +151,7 @@ TEST(TestSendCoolix, SendUnusualSize) {
       "m4480s4480"
       "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
       "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s5040",
+      "m560s105040",
       irsend.outputStr());
 
   irsend.reset();
@@ -193,7 +193,7 @@ TEST(TestSendCoolix, SendUnusualSize) {
       "m560s560m560s560m560s1680m560s1680m560s560m560s560m560s1680m560s560"
       "m560s1680m560s1680m560s1680m560s560m560s1680m560s1680m560s1680m560s1680"
       "m560s560m560s560m560s560m560s1680m560s560m560s560m560s560m560s560"
-      "m560s5040",
+      "m560s105040",
       irsend.outputStr());
 
   // Bit sizes must be a multiple of 8.
@@ -743,5 +743,5 @@ TEST(TestCoolixACClass, Issue722) {
       // 564,530,564,532,566,530,564,530,566,528,564,1618,564,1618,564,532,
       "m560s560m560s560m560s560m560s560m560s560m560s1680m560s1680m560s560"
       // 564,1620,566,1618,562  // Raw data matches what is expected.
-      "m560s1680m560s1680m560s5040", ac._irsend.outputStr());
+      "m560s1680m560s1680m560s105040", ac._irsend.outputStr());
 }
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Daikin_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Daikin_test.cpp
similarity index 80%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Daikin_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Daikin_test.cpp
index 6ed27fff8..d762656e3 100644
--- a/lib/IRremoteESP8266-2.6.3.10/test/ir_Daikin_test.cpp
+++ b/lib/IRremoteESP8266-2.6.4/test/ir_Daikin_test.cpp
@@ -1514,11 +1514,21 @@ TEST(TestUtils, Housekeeping) {
   ASSERT_TRUE(hasACState(decode_type_t::DAIKIN));
   ASSERT_TRUE(IRac::isProtocolSupported(decode_type_t::DAIKIN));
 
+  ASSERT_EQ("DAIKIN128", typeToString(decode_type_t::DAIKIN128));
+  ASSERT_EQ(decode_type_t::DAIKIN128, strToDecodeType("DAIKIN128"));
+  ASSERT_TRUE(hasACState(decode_type_t::DAIKIN128));
+  ASSERT_TRUE(IRac::isProtocolSupported(decode_type_t::DAIKIN128));
+
   ASSERT_EQ("DAIKIN160", typeToString(decode_type_t::DAIKIN160));
   ASSERT_EQ(decode_type_t::DAIKIN160, strToDecodeType("DAIKIN160"));
   ASSERT_TRUE(hasACState(decode_type_t::DAIKIN160));
   ASSERT_TRUE(IRac::isProtocolSupported(decode_type_t::DAIKIN160));
 
+  ASSERT_EQ("DAIKIN176", typeToString(decode_type_t::DAIKIN176));
+  ASSERT_EQ(decode_type_t::DAIKIN176, strToDecodeType("DAIKIN176"));
+  ASSERT_TRUE(hasACState(decode_type_t::DAIKIN176));
+  ASSERT_TRUE(IRac::isProtocolSupported(decode_type_t::DAIKIN176));
+
   ASSERT_EQ("DAIKIN2", typeToString(decode_type_t::DAIKIN2));
   ASSERT_EQ(decode_type_t::DAIKIN2, strToDecodeType("DAIKIN2"));
   ASSERT_TRUE(hasACState(decode_type_t::DAIKIN2));
@@ -2288,3 +2298,622 @@ TEST(TestDaikin160Class, HumanReadable) {
       "Vent Position (V): 15 (Auto)",
       ac.toString());
 }
+
+TEST(TestDaikin176Class, FanControl) {
+  IRDaikin176 ac(0);
+
+  EXPECT_EQ(
+      "Power: Off, Mode: 7 (COOL), Temp: 9C, Fan: 1 (Low), Swing (H): 6 (Off)",
+      ac.toString());
+  ac.setFan(kDaikinFanMin);
+  ac.setPower(true);
+  EXPECT_EQ(
+      "Power: On, Mode: 7 (COOL), Temp: 9C, Fan: 1 (Low), Swing (H): 6 (Off)",
+      ac.toString());
+  ac.setFan(kDaikinFanMin + 1);
+  EXPECT_EQ(
+      "Power: On, Mode: 7 (COOL), Temp: 9C, Fan: 3 (High), Swing (H): 6 (Off)",
+      ac.toString());
+  ac.setFan(kDaikin176FanMax);
+  EXPECT_EQ(
+      "Power: On, Mode: 7 (COOL), Temp: 9C, Fan: 3 (High), Swing (H): 6 (Off)",
+      ac.toString());
+
+  // Real state from remote
+  // https://github.com/crankyoldgit/IRremoteESP8266/pull/826#issuecomment-513168270
+  uint8_t state[kDaikin176StateLength] = {
+      0x11, 0xDA, 0x17, 0x18, 0x04, 0x00, 0x1E,
+      0x11, 0xDA, 0x17, 0x18, 0x00, 0x73, 0x00, 0x21, 0x00, 0x00, 0x22, 0x35,
+      0x00, 0x20, 0x25};
+  ac.setRaw(state);
+  EXPECT_EQ(
+      "Power: On, Mode: 7 (COOL), Temp: 26C, Fan: 3 (High), "
+      "Swing (H): 5 (Auto)",
+      ac.toString());
+}
+
+TEST(TestDaikin176Class, convertFan) {
+  EXPECT_EQ(kDaikinFanMin, IRDaikin176::convertFan(stdAc::fanspeed_t::kMin));
+  EXPECT_EQ(kDaikinFanMin, IRDaikin176::convertFan(stdAc::fanspeed_t::kLow));
+  EXPECT_EQ(kDaikin176FanMax,
+            IRDaikin176::convertFan(stdAc::fanspeed_t::kMedium));
+  EXPECT_EQ(kDaikin176FanMax,
+            IRDaikin176::convertFan(stdAc::fanspeed_t::kHigh));
+  EXPECT_EQ(kDaikin176FanMax, IRDaikin176::convertFan(stdAc::fanspeed_t::kMax));
+  EXPECT_EQ(kDaikin176FanMax,
+            IRDaikin176::convertFan(stdAc::fanspeed_t::kAuto));
+}
+
+TEST(TestDaikin176Class, SimulateIRacDaikin176) {
+  IRDaikin176 ac(0);
+
+  ac.setPower(true);
+  ac.setMode(ac.convertMode(stdAc::opmode_t::kCool));
+  ac.setTemp(26);
+  ac.setFan(ac.convertFan(stdAc::fanspeed_t::kMax));
+  ac.setSwingHorizontal(kDaikin176SwingHOff);
+  EXPECT_EQ(
+      "Power: On, Mode: 7 (COOL), Temp: 26C, Fan: 3 (High), Swing (H): 6 (Off)",
+      ac.toString());
+  ac.setSwingHorizontal(ac.convertSwingH(stdAc::swingh_t::kAuto));
+  EXPECT_EQ(
+      "Power: On, Mode: 7 (COOL), Temp: 26C, Fan: 3 (High), "
+      "Swing (H): 5 (Auto)",
+      ac.toString());
+}
+
+TEST(TestDaikin176Class, OperatingMode) {
+  IRDaikin176 ac(0);
+  ac.begin();
+
+  ac.setMode(kDaikinAuto);
+  EXPECT_EQ(kDaikin176Cool, ac.getMode());
+
+  ac.setMode(kDaikin176Cool);
+  EXPECT_EQ(kDaikin176Cool, ac.getMode());
+
+  ac.setMode(kDaikinDry);
+  EXPECT_EQ(kDaikinDry, ac.getMode());
+
+  ac.setMode(kDaikinHeat);
+  EXPECT_EQ(kDaikin176Cool, ac.getMode());
+
+  ac.setMode(kDaikinFan);
+  EXPECT_EQ(kDaikinFan, ac.getMode());
+
+  ac.setMode(kDaikin176Cool + 1);
+  EXPECT_EQ(kDaikin176Cool, ac.getMode());
+
+  ac.setMode(kDaikinAuto + 1);
+  EXPECT_EQ(kDaikin176Cool, ac.getMode());
+
+  ac.setMode(255);
+  EXPECT_EQ(kDaikin176Cool, ac.getMode());
+}
+
+TEST(TestDaikin176Class, Temperature) {
+  IRDaikin176 ac(0);
+  ac.begin();
+  ac.setMode(kDaikinAuto);
+  ac.setTemp(0);
+  EXPECT_EQ(kDaikinMinTemp, ac.getTemp());
+
+  ac.setTemp(255);
+  EXPECT_EQ(kDaikinMaxTemp, ac.getTemp());
+
+  ac.setTemp(kDaikinMinTemp);
+  EXPECT_EQ(kDaikinMinTemp, ac.getTemp());
+
+  ac.setTemp(kDaikinMaxTemp);
+  EXPECT_EQ(kDaikinMaxTemp, ac.getTemp());
+
+  ac.setTemp(kDaikinMinTemp - 1);
+  EXPECT_EQ(kDaikinMinTemp, ac.getTemp());
+
+  ac.setTemp(kDaikinMaxTemp + 1);
+  EXPECT_EQ(kDaikinMaxTemp, ac.getTemp());
+
+  ac.setTemp(kDaikinMinTemp + 1);
+  EXPECT_EQ(kDaikinMinTemp + 1, ac.getTemp());
+
+  ac.setTemp(21);
+  EXPECT_EQ(21, ac.getTemp());
+
+  ac.setTemp(25);
+  EXPECT_EQ(25, ac.getTemp());
+
+  ac.setTemp(29);
+  EXPECT_EQ(29, ac.getTemp());
+
+  // Temp should be locked to kDaikin176DryFanTemp when in Dry or Fan Mode.
+  ac.setMode(kDaikinFan);
+  EXPECT_EQ(kDaikin176DryFanTemp, ac.getTemp());
+  ac.setMode(kDaikin176Cool);
+  EXPECT_EQ(29, ac.getTemp());
+  ac.setMode(kDaikinDry);
+  EXPECT_EQ(kDaikinDry, ac.getMode());
+  EXPECT_EQ(kDaikin176DryFanTemp, ac.getTemp());
+  ac.setMode(kDaikin176Cool);
+  EXPECT_EQ(29, ac.getTemp());
+  ac.setMode(kDaikinFan);
+  ac.setTemp(25);
+  EXPECT_EQ(kDaikin176DryFanTemp, ac.getTemp());
+  ac.setMode(kDaikinHeat);
+  EXPECT_EQ(25, ac.getTemp());
+}
+
+TEST(TestDaikin176Class, Power) {
+  IRDaikin176 ac(0);
+  ac.begin();
+
+  ac.on();
+  EXPECT_TRUE(ac.getPower());
+
+  ac.off();
+  EXPECT_FALSE(ac.getPower());
+
+  ac.setPower(true);
+  EXPECT_TRUE(ac.getPower());
+
+  ac.setPower(false);
+  EXPECT_FALSE(ac.getPower());
+}
+
+TEST(TestDaikin176Class, VaneSwing) {
+  IRDaikin176 ac(0);
+  ac.begin();
+
+  ac.setSwingHorizontal(kDaikin176SwingHAuto);
+  EXPECT_EQ(kDaikin176SwingHAuto, ac.getSwingHorizontal());
+
+  ac.setSwingHorizontal(0);
+  EXPECT_EQ(kDaikin176SwingHAuto, ac.getSwingHorizontal());
+
+  ac.setSwingHorizontal(kDaikin176SwingHOff);
+  EXPECT_EQ(kDaikin176SwingHOff, ac.getSwingHorizontal());
+
+  ac.setSwingHorizontal(255);
+  EXPECT_EQ(kDaikin176SwingHAuto, ac.getSwingHorizontal());
+
+  EXPECT_EQ(kDaikin176SwingHAuto,
+            IRDaikin176::convertSwingH(stdAc::swingh_t::kAuto));
+  EXPECT_EQ(kDaikin176SwingHOff,
+            IRDaikin176::convertSwingH(stdAc::swingh_t::kOff));
+  EXPECT_EQ(kDaikin176SwingHAuto,
+            IRDaikin176::convertSwingH(stdAc::swingh_t::kLeft));
+}
+
+TEST(TestDaikin176Class, ReconstructKnownStates) {
+  IRDaikin176 ac(0);
+  ac.begin();
+  // Data from:
+  //   https://github.com/crankyoldgit/IRremoteESP8266/pull/826#issuecomment-513531138
+
+  // Power: On, Mode: 7 (COOL), Temp: 25C, Fan: 3 (MAX), Swing (H): 5 (Auto)
+  // 11DA171804001E11DA17180073002100002035002023
+  uint8_t on_cool_25_max_auto[22] = {
+      0x11, 0xDA, 0x17, 0x18, 0x04, 0x00, 0x1E,
+      0x11, 0xDA, 0x17, 0x18, 0x00, 0x73, 0x00, 0x21, 0x00, 0x00, 0x20, 0x35,
+      0x00, 0x20, 0x23};
+  // Power: On, Mode: 6 (FAN), Temp: 17C, Fan: 3 (MAX), Swing (H): 5 (Auto)
+  // 11DA171804001E11DA171800630401000010350020E7
+  uint8_t on_fan_17_max_auto[22] = {
+      0x11, 0xDA, 0x17, 0x18, 0x04, 0x00, 0x1E,
+      0x11, 0xDA, 0x17, 0x18, 0x00, 0x63, 0x04, 0x01, 0x00, 0x00, 0x10, 0x35,
+      0x00, 0x20, 0xE7};
+  // Power: On, Mode: 2 (DRY), Temp: 17C, Fan: 3 (MAX), Swing (H): 5 (Auto)
+  // 11DA171804001E11DA17180023047100001035002017
+  uint8_t on_dry_17_max_auto[22] = {
+      0x11, 0xDA, 0x17, 0x18, 0x04, 0x00, 0x1E,
+      0x11, 0xDA, 0x17, 0x18, 0x00, 0x23, 0x04, 0x71, 0x00, 0x00, 0x10, 0x35,
+      0x00, 0x20, 0x17};
+  // Power: On, Mode: 7 (COOL), Temp: 25C, Fan: 3 (MAX), Swing (H): 5 (Auto)
+  // 11DA171804001E11DA17180073042100002035002027
+  uint8_t on_cool_25_max_auto_v2[22] = {
+      0x11, 0xDA, 0x17, 0x18, 0x04, 0x00, 0x1E,
+      0x11, 0xDA, 0x17, 0x18, 0x00, 0x73, 0x04, 0x21, 0x00, 0x00, 0x20, 0x35,
+      0x00, 0x20, 0x27};
+  ac.setMode(kDaikin176Cool);
+  ac.setPower(true);
+  ac.setTemp(25);
+  ac.setFan(kDaikin176FanMax);
+  ac.setSwingHorizontal(true);
+  EXPECT_STATE_EQ(on_cool_25_max_auto, ac.getRaw(), kDaikin176Bits);
+  ac.setMode(kDaikinFan);
+  EXPECT_STATE_EQ(on_fan_17_max_auto, ac.getRaw(), kDaikin176Bits);
+  ac.setMode(kDaikinDry);
+  EXPECT_STATE_EQ(on_dry_17_max_auto, ac.getRaw(), kDaikin176Bits);
+  ac.setMode(kDaikin176Cool);
+  EXPECT_STATE_EQ(on_cool_25_max_auto_v2, ac.getRaw(), kDaikin176Bits);
+}
+
+// Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/827
+// Data from:
+//   https://docs.google.com/spreadsheets/d/1-YJnHyzy6bId5QmjTEZuw8_wSufESoIl-L_VEF-o8lM/edit?usp=sharing
+TEST(TestDecodeDaikin128, RealExample) {
+  IRsendTest irsend(0);
+  IRrecv irrecv(0);
+  uint16_t rawData[265] = {
+      9846, 9794, 9848, 9796, 4638, 2512, 348, 382, 352, 954, 352, 956, 352,
+      382, 352, 956, 352, 384, 352, 382, 352, 386, 352, 382, 352, 954, 352, 384,
+      352, 382, 352, 954, 352, 384, 352, 382, 352, 386, 352, 382, 352, 382, 354,
+      382, 354, 382, 352, 382, 352, 954, 352, 382, 352, 384, 352, 954, 352, 382,
+      352, 382, 352, 954, 352, 954, 354, 382, 352, 382, 352, 386, 352, 954, 354,
+      954, 352, 954, 352, 384, 352, 382, 352, 382, 352, 954, 352, 384, 354, 382,
+      352, 954, 352, 382, 352, 382, 352, 382, 352, 956, 352, 382, 354, 384, 354,
+      382, 354, 954, 352, 954, 352, 382, 352, 382, 352, 954, 352, 382, 352, 384,
+      354, 954, 352, 382, 352, 954, 352, 954, 352, 382, 352, 954, 352, 382, 352,
+      956, 352, 20306, 376, 954, 352, 384, 352, 382, 352, 382, 354, 382, 352,
+      954, 352, 382, 352, 958, 352, 384, 352, 382, 352, 382, 352, 382, 352, 382,
+      354, 382, 352, 382, 352, 386, 352, 382, 352, 382, 354, 382, 352, 384, 352,
+      382, 352, 382, 352, 382, 354, 384, 354, 382, 354, 382, 354, 382, 352, 382,
+      352, 382, 352, 382, 352, 382, 352, 386, 354, 382, 352, 382, 352, 382, 352,
+      382, 352, 382, 352, 382, 354, 382, 352, 384, 352, 382, 354, 382, 354, 382,
+      354, 382, 352, 382, 354, 382, 354, 382, 354, 384, 354, 382, 354, 382, 352,
+      382, 352, 382, 354, 382, 352, 382, 352, 382, 352, 386, 354, 952, 354, 954,
+      352, 382, 352, 954, 354, 382, 352, 382, 354, 382, 354, 382, 4618
+      };  // UNKNOWN DBA1F5E3
+  uint8_t expectedState[kDaikin128StateLength] = {
+      // 8 bytes
+      0x16, 0x12, 0x20, 0x19, 0x47, 0x22, 0x26, 0xAD,
+      // 8 bytes
+      0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B};
+
+  irsend.begin();
+  irsend.reset();
+  irsend.sendRaw(rawData, 265, 38000);
+  irsend.makeDecodeResult();
+  ASSERT_TRUE(irrecv.decode(&irsend.capture));
+  ASSERT_EQ(DAIKIN128, irsend.capture.decode_type);
+  ASSERT_EQ(kDaikin128Bits, irsend.capture.bits);
+  EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
+  EXPECT_EQ(
+      "Power Toggle: On, Mode: 2 (COOL), Temp: 26C, Fan: 1 (Auto), "
+      "Powerful: Off, Quiet: Off, Swing (V): On, Sleep: Off, "
+      "Econo: Off, Clock: 19:20, "
+      "On Timer: Off, On Time: 07:30, Off Timer: Off, Off Time: 22:00, "
+      "Light Toggle: 0 (Off)",
+      IRAcUtils::resultAcToString(&irsend.capture));
+}
+
+// Ref: https://github.com/crankyoldgit/IRremoteESP8266/issues/827
+// Data from:
+//   https://docs.google.com/spreadsheets/d/1-YJnHyzy6bId5QmjTEZuw8_wSufESoIl-L_VEF-o8lM/edit?usp=sharing
+TEST(TestDecodeDaikin128, SyntheticSelfDecode) {
+  IRsendTest irsend(0);
+  IRrecv irrecv(0);
+  uint8_t expectedState[kDaikin128StateLength] = {
+      // 8 bytes
+      0x16, 0x12, 0x20, 0x19, 0x47, 0x22, 0x26, 0xAD,
+      // 8 bytes
+      0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B};
+
+  irsend.begin();
+  irsend.reset();
+  irsend.sendDaikin128(expectedState);
+  irsend.makeDecodeResult();
+  ASSERT_TRUE(irrecv.decode(&irsend.capture));
+  ASSERT_EQ(DAIKIN128, irsend.capture.decode_type);
+  ASSERT_EQ(kDaikin128Bits, irsend.capture.bits);
+  EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
+}
+
+TEST(TestDaikin128Class, Checksums) {
+  IRDaikin128 ac(0);
+
+  uint8_t knownGood[kDaikin128StateLength] = {
+      0x16, 0x12, 0x20, 0x19, 0x47, 0x22, 0x26, 0xAD,
+      0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B};
+  uint8_t knownBad[kDaikin128StateLength] = {
+      0x16, 0x12, 0x20, 0x19, 0x47, 0x22, 0x26, 0x0D,
+      0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+  EXPECT_EQ(0xA, ac.calcFirstChecksum(knownGood));
+  EXPECT_EQ(0x0B, ac.calcSecondChecksum(knownGood));
+  EXPECT_TRUE(ac.validChecksum(knownGood));
+  ac.setRaw(knownBad);
+  EXPECT_STATE_EQ(knownGood, ac.getRaw(), kDaikin128Bits);
+}
+
+TEST(TestDaikin128Class, PowerToggle) {
+  IRDaikin128 ac(0);
+  ac.begin();
+
+  ac.setPowerToggle(true);
+  EXPECT_TRUE(ac.getPowerToggle());
+  ac.setPowerToggle(false);
+  EXPECT_FALSE(ac.getPowerToggle());
+  ac.setPowerToggle(true);
+  EXPECT_TRUE(ac.getPowerToggle());
+}
+
+TEST(TestDaikin128Class, SwingVertical) {
+  IRDaikin128 ac(0);
+  ac.begin();
+
+  ac.setSwingVertical(true);
+  EXPECT_TRUE(ac.getSwingVertical());
+  ac.setSwingVertical(false);
+  EXPECT_FALSE(ac.getSwingVertical());
+  ac.setSwingVertical(true);
+  EXPECT_TRUE(ac.getSwingVertical());
+}
+
+TEST(TestDaikin128Class, Sleep) {
+  IRDaikin128 ac(0);
+  ac.begin();
+
+  ac.setSleep(true);
+  EXPECT_TRUE(ac.getSleep());
+  ac.setSleep(false);
+  EXPECT_FALSE(ac.getSleep());
+  ac.setSleep(true);
+  EXPECT_TRUE(ac.getSleep());
+}
+
+TEST(TestDaikin128Class, Econo) {
+  IRDaikin128 ac(0);
+  ac.begin();
+
+  // Econo works in some modes
+  ac.setMode(kDaikin128Heat);
+  ac.setEcono(true);
+  EXPECT_TRUE(ac.getEcono());
+  ac.setEcono(false);
+  EXPECT_FALSE(ac.getEcono());
+  ac.setEcono(true);
+  EXPECT_TRUE(ac.getEcono());
+  // But not some some modes
+  ac.setMode(kDaikin128Auto);
+  EXPECT_FALSE(ac.getEcono());
+  ac.setEcono(true);
+  EXPECT_FALSE(ac.getEcono());
+}
+
+TEST(TestDaikin128Class, FanSpeed) {
+  IRDaikin128 ac(0);
+  ac.begin();
+
+  ac.setMode(kDaikin128Cool);
+  // Unexpected value should default to Auto.
+  ac.setFan(0);
+  EXPECT_EQ(kDaikin128FanAuto, ac.getFan());
+  ac.setFan(255);
+  EXPECT_EQ(kDaikin128FanAuto, ac.getFan());
+  ac.setFan(5);
+  EXPECT_EQ(kDaikin128FanAuto, ac.getFan());
+
+  ac.setFan(kDaikin128FanHigh);
+  EXPECT_EQ(kDaikin128FanHigh, ac.getFan());
+
+  // Beyond Quiet should default to Auto.
+  ac.setFan(kDaikin128FanQuiet + 1);
+  EXPECT_EQ(kDaikin128FanAuto, ac.getFan());
+
+  ac.setFan(kDaikin128FanMed);
+  EXPECT_EQ(kDaikin128FanMed, ac.getFan());
+
+  ac.setFan(kDaikin128FanLow);
+  EXPECT_EQ(kDaikin128FanLow, ac.getFan());
+
+  ac.setFan(kDaikin128FanPowerful);
+  EXPECT_EQ(kDaikin128FanPowerful, ac.getFan());
+
+  ac.setFan(kDaikin128FanAuto);
+  EXPECT_EQ(kDaikin128FanAuto, ac.getFan());
+
+  ac.setFan(kDaikin128FanQuiet);
+  EXPECT_EQ(kDaikin128FanQuiet, ac.getFan());
+}
+
+TEST(TestDaikin128Class, OperatingMode) {
+  IRDaikin128 ac(0);
+  ac.begin();
+
+  ac.setMode(0);
+  EXPECT_EQ(kDaikin128Auto, ac.getMode());
+  ac.setMode(kDaikin128Cool);
+  EXPECT_EQ(kDaikin128Cool, ac.getMode());
+  ac.setMode(kDaikin128Auto);
+  EXPECT_EQ(kDaikin128Auto, ac.getMode());
+  ac.setMode(kDaikin128Heat);
+  EXPECT_EQ(kDaikin128Heat, ac.getMode());
+  ac.setMode(kDaikin128Dry);
+  EXPECT_EQ(kDaikin128Dry, ac.getMode());
+  ac.setMode(kDaikin128Fan);
+  EXPECT_EQ(kDaikin128Fan, ac.getMode());
+  ac.setMode(3);
+  EXPECT_EQ(kDaikin128Auto, ac.getMode());
+  ac.setMode(kDaikin128Auto + 1);
+  EXPECT_EQ(kDaikin128Auto, ac.getMode());
+  ac.setMode(255);
+  EXPECT_EQ(kDaikin128Auto, ac.getMode());
+}
+
+TEST(TestDaikin128Class, Quiet) {
+  IRDaikin128 ac(0);
+  ac.begin();
+
+  // Quiet works in some modes
+  ac.setMode(kDaikin128Cool);
+  ac.setQuiet(true);
+  EXPECT_TRUE(ac.getQuiet());
+  ac.setQuiet(false);
+  EXPECT_FALSE(ac.getQuiet());
+  ac.setQuiet(true);
+  EXPECT_TRUE(ac.getQuiet());
+  // But not some some modes
+  ac.setMode(kDaikin128Auto);
+  EXPECT_FALSE(ac.getQuiet());
+  ac.setQuiet(true);
+  EXPECT_FALSE(ac.getQuiet());
+}
+
+TEST(TestDaikin128Class, Powerful) {
+  IRDaikin128 ac(0);
+  ac.begin();
+
+  // Powerful works in some modes
+  ac.setMode(kDaikin128Cool);
+  ac.setPowerful(true);
+  EXPECT_TRUE(ac.getPowerful());
+  ac.setPowerful(false);
+  EXPECT_FALSE(ac.getPowerful());
+  ac.setPowerful(true);
+  EXPECT_TRUE(ac.getPowerful());
+  // But not some some modes
+  ac.setMode(kDaikin128Auto);
+  EXPECT_FALSE(ac.getPowerful());
+  ac.setPowerful(true);
+  EXPECT_FALSE(ac.getPowerful());
+}
+
+TEST(TestDaikin128Class, Temperature) {
+  IRDaikin128 ac(0);
+  ac.begin();
+
+  ac.setTemp(0);
+  EXPECT_EQ(kDaikin128MinTemp, ac.getTemp());
+
+  ac.setTemp(255);
+  EXPECT_EQ(kDaikin128MaxTemp, ac.getTemp());
+
+  ac.setTemp(kDaikin128MinTemp);
+  EXPECT_EQ(kDaikin128MinTemp, ac.getTemp());
+
+  ac.setTemp(kDaikin128MaxTemp);
+  EXPECT_EQ(kDaikin128MaxTemp, ac.getTemp());
+
+  ac.setTemp(kDaikin128MinTemp - 1);
+  EXPECT_EQ(kDaikin128MinTemp, ac.getTemp());
+
+  ac.setTemp(kDaikin128MaxTemp + 1);
+  EXPECT_EQ(kDaikin128MaxTemp, ac.getTemp());
+
+  ac.setTemp(kDaikin128MinTemp + 1);
+  EXPECT_EQ(kDaikin128MinTemp + 1, ac.getTemp());
+
+  ac.setTemp(21);
+  EXPECT_EQ(21, ac.getTemp());
+
+  ac.setTemp(25);
+  EXPECT_EQ(25, ac.getTemp());
+
+  ac.setTemp(29);
+  EXPECT_EQ(29, ac.getTemp());
+}
+
+// Test human readable output.
+TEST(TestDaikin128Class, HumanReadable) {
+  IRDaikin128 ac(0);
+
+  ac.setPowerToggle(false);
+  ac.setMode(kDaikin128Auto);
+  ac.setTemp(25);
+  ac.setFan(kDaikin128FanAuto);
+  ac.setQuiet(false);
+  ac.setPowerful(false);
+  ac.setSleep(false);
+  ac.setEcono(false);
+  ac.setSwingVertical(true);
+  EXPECT_EQ(
+      "Power Toggle: Off, Mode: 10 (AUTO), Temp: 25C, Fan: 1 (Auto), "
+      "Powerful: Off, Quiet: Off, Swing (V): On, "
+      "Sleep: Off, Econo: Off, Clock: 00:00, "
+      "On Timer: Off, On Time: 00:00, Off Timer: Off, Off Time: 00:00, "
+      "Light Toggle: 0 (Off)",
+      ac.toString());
+  ac.setMode(kDaikin128Cool);
+  ac.setTemp(16);
+  ac.setQuiet(true);
+  ac.setSwingVertical(false);
+  ac.setPowerToggle(true);
+  ac.setSleep(true);
+  ac.setEcono(true);
+  ac.setClock(18 * 60 + 33);  // 18:33
+  ac.setOnTimer(10 * 60);  // 10am
+  ac.setOnTimerEnabled(true);
+  ac.setOffTimer(21 * 60 + 30);  // 9:30pm
+  ac.setOffTimerEnabled(true);
+  ac.setLightToggle(kDaikin128BitWall);
+  EXPECT_EQ(
+      "Power Toggle: On, Mode: 2 (COOL), Temp: 16C, Fan: 9 (Quiet), "
+      "Powerful: Off, Quiet: On, Swing (V): Off, "
+      "Sleep: On, Econo: On, Clock: 18:33, "
+      "On Timer: On, On Time: 10:00, Off Timer: On, Off Time: 21:30, "
+      "Light Toggle: 8 (Wall)",
+      ac.toString());
+}
+
+TEST(TestDaikin128Class, Clock) {
+  IRDaikin128 ac(0);
+  ac.begin();
+
+  ac.setClock(0);
+  EXPECT_EQ(0, ac.getClock());
+  ac.setClock(23 * 60 + 59);
+  EXPECT_EQ(23 * 60 + 59, ac.getClock());
+  ac.setClock(23 * 60 + 59 + 1);
+  EXPECT_EQ(0, ac.getClock());
+  ac.setClock(24 * 60 + 99);
+  EXPECT_EQ(0, ac.getClock());
+}
+
+TEST(TestDaikin128Class, Timers) {
+  IRDaikin128 ac(0);
+  ac.begin();
+
+  ac.setOnTimerEnabled(false);
+  EXPECT_FALSE(ac.getOnTimerEnabled());
+  ac.setOnTimerEnabled(true);
+  EXPECT_TRUE(ac.getOnTimerEnabled());
+  ac.setOnTimer(13 * 60 + 30);
+  EXPECT_EQ("13:30", irutils::minsToString(ac.getOnTimer()));
+  ac.setOnTimer(13 * 60 + 31);
+  EXPECT_EQ("13:30", irutils::minsToString(ac.getOnTimer()));
+  ac.setOnTimer(13 * 60 + 29);
+  EXPECT_EQ("13:00", irutils::minsToString(ac.getOnTimer()));
+  EXPECT_TRUE(ac.getOnTimerEnabled());
+  ac.setOnTimerEnabled(false);
+  EXPECT_FALSE(ac.getOnTimerEnabled());
+
+  ac.setOffTimerEnabled(false);
+  EXPECT_FALSE(ac.getOffTimerEnabled());
+  ac.setOffTimerEnabled(true);
+  EXPECT_TRUE(ac.getOffTimerEnabled());
+  ac.setOffTimer(1 * 60 + 30);
+  EXPECT_EQ("01:30", irutils::minsToString(ac.getOffTimer()));
+  ac.setOffTimer(23 * 60 + 31);
+  EXPECT_EQ("23:30", irutils::minsToString(ac.getOffTimer()));
+  ac.setOffTimer(24 * 60 + 29);
+  EXPECT_EQ("00:00", irutils::minsToString(ac.getOffTimer()));
+  EXPECT_TRUE(ac.getOffTimerEnabled());
+  ac.setOffTimerEnabled(false);
+  EXPECT_FALSE(ac.getOffTimerEnabled());
+}
+
+TEST(TestDaikin128Class, ReconstructKnownState) {
+  IRDaikin128 ac(0);
+
+  uint8_t expectedState[kDaikin128StateLength] = {
+      0x16, 0x12, 0x20, 0x19, 0x47, 0x22, 0x26, 0xAD,
+      0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B};
+
+  ac.begin();
+  ac.setPowerToggle(true);
+  ac.setMode(kDaikin128Cool);
+  ac.setTemp(26);
+  ac.setFan(kDaikin128FanAuto);
+  ac.setPowerful(false);
+  ac.setQuiet(false);
+  ac.setSwingVertical(true);
+  ac.setSleep(false);
+  ac.setEcono(false);
+  ac.setClock(19 * 60 + 20);
+  ac.setOnTimerEnabled(false);
+  ac.setOnTimer(7 * 60 + 30);
+  ac.setOffTimerEnabled(false);
+  ac.setOffTimer(22 * 60 + 0);
+  ac.setLightToggle(0);
+
+  EXPECT_STATE_EQ(expectedState, ac.getRaw(), kDaikin128Bits);
+}
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Denon_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Denon_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Denon_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Denon_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Dish_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Dish_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Dish_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Dish_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Electra_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Electra_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Electra_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Electra_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Fujitsu_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Fujitsu_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Fujitsu_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Fujitsu_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_GICable_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_GICable_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_GICable_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_GICable_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_GlobalCache_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_GlobalCache_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_GlobalCache_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_GlobalCache_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Goodweather_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Goodweather_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Goodweather_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Goodweather_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Gree_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Gree_test.cpp
similarity index 91%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Gree_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Gree_test.cpp
index def4949c7..8d6fa5141 100644
--- a/lib/IRremoteESP8266-2.6.3.10/test/ir_Gree_test.cpp
+++ b/lib/IRremoteESP8266-2.6.4/test/ir_Gree_test.cpp
@@ -495,8 +495,8 @@ TEST(TestGreeClass, HumanReadable) {
   IRGreeAC irgree(0);
 
   EXPECT_EQ(
-      "Power: Off, Mode: 0 (AUTO), Temp: 25C, Fan: 0 (Auto), Turbo: Off, "
-      "IFeel: Off, WiFi: Off, XFan: Off, Light: On, Sleep: Off, "
+      "Model: 1 (YAW1F), Power: Off, Mode: 0 (AUTO), Temp: 25C, Fan: 0 (Auto), "
+      "Turbo: Off, IFeel: Off, WiFi: Off, XFan: Off, Light: On, Sleep: Off, "
       "Swing Vertical Mode: Manual, Swing Vertical Pos: 0 (Last Pos)",
       irgree.toString());
   irgree.on();
@@ -511,8 +511,8 @@ TEST(TestGreeClass, HumanReadable) {
   irgree.setWiFi(true);
   irgree.setSwingVertical(true, kGreeSwingAuto);
   EXPECT_EQ(
-      "Power: On, Mode: 1 (COOL), Temp: 16C, Fan: 3 (High), Turbo: On, "
-      "IFeel: On, WiFi: On, XFan: On, Light: Off, Sleep: On, "
+      "Model: 1 (YAW1F), Power: On, Mode: 1 (COOL), Temp: 16C, Fan: 3 (High), "
+      "Turbo: On, IFeel: On, WiFi: On, XFan: On, Light: Off, Sleep: On, "
       "Swing Vertical Mode: Auto, Swing Vertical Pos: 1 (Auto)",
       irgree.toString());
 }
@@ -571,8 +571,8 @@ TEST(TestDecodeGree, NormalRealExample) {
   EXPECT_STATE_EQ(gree_code, irsend.capture.state, kGreeBits);
   irgree.setRaw(irsend.capture.state);
   EXPECT_EQ(
-      "Power: On, Mode: 1 (COOL), Temp: 26C, Fan: 1 (Low), Turbo: Off, "
-      "IFeel: Off, WiFi: Off, XFan: Off, Light: On, Sleep: Off, "
+      "Model: 1 (YAW1F), Power: On, Mode: 1 (COOL), Temp: 26C, Fan: 1 (Low), "
+      "Turbo: Off, IFeel: Off, WiFi: Off, XFan: Off, Light: On, Sleep: Off, "
       "Swing Vertical Mode: Manual, Swing Vertical Pos: 2",
       irgree.toString());
 }
@@ -590,7 +590,7 @@ TEST(TestGreeClass, toCommon) {
   ac.setSleep(true);
   // Now test it.
   ASSERT_EQ(decode_type_t::GREE, ac.toCommon().protocol);
-  ASSERT_EQ(-1, ac.toCommon().model);
+  ASSERT_EQ(gree_ac_remote_model_t::YAW1F, ac.toCommon().model);
   ASSERT_TRUE(ac.toCommon().power);
   ASSERT_TRUE(ac.toCommon().celsius);
   ASSERT_EQ(20, ac.toCommon().degrees);
@@ -609,3 +609,37 @@ TEST(TestGreeClass, toCommon) {
   ASSERT_FALSE(ac.toCommon().beep);
   ASSERT_EQ(-1, ac.toCommon().clock);
 }
+
+TEST(TestGreeClass, Issue814Power) {
+  IRGreeAC ac(0);
+  ac.begin();
+
+  // https://github.com/crankyoldgit/IRremoteESP8266/issues/814#issuecomment-511263921
+  uint8_t YBOFB_on[8] = {0x59, 0x07, 0x20, 0x50, 0x01, 0x20, 0x00, 0xC0};
+  uint8_t off[8] = {0x51, 0x07, 0x20, 0x50, 0x01, 0x20, 0x00, 0x40};
+
+  ac.on();
+  EXPECT_EQ(gree_ac_remote_model_t::YAW1F, ac.getModel());
+  ac.setRaw(off);
+  EXPECT_FALSE(ac.getPower());
+  ac.setRaw(YBOFB_on);
+  EXPECT_TRUE(ac.getPower());
+  EXPECT_EQ(gree_ac_remote_model_t::YBOFB, ac.getModel());
+  EXPECT_EQ(
+      "Model: 2 (YBOFB), Power: On, Mode: 1 (COOL), Temp: 23C, Fan: 1 (Low), "
+      "Turbo: Off, IFeel: Off, WiFi: Off, XFan: Off, Light: On, Sleep: Off, "
+      "Swing Vertical Mode: Auto, Swing Vertical Pos: 1 (Auto)",
+      ac.toString());
+  ac.off();
+  EXPECT_STATE_EQ(off, ac.getRaw(), kGreeBits);
+  ac.on();
+  EXPECT_STATE_EQ(YBOFB_on, ac.getRaw(), kGreeBits);
+  uint8_t YAW1F_on[8] = {0x59, 0x07, 0x60, 0x50, 0x01, 0x20, 0x00, 0xC0};
+  ac.setModel(gree_ac_remote_model_t::YAW1F);
+  EXPECT_STATE_EQ(YAW1F_on, ac.getRaw(), kGreeBits);
+  ac.off();
+  EXPECT_STATE_EQ(off, ac.getRaw(), kGreeBits);
+  ac.setModel(gree_ac_remote_model_t::YBOFB);
+  ac.on();
+  EXPECT_STATE_EQ(YBOFB_on, ac.getRaw(), kGreeBits);
+}
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Haier_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Haier_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Haier_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Haier_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Hitachi_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Hitachi_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Hitachi_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Hitachi_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Inax_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Inax_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Inax_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Inax_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_JVC_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_JVC_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_JVC_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_JVC_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Kelvinator_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Kelvinator_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Kelvinator_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Kelvinator_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_LG_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_LG_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_LG_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_LG_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Lasertag_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Lasertag_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Lasertag_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Lasertag_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Lego_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Lego_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Lego_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Lego_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Lutron_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Lutron_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Lutron_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Lutron_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_MWM_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_MWM_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_MWM_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_MWM_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Magiquest_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Magiquest_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Magiquest_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Magiquest_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Midea_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Midea_test.cpp
similarity index 89%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Midea_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Midea_test.cpp
index b5e133713..319528e9c 100644
--- a/lib/IRremoteESP8266-2.6.3.10/test/ir_Midea_test.cpp
+++ b/lib/IRremoteESP8266-2.6.4/test/ir_Midea_test.cpp
@@ -397,13 +397,13 @@ TEST(TestMideaACClass, Temperature) {
   EXPECT_EQ(kMideaACMaxTempF, midea.getTemp(false));
 
   // General changes.
-  midea.setTemp(17, true);              // C
-  EXPECT_EQ(17, midea.getTemp(true));   // C
-  EXPECT_EQ(63, midea.getTemp(false));  // F
+  midea.setTemp(18, true);              // C
+  EXPECT_EQ(18, midea.getTemp(true));   // C
+  EXPECT_EQ(64, midea.getTemp(false));  // F
 
   midea.setTemp(21, true);              // C
   EXPECT_EQ(21, midea.getTemp(true));   // C
-  EXPECT_EQ(70, midea.getTemp(false));  // F
+  EXPECT_EQ(69, midea.getTemp(false));  // F
 
   midea.setTemp(25, true);              // C
   EXPECT_EQ(25, midea.getTemp(true));   // C
@@ -414,7 +414,7 @@ TEST(TestMideaACClass, Temperature) {
   EXPECT_EQ(86, midea.getTemp(false));  // F
 
   midea.setTemp(80, false);             // F
-  EXPECT_EQ(26, midea.getTemp(true));   // C
+  EXPECT_EQ(27, midea.getTemp(true));   // C
   EXPECT_EQ(80, midea.getTemp(false));  // F
 
   midea.setTemp(70);                    // F
@@ -440,27 +440,30 @@ TEST(TestMideaACClass, Sleep) {
 }
 
 TEST(TestMideaACClass, HumanReadableOutput) {
-  IRMideaAC midea(0);
-  midea.begin();
+  IRMideaAC ac(0);
+  ac.begin();
 
-  midea.setRaw(0xA1826FFFFF62);
+  ac.setRaw(0xA1826FFFFF62);
   EXPECT_EQ(
-      "Power: On, Mode: 2 (AUTO), Temp: 25C/77F, Fan: 0 (Auto), "
-      "Sleep: Off",
-      midea.toString());
-  midea.off();
-  midea.setTemp(25);
-  midea.setFan(kMideaACFanHigh);
-  midea.setMode(kMideaACDry);
-  midea.setSleep(true);
+      "Power: On, Mode: 2 (AUTO), Celsius: Off, Temp: 25C/77F, Fan: 0 (Auto), "
+      "Sleep: Off, Swing(V) Toggle: Off", ac.toString());
+  ac.off();
+  ac.setTemp(25, true);
+  ac.setFan(kMideaACFanHigh);
+  ac.setMode(kMideaACDry);
+  ac.setSleep(true);
   EXPECT_EQ(
-      "Power: Off, Mode: 1 (DRY), Temp: 16C/62F, Fan: 3 (High), Sleep: On",
-      midea.toString());
+      "Power: Off, Mode: 1 (DRY), Celsius: Off, Temp: 25C/77F, Fan: 3 (High), "
+      "Sleep: On, Swing(V) Toggle: Off", ac.toString());
+  ac.setUseCelsius(true);
+  EXPECT_EQ(
+      "Power: Off, Mode: 1 (DRY), Celsius: On, Temp: 25C/77F, Fan: 3 (High), "
+      "Sleep: On, Swing(V) Toggle: Off", ac.toString());
 
-  midea.setRaw(0xA19867FFFF7E);
+  ac.setRaw(0xA19867FFFF7E);
   EXPECT_EQ(
-      "Power: On, Mode: 0 (COOL), Temp: 20C/69F, Fan: 3 (High), Sleep: Off",
-      midea.toString());
+      "Power: On, Mode: 0 (COOL), Celsius: Off, Temp: 21C/69F, Fan: 3 (High), "
+      "Sleep: Off, Swing(V) Toggle: Off", ac.toString());
 }
 
 // Tests for decodeMidea().
@@ -663,6 +666,7 @@ TEST(TestMideaACClass, toCommon) {
   IRMideaAC ac(0);
   ac.setPower(true);
   ac.setMode(kMideaACCool);
+  ac.setUseCelsius(true);
   ac.setTemp(20, true);
   ac.setFan(kMideaACFanHigh);
   // Now test it.
@@ -673,8 +677,8 @@ TEST(TestMideaACClass, toCommon) {
   ASSERT_EQ(20, ac.toCommon().degrees);
   ASSERT_EQ(stdAc::opmode_t::kCool, ac.toCommon().mode);
   ASSERT_EQ(stdAc::fanspeed_t::kMax, ac.toCommon().fanspeed);
-  // Unsupported.
   ASSERT_EQ(stdAc::swingv_t::kOff, ac.toCommon().swingv);
+  // Unsupported.
   ASSERT_EQ(stdAc::swingh_t::kOff, ac.toCommon().swingh);
   ASSERT_FALSE(ac.toCommon().turbo);
   ASSERT_FALSE(ac.toCommon().clean);
@@ -686,3 +690,55 @@ TEST(TestMideaACClass, toCommon) {
   ASSERT_EQ(-1, ac.toCommon().sleep);
   ASSERT_EQ(-1, ac.toCommon().clock);
 }
+
+// https://github.com/crankyoldgit/IRremoteESP8266/issues/819
+TEST(TestMideaACClass, CelsiusRemoteTemp) {
+  IRMideaAC ac(0);
+  uint64_t on_cool_low_17c = 0xA18840FFFF56;
+  uint64_t on_cool_low_30c = 0xA1884DFFFF5D;
+  ac.on();
+  ac.setMode(kMideaACCool);
+  ac.setFan(kMideaACFanLow);
+  ac.setTemp(17, true);
+  EXPECT_FALSE(ac.getUseCelsius());
+  ac.setUseCelsius(true);
+  EXPECT_TRUE(ac.getUseCelsius());
+  EXPECT_EQ(on_cool_low_17c, ac.getRaw());
+  EXPECT_EQ(
+      "Power: On, Mode: 0 (COOL), Celsius: On, Temp: 17C/62F, Fan: 1 (Low), "
+      "Sleep: Off, Swing(V) Toggle: Off", ac.toString());
+  ac.setRaw(on_cool_low_17c);
+  EXPECT_EQ(17, ac.getTemp(true));
+  EXPECT_EQ(62, ac.getTemp(false));
+  EXPECT_EQ(
+      "Power: On, Mode: 0 (COOL), Celsius: On, Temp: 17C/62F, Fan: 1 (Low), "
+      "Sleep: Off, Swing(V) Toggle: Off", ac.toString());
+  ac.setTemp(17, true);
+  EXPECT_EQ(17, ac.getTemp(true));
+  EXPECT_EQ(62, ac.getTemp(false));
+  EXPECT_EQ(on_cool_low_17c, ac.getRaw());
+
+  ac.setRaw(on_cool_low_30c);
+  EXPECT_EQ(
+      "Power: On, Mode: 0 (COOL), Celsius: On, Temp: 30C/86F, Fan: 1 (Low), "
+      "Sleep: Off, Swing(V) Toggle: Off", ac.toString());
+}
+
+// https://github.com/crankyoldgit/IRremoteESP8266/issues/819
+TEST(TestMideaACClass, SwingV) {
+  IRMideaAC ac(0);
+  ac.setSwingVToggle(false);
+  ASSERT_FALSE(ac.getSwingVToggle());
+  ac.setSwingVToggle(true);
+  ASSERT_TRUE(ac.getSwingVToggle());
+  EXPECT_EQ(
+      "Power: On, Mode: 2 (AUTO), Celsius: Off, Temp: 25C/77F, Fan: 0 (Auto), "
+      "Sleep: Off, Swing(V) Toggle: On", ac.toString());
+  ac.setSwingVToggle(false);
+  ASSERT_FALSE(ac.getSwingVToggle());
+  EXPECT_EQ(
+      "Power: On, Mode: 2 (AUTO), Celsius: Off, Temp: 25C/77F, Fan: 0 (Auto), "
+      "Sleep: Off, Swing(V) Toggle: Off", ac.toString());
+  ac.setRaw(kMideaACToggleSwingV);
+  EXPECT_EQ("Swing(V) Toggle: On", ac.toString());
+}
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_MitsubishiHeavy_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_MitsubishiHeavy_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_MitsubishiHeavy_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_MitsubishiHeavy_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Mitsubishi_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Mitsubishi_test.cpp
similarity index 99%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Mitsubishi_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Mitsubishi_test.cpp
index a5045cf49..7d16ed91e 100644
--- a/lib/IRremoteESP8266-2.6.3.10/test/ir_Mitsubishi_test.cpp
+++ b/lib/IRremoteESP8266-2.6.4/test/ir_Mitsubishi_test.cpp
@@ -985,7 +985,7 @@ TEST(TestMitsubishiACClass, HumanReadable) {
   IRMitsubishiAC irMitsu(0);
   EXPECT_EQ(
       "Power: On, Mode: 8 (HEAT), Temp: 22C, Fan: 6 (Quiet), Vane: AUTO, "
-      "Time: 17:10, On timer: 00:00, Off timer: 00:00, Timer: -",
+      "Wide Vane: 3, Time: 17:10, On timer: 00:00, Off timer: 00:00, Timer: -",
       irMitsu.toString());
 }
 
@@ -1141,6 +1141,7 @@ TEST(TestMitsubishiACClass, toCommon) {
   ac.setTemp(20);
   ac.setFan(kMitsubishiAcFanSilent);
   ac.setVane(kMitsubishiAcVaneAuto);
+  ac.setWideVane(kMitsubishiAcWideVaneAuto);
   // Now test it.
   ASSERT_EQ(decode_type_t::MITSUBISHI_AC, ac.toCommon().protocol);
   ASSERT_EQ(-1, ac.toCommon().model);
@@ -1150,9 +1151,9 @@ TEST(TestMitsubishiACClass, toCommon) {
   ASSERT_EQ(stdAc::opmode_t::kCool, ac.toCommon().mode);
   ASSERT_EQ(stdAc::fanspeed_t::kMin, ac.toCommon().fanspeed);
   ASSERT_EQ(stdAc::swingv_t::kAuto, ac.toCommon().swingv);
+  ASSERT_EQ(stdAc::swingh_t::kAuto, ac.toCommon().swingh);
   ASSERT_TRUE(ac.toCommon().quiet);
   // Unsupported.
-  ASSERT_EQ(stdAc::swingh_t::kOff, ac.toCommon().swingh);
   ASSERT_FALSE(ac.toCommon().turbo);
   ASSERT_FALSE(ac.toCommon().clean);
   ASSERT_FALSE(ac.toCommon().light);
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_NEC_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_NEC_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_NEC_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_NEC_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Neoclima_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Neoclima_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Neoclima_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Neoclima_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Nikai_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Nikai_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Nikai_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Nikai_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Panasonic_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Panasonic_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Panasonic_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Panasonic_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Pioneer_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Pioneer_test.cpp
similarity index 64%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Pioneer_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Pioneer_test.cpp
index 5f96b3f2e..37cb56fa2 100644
--- a/lib/IRremoteESP8266-2.6.3.10/test/ir_Pioneer_test.cpp
+++ b/lib/IRremoteESP8266-2.6.4/test/ir_Pioneer_test.cpp
@@ -13,35 +13,35 @@ TEST(TestSendPioneer, SendDataOnly) {
   irsend.begin();
   irsend.sendPioneer(0);
   EXPECT_EQ(
-      "f38000d33"
-      "m8960s4480"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s58240"
-      "m8960s4480"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s58240",
+      "f40000d33"
+      "m8544s4272"
+      "m534s534m534s534m534s534m534s534m534s534m534s534m534s534m534s534"
+      "m534s534m534s534m534s534m534s534m534s534m534s534m534s534m534s534"
+      "m534s534m534s534m534s534m534s534m534s534m534s534m534s534m534s534"
+      "m534s534m534s534m534s534m534s534m534s534m534s534m534s534m534s534"
+      "m534s37380"
+      "m8544s4272"
+      "m534s534m534s534m534s534m534s534m534s534m534s534m534s534m534s534"
+      "m534s534m534s534m534s534m534s534m534s534m534s534m534s534m534s534"
+      "m534s534m534s534m534s534m534s534m534s534m534s534m534s534m534s534"
+      "m534s534m534s534m534s534m534s534m534s534m534s534m534s534m534s534"
+      "m534s37380",
       irsend.outputStr());
   irsend.sendPioneer(0x55FF00AAAA00FF55);
   EXPECT_EQ(
-      "f38000d33"
-      "m8960s4480"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s40320"
-      "m8960s4480"
-      "m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s560m560s560m560s560m560s560m560s560m560s560m560s560"
-      "m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
-      "m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s40320",
+      "f40000d33"
+      "m8544s4272"
+      "m534s534m534s1602m534s534m534s1602m534s534m534s1602m534s534m534s1602"
+      "m534s1602m534s1602m534s1602m534s1602m534s1602m534s1602m534s1602m534s1602"
+      "m534s534m534s534m534s534m534s534m534s534m534s534m534s534m534s534"
+      "m534s1602m534s534m534s1602m534s534m534s1602m534s534m534s1602m534s534"
+      "m534s25098"
+      "m8544s4272"
+      "m534s1602m534s534m534s1602m534s534m534s1602m534s534m534s1602m534s534"
+      "m534s534m534s534m534s534m534s534m534s534m534s534m534s534m534s534"
+      "m534s1602m534s1602m534s1602m534s1602m534s1602m534s1602m534s1602m534s1602"
+      "m534s534m534s1602m534s534m534s1602m534s534m534s1602m534s534m534s1602"
+      "m534s25098",
       irsend.outputStr());
 }
 
@@ -138,18 +138,18 @@ TEST(TestDecodePioneer, SyntheticPioneerMessage) {
   irsend.reset();
   irsend.sendPioneer(0x659A857AF50A3DC2, 64, 0);
   EXPECT_EQ(
-      "f38000d33"
-      "m8960s4480"
-      "m560s560m560s1680m560s1680m560s560m560s560m560s1680m560s560m560s1680"
-      "m560s1680m560s560m560s560m560s1680m560s1680m560s560m560s1680m560s560"
-      "m560s1680m560s560m560s560m560s560m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s1680m560s1680m560s1680m560s1680m560s560m560s1680m560s560"
-      "m560s40320"
-      "m8960s4480"
-      "m560s1680m560s1680m560s1680m560s1680m560s560m560s1680m560s560m560s1680"
-      "m560s560m560s560m560s560m560s560m560s1680m560s560m560s1680m560s560"
-      "m560s560m560s560m560s1680m560s1680m560s1680m560s1680m560s560m560s1680"
-      "m560s1680m560s1680m560s560m560s560m560s560m560s560m560s1680m560s560"
-      "m560s40320",
+      "f40000d33"
+      "m8544s4272"
+      "m534s534m534s1602m534s1602m534s534m534s534m534s1602m534s534m534s1602"
+      "m534s1602m534s534m534s534m534s1602m534s1602m534s534m534s1602m534s534"
+      "m534s1602m534s534m534s534m534s534m534s534m534s1602m534s534m534s1602"
+      "m534s534m534s1602m534s1602m534s1602m534s1602m534s534m534s1602m534s534"
+      "m534s25098"
+      "m8544s4272"
+      "m534s1602m534s1602m534s1602m534s1602m534s534m534s1602m534s534m534s1602"
+      "m534s534m534s534m534s534m534s534m534s1602m534s534m534s1602m534s534"
+      "m534s534m534s534m534s1602m534s1602m534s1602m534s1602m534s534m534s1602"
+      "m534s1602m534s1602m534s534m534s534m534s534m534s534m534s1602m534s534"
+      "m534s25098",
       irsend.outputStr());
 }
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Pronto_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Pronto_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Pronto_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Pronto_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_RC5_RC6_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_RC5_RC6_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_RC5_RC6_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_RC5_RC6_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_RCMM_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_RCMM_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_RCMM_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_RCMM_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Samsung_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Samsung_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Samsung_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Samsung_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Sanyo_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Sanyo_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Sanyo_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Sanyo_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Sharp_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Sharp_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Sharp_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Sharp_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Sherwood_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Sherwood_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Sherwood_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Sherwood_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Sony_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Sony_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Sony_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Sony_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Tcl_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Tcl_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Tcl_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Tcl_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Teco_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Teco_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Teco_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Teco_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Toshiba_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Toshiba_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Toshiba_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Toshiba_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Trotec_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Trotec_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Trotec_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Trotec_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Vestel_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Vestel_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Vestel_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Vestel_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Whirlpool_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Whirlpool_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Whirlpool_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Whirlpool_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/test/ir_Whynter_test.cpp b/lib/IRremoteESP8266-2.6.4/test/ir_Whynter_test.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/test/ir_Whynter_test.cpp
rename to lib/IRremoteESP8266-2.6.4/test/ir_Whynter_test.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/tools/Makefile b/lib/IRremoteESP8266-2.6.4/tools/Makefile
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/tools/Makefile
rename to lib/IRremoteESP8266-2.6.4/tools/Makefile
diff --git a/lib/IRremoteESP8266-2.6.3.10/tools/RawToGlobalCache.sh b/lib/IRremoteESP8266-2.6.4/tools/RawToGlobalCache.sh
old mode 100644
new mode 100755
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/tools/RawToGlobalCache.sh
rename to lib/IRremoteESP8266-2.6.4/tools/RawToGlobalCache.sh
diff --git a/lib/IRremoteESP8266-2.6.3.10/tools/auto_analyse_raw_data.py b/lib/IRremoteESP8266-2.6.4/tools/auto_analyse_raw_data.py
old mode 100644
new mode 100755
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/tools/auto_analyse_raw_data.py
rename to lib/IRremoteESP8266-2.6.4/tools/auto_analyse_raw_data.py
diff --git a/lib/IRremoteESP8266-2.6.3.10/tools/auto_analyse_raw_data_test.py b/lib/IRremoteESP8266-2.6.4/tools/auto_analyse_raw_data_test.py
old mode 100644
new mode 100755
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/tools/auto_analyse_raw_data_test.py
rename to lib/IRremoteESP8266-2.6.4/tools/auto_analyse_raw_data_test.py
diff --git a/lib/IRremoteESP8266-2.6.3.10/tools/gc_decode.cpp b/lib/IRremoteESP8266-2.6.4/tools/gc_decode.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/tools/gc_decode.cpp
rename to lib/IRremoteESP8266-2.6.4/tools/gc_decode.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/tools/mkkeywords b/lib/IRremoteESP8266-2.6.4/tools/mkkeywords
old mode 100644
new mode 100755
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/tools/mkkeywords
rename to lib/IRremoteESP8266-2.6.4/tools/mkkeywords
diff --git a/lib/IRremoteESP8266-2.6.3.10/tools/mode2_decode.cpp b/lib/IRremoteESP8266-2.6.4/tools/mode2_decode.cpp
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/tools/mode2_decode.cpp
rename to lib/IRremoteESP8266-2.6.4/tools/mode2_decode.cpp
diff --git a/lib/IRremoteESP8266-2.6.3.10/tools/scrape_supported_devices.py b/lib/IRremoteESP8266-2.6.4/tools/scrape_supported_devices.py
old mode 100644
new mode 100755
similarity index 100%
rename from lib/IRremoteESP8266-2.6.3.10/tools/scrape_supported_devices.py
rename to lib/IRremoteESP8266-2.6.4/tools/scrape_supported_devices.py
diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino
index 4c8c00e9b..ec7267839 100644
--- a/sonoff/_changelog.ino
+++ b/sonoff/_changelog.ino
@@ -1,6 +1,7 @@
 /*********************************************************************************************\
  * 6.6.0.3 20190725
  * Change filename of configuration backup from using FriendlyName1 to Hostname solving diacritic issues (#2422)
+ * Upgrade library IRRemoteEsp8266 to 2.6.4, now using sendPioneer()
  *
  * 6.6.0.2 20190714
  * Change commands Var and Mem to show all parameters when no index is given (#6107)
diff --git a/sonoff/xdrv_05_irremote.ino b/sonoff/xdrv_05_irremote.ino
index 8de03e9ec..af99171e7 100644
--- a/sonoff/xdrv_05_irremote.ino
+++ b/sonoff/xdrv_05_irremote.ino
@@ -903,18 +903,7 @@ bool IrSendCommand(void)
 #endif
 #ifdef USE_IR_SEND_PIONEER
                 case IR_PIONEER:
-                  for (int32_t r=repeat; r>=0; r--) {
-                    if (bits > 32) {
-                      irsend->sendGeneric(8500,4250,540,1600,540,540,540,25000,85000,
-                                          (data>>32),bits-32,40,true,0,33);
-                    }
-                    irsend->sendGeneric(8500,4250,540,1600,540,540,540,25000,85000,
-                                        data, bits > 32 ? 32 : bits,
-                                        40,true,0,33);
-                  }
-                  break;
-                  // waiting for timing patch to be integrated in
-                  //irsend->sendPioneer(data, bits, repeat); break;
+                  irsend->sendPioneer(data, bits, repeat); break;
 #endif  // USE_IR_SEND_PIONEER
                 default:
                   irsend_active = false;