Update IRRemote ESP8266 to 2.6.2 and add ESP32 support

This commit is contained in:
Florian committed 2019-07-08 22:21:02 +02:00
1 parent 2ee18320be
commit 24bcdbc97c
195 files changed
+22963 -4737

No files matched your search

+353
View File
@@ -1,5 +1,8 @@
// Copyright 2017 David Conran
#include "ir_Sharp.h"
#include "IRrecv.h"
#include "IRrecv_test.h"
#include "IRsend.h"
#include "IRsend_test.h"
#include "gtest/gtest.h"
@@ -47,6 +50,7 @@ TEST(TestSendSharp, SendDataOnly) {
irsend.reset();
irsend.sendSharp(0x11, 0x52);
EXPECT_EQ(
"f38000d33"
"m260s1820m260s780m260s780m260s780m260s1820m260s780m260s1820m260s780"
"m260s1820m260s780m260s780m260s1820m260s780m260s1820m260s780"
"m260s43602"
@@ -64,6 +68,7 @@ TEST(TestSendSharp, SendWithRepeats) {
irsend.reset();
irsend.sendSharp(0x11, 0x52, kSharpBits, 1); // 1 repeat.
EXPECT_EQ(
"f38000d33"
"m260s1820m260s780m260s780m260s780m260s1820m260s780m260s1820m260s780"
"m260s1820m260s780m260s780m260s1820m260s780m260s1820m260s780"
"m260s43602"
@@ -87,6 +92,7 @@ TEST(TestSendSharp, SendUnusualSize) {
irsend.reset();
irsend.sendSharp(0x0, 0x0, 8);
EXPECT_EQ(
"f38000d33"
"m260s780m260s780m260s780m260s780m260s780m260s780m260s1820m260s780"
"m260s43602"
"m260s1820m260s1820m260s1820m260s1820m260s1820m260s1820m260s780m260s1820"
@@ -96,6 +102,7 @@ TEST(TestSendSharp, SendUnusualSize) {
irsend.reset();
irsend.sendSharp(0x0, 0x0, 16);
EXPECT_EQ(
"f38000d33"
"m260s780m260s780m260s780m260s780m260s780m260s780m260s780m260s780"
"m260s780m260s780m260s780m260s780m260s780m260s780m260s1820m260s780"
"m260s43602"
@@ -115,6 +122,7 @@ TEST(TestSendSharpRaw, SendDataOnly) {
irsend.reset();
irsend.sendSharpRaw(0x454A);
EXPECT_EQ(
"f38000d33"
"m260s1820m260s780m260s780m260s780m260s1820m260s780m260s1820m260s780"
"m260s1820m260s780m260s780m260s1820m260s780m260s1820m260s780"
"m260s43602"
@@ -132,6 +140,7 @@ TEST(TestSendSharpRaw, SendWithRepeats) {
irsend.reset();
irsend.sendSharpRaw(0x454A, kSharpBits, 1); // 1 repeat.
EXPECT_EQ(
"f38000d33"
"m260s1820m260s780m260s780m260s780m260s1820m260s780m260s1820m260s780"
"m260s1820m260s780m260s780m260s1820m260s780m260s1820m260s780"
"m260s43602"
@@ -155,6 +164,7 @@ TEST(TestSendSharpRaw, SendUnusualSize) {
irsend.reset();
irsend.sendSharpRaw(0x2, 8);
EXPECT_EQ(
"f38000d33"
"m260s780m260s780m260s780m260s780m260s780m260s780m260s1820m260s780"
"m260s43602"
"m260s1820m260s1820m260s1820m260s1820m260s1820m260s1820m260s780m260s1820"
@@ -164,6 +174,7 @@ TEST(TestSendSharpRaw, SendUnusualSize) {
irsend.reset();
irsend.sendSharpRaw(0x2, 16);
EXPECT_EQ(
"f38000d33"
"m260s780m260s780m260s780m260s780m260s780m260s780m260s780m260s780"
"m260s780m260s780m260s780m260s780m260s780m260s780m260s1820m260s780"
"m260s43602"
@@ -352,3 +363,345 @@ TEST(TestDecodeSharp, FailToDecodeNonSharpExample) {
ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture));
ASSERT_FALSE(irrecv.decodeSharp(&irsend.capture, kSharpBits, false));
}
// https://github.com/markszabo/IRremoteESP8266/issues/638#issue-421064165
TEST(TestDecodeSharpAc, RealExample) {
IRsendTest irsend(0);
IRrecv irrecv(0);
// cool-auto-27.txt
uint16_t rawData[211] = {
3804, 1892, 466, 486, 466, 1388, 466, 486, 466, 1386, 468, 486, 468, 1388,
466, 486, 466, 1386, 468, 488, 466, 1388, 466, 488, 466, 1386, 468, 1388,
466, 486, 466, 1388, 466, 486, 468, 1384, 468, 1388, 468, 1388, 466, 1388,
466, 486, 468, 484, 468, 1386, 468, 1386, 468, 486, 466, 486, 468, 486,
466, 488, 466, 1388, 466, 486, 466, 486, 468, 486, 466, 488, 466, 488,
466, 1386, 468, 1388, 466, 486, 468, 486, 466, 1388, 464, 1388, 466, 1386,
468, 486, 466, 486, 468, 486, 466, 1388, 468, 1384, 470, 486, 466, 486,
468, 486, 468, 1386, 468, 486, 468, 486, 468, 486, 468, 1388, 466, 486,
466, 486, 466, 486, 466, 488, 466, 486, 468, 486, 468, 486, 468, 486, 466,
486, 466, 486, 466, 488, 466, 486, 466, 486, 466, 1388, 466, 486, 468,
486, 466, 486, 468, 486, 468, 486, 466, 486, 466, 488, 466, 486, 466, 486,
466, 488, 466, 486, 468, 1386, 468, 486, 466, 486, 466, 1390, 464, 488,
466, 486, 468, 486, 468, 486, 466, 486, 466, 486, 466, 486, 468, 486, 468,
486, 466, 486, 466, 1386, 468, 1390, 466, 1388, 466, 1388, 468, 486, 466,
486, 468, 486, 466, 486, 466, 486, 466, 1390, 464, 486, 414};
// UNKNOWN F2B82C78
uint8_t expectedState[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0xCC, 0x31, 0x22, 0x00, 0x08, 0x80, 0x04, 0xE0,
0x41};
irsend.begin();
irsend.reset();
irsend.sendRaw(rawData, 211, 38000);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(SHARP_AC, irsend.capture.decode_type);
ASSERT_EQ(kSharpAcBits, irsend.capture.bits);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
IRSharpAc ac(0);
ac.begin();
ac.setRaw(irsend.capture.state);
EXPECT_EQ("Power: On, Mode: 2 (COOL), Temp: 27C, Fan: 2 (AUTO)",
ac.toString());
}
// https://github.com/markszabo/IRremoteESP8266/issues/638#issue-421064165
TEST(TestDecodeSharpAc, SyntheticExample) {
IRsendTest irsend(0);
IRrecv irrecv(0);
// cool-auto-27.txt
uint8_t expectedState[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0xCC, 0x31, 0x22, 0x00, 0x08, 0x80, 0x04, 0xE0,
0x41};
irsend.begin();
irsend.reset();
irsend.sendSharpAc(expectedState);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(SHARP_AC, irsend.capture.decode_type);
ASSERT_EQ(kSharpAcBits, irsend.capture.bits);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
}
TEST(TestIRUtils, Sharp) {
ASSERT_EQ("SHARP", typeToString(decode_type_t::SHARP));
ASSERT_EQ(decode_type_t::SHARP, strToDecodeType("SHARP"));
ASSERT_FALSE(hasACState(decode_type_t::SHARP));
}
TEST(TestIRUtils, SharpAc) {
ASSERT_EQ("SHARP_AC", typeToString(decode_type_t::SHARP_AC));
ASSERT_EQ(decode_type_t::SHARP_AC, strToDecodeType("SHARP_AC"));
ASSERT_TRUE(hasACState(decode_type_t::SHARP_AC));
}
// Tests for IRSharpAc class.
TEST(TestSharpAcClass, Power) {
IRSharpAc 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(TestSharpAcClass, Checksum) {
uint8_t state[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0xCC, 0x31, 0x22, 0x00, 0x08, 0x80, 0x04, 0xE0,
0x41};
EXPECT_EQ(0x4, IRSharpAc::calcChecksum(state));
EXPECT_TRUE(IRSharpAc::validChecksum(state));
// Change the state so it is not valid.
state[3] = 0;
EXPECT_FALSE(IRSharpAc::validChecksum(state));
}
TEST(TestSharpAcClass, Temperature) {
IRSharpAc ac(0);
ac.begin();
ac.setMode(kSharpAcCool); // Cool mode doesn't have temp restrictions.
ac.setTemp(0);
EXPECT_EQ(kSharpAcMinTemp, ac.getTemp());
ac.setTemp(255);
EXPECT_EQ(kSharpAcMaxTemp, ac.getTemp());
ac.setTemp(kSharpAcMinTemp);
EXPECT_EQ(kSharpAcMinTemp, ac.getTemp());
ac.setTemp(kSharpAcMaxTemp);
EXPECT_EQ(kSharpAcMaxTemp, ac.getTemp());
ac.setTemp(kSharpAcMinTemp - 1);
EXPECT_EQ(kSharpAcMinTemp, ac.getTemp());
ac.setTemp(kSharpAcMaxTemp + 1);
EXPECT_EQ(kSharpAcMaxTemp, ac.getTemp());
ac.setTemp(kSharpAcMinTemp + 1);
EXPECT_EQ(kSharpAcMinTemp + 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(TestSharpAcClass, OperatingMode) {
IRSharpAc ac(0);
ac.begin();
ac.setTemp(25);
ac.setMode(kSharpAcAuto);
EXPECT_EQ(kSharpAcAuto, ac.getMode());
ac.setMode(kSharpAcCool);
EXPECT_EQ(kSharpAcCool, ac.getMode());
ac.setMode(kSharpAcHeat);
EXPECT_EQ(kSharpAcHeat, ac.getMode());
ac.setMode(kSharpAcDry);
EXPECT_EQ(kSharpAcDry, ac.getMode());
ASSERT_EQ(kSharpAcMinTemp, ac.getTemp()); // Dry mode restricts the temp.
ac.setTemp(25);
ASSERT_EQ(kSharpAcMinTemp, ac.getTemp());
ac.setMode(kSharpAcDry + 1);
EXPECT_EQ(kSharpAcAuto, ac.getMode());
ac.setMode(kSharpAcCool);
EXPECT_EQ(kSharpAcCool, ac.getMode());
// We are no longer restricted.
ac.setTemp(25);
ASSERT_EQ(25, ac.getTemp());
ac.setMode(255);
EXPECT_EQ(kSharpAcAuto, ac.getMode());
}
TEST(TestSharpAcClass, FanSpeed) {
IRSharpAc ac(0);
ac.begin();
// Unexpected value should default to Auto.
ac.setFan(0);
EXPECT_EQ(kSharpAcFanAuto, ac.getFan());
// Unexpected value should default to Auto.
ac.setFan(255);
EXPECT_EQ(kSharpAcFanAuto, ac.getFan());
ac.setFan(kSharpAcFanMax);
EXPECT_EQ(kSharpAcFanMax, ac.getFan());
// Beyond Max should default to Auto.
ac.setFan(kSharpAcFanMax + 1);
EXPECT_EQ(kSharpAcFanAuto, ac.getFan());
ac.setFan(kSharpAcFanMed);
EXPECT_EQ(kSharpAcFanMed, ac.getFan());
ac.setFan(kSharpAcFanMin);
EXPECT_EQ(kSharpAcFanMin, ac.getFan());
ac.setFan(kSharpAcFanAuto - 1);
EXPECT_EQ(kSharpAcFanAuto, ac.getFan());
ac.setFan(kSharpAcFanMax + 1);
EXPECT_EQ(kSharpAcFanAuto, ac.getFan());
ac.setFan(kSharpAcFanAuto);
EXPECT_EQ(kSharpAcFanAuto, ac.getFan());
}
TEST(TestSharpAcClass, ReconstructKnownState) {
IRSharpAc ac(0);
ac.begin();
uint8_t on_auto_auto[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0x00, 0x11, 0x20, 0x00, 0x08, 0x80, 0x00, 0xE0,
0x01};
ac.on();
ac.setMode(kSharpAcAuto);
ac.setTemp(kSharpAcMinTemp);
ac.setFan(kSharpAcFanAuto);
EXPECT_STATE_EQ(on_auto_auto, ac.getRaw(), kSharpAcBits);
EXPECT_EQ("Power: On, Mode: 0 (AUTO), Temp: 15C, Fan: 2 (AUTO)",
ac.toString());
uint8_t cool_auto_28[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0xCD, 0x31, 0x22, 0x00, 0x08, 0x80, 0x04, 0xE0,
0x51};
ac.stateReset();
ac.on();
ac.setMode(kSharpAcCool);
ac.setTemp(28);
ac.setFan(kSharpAcFanAuto);
EXPECT_EQ("Power: On, Mode: 2 (COOL), Temp: 28C, Fan: 2 (AUTO)",
ac.toString());
EXPECT_STATE_EQ(cool_auto_28, ac.getRaw(), kSharpAcBits);
}
// https://github.com/markszabo/IRremoteESP8266/issues/638#issue-421064165
TEST(TestSharpAcClass, KnownStates) {
IRSharpAc ac(0);
ac.begin();
uint8_t off_auto_auto[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0x00, 0x21, 0x20, 0x00, 0x08, 0x80, 0x00, 0xE0,
0x31};
ASSERT_TRUE(ac.validChecksum(off_auto_auto));
ac.setRaw(off_auto_auto);
EXPECT_EQ("Power: Off, Mode: 0 (AUTO), Temp: 15C, Fan: 2 (AUTO)",
ac.toString());
uint8_t on_auto_auto[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0x00, 0x11, 0x20, 0x00, 0x08, 0x80, 0x00, 0xE0,
0x01};
ASSERT_TRUE(ac.validChecksum(on_auto_auto));
ac.setRaw(on_auto_auto);
EXPECT_EQ("Power: On, Mode: 0 (AUTO), Temp: 15C, Fan: 2 (AUTO)",
ac.toString());
uint8_t cool_auto_28[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0xCD, 0x31, 0x22, 0x00, 0x08, 0x80, 0x04, 0xE0,
0x51};
ASSERT_TRUE(ac.validChecksum(cool_auto_28));
ac.setRaw(cool_auto_28);
EXPECT_EQ("Power: On, Mode: 2 (COOL), Temp: 28C, Fan: 2 (AUTO)",
ac.toString());
uint8_t cool_fan1_28[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0xCD, 0x31, 0x42, 0x00, 0x08, 0x80, 0x05, 0xE0,
0x21};
ASSERT_TRUE(ac.validChecksum(cool_fan1_28));
ac.setRaw(cool_fan1_28);
EXPECT_EQ("Power: On, Mode: 2 (COOL), Temp: 28C, Fan: 4 (MIN)",
ac.toString());
uint8_t cool_fan2_28[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0xCD, 0x31, 0x32, 0x00, 0x08, 0x80, 0x05, 0xE0,
0x51};
ASSERT_TRUE(ac.validChecksum(cool_fan2_28));
ac.setRaw(cool_fan2_28);
EXPECT_EQ("Power: On, Mode: 2 (COOL), Temp: 28C, Fan: 3 (MED)",
ac.toString());
uint8_t cool_fan3_28[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0xCD, 0x31, 0x52, 0x00, 0x08, 0x80, 0x05, 0xE0,
0x31};
ASSERT_TRUE(ac.validChecksum(cool_fan3_28));
ac.setRaw(cool_fan3_28);
EXPECT_EQ("Power: On, Mode: 2 (COOL), Temp: 28C, Fan: 5 (HIGH)",
ac.toString());
uint8_t cool_fan4_28[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0xCD, 0x31, 0x72, 0x00, 0x08, 0x80, 0x05, 0xE0,
0x11};
ASSERT_TRUE(ac.validChecksum(cool_fan4_28));
ac.setRaw(cool_fan4_28);
EXPECT_EQ("Power: On, Mode: 2 (COOL), Temp: 28C, Fan: 7 (MAX)",
ac.toString());
/* Unsupported / Not yet reverse engineered.
uint8_t cool_fan4_28_ion_on[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0xCD, 0x61, 0x72, 0x08, 0x08, 0x80, 0x00, 0xE4,
0xD1};
ASSERT_TRUE(ac.validChecksum(cool_fan4_28_ion_on));
ac.setRaw(cool_fan4_28_ion_on);
EXPECT_EQ("Power: On, Mode: 2 (COOL), Temp: 28C, Fan: 7 (MAX)",
ac.toString());
uint8_t cool_fan4_28_eco1[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0xCD, 0x61, 0x72, 0x18, 0x08, 0x80, 0x00, 0xE8,
0x01};
ASSERT_TRUE(ac.validChecksum(cool_fan4_28_eco1));
ac.setRaw(cool_fan4_28_eco1);
EXPECT_EQ("Power: On, Mode: 2 (COOL), Temp: 28C, Fan: 7 (MAX)",
ac.toString()); */
uint8_t dry_auto[kSharpAcStateLength] = {
0xAA, 0x5A, 0xCF, 0x10, 0x00, 0x31, 0x23, 0x00, 0x08, 0x80, 0x00, 0xE0,
0x11};
ASSERT_TRUE(ac.validChecksum(dry_auto));
ac.setRaw(dry_auto);
EXPECT_EQ("Power: On, Mode: 3 (DRY), Temp: 15C, Fan: 2 (AUTO)",
ac.toString());
}
TEST(TestSharpAcClass, toCommon) {
IRSharpAc ac(0);
ac.setPower(true);
ac.setMode(kSharpAcCool);
ac.setTemp(20);
ac.setFan(kSharpAcFanMax);
// Now test it.
ASSERT_EQ(decode_type_t::SHARP_AC, ac.toCommon().protocol);
ASSERT_TRUE(ac.toCommon().power);
ASSERT_TRUE(ac.toCommon().celsius);
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(-1, ac.toCommon().model);
ASSERT_EQ(stdAc::swingv_t::kOff, ac.toCommon().swingv);
ASSERT_EQ(stdAc::swingh_t::kOff, ac.toCommon().swingh);
ASSERT_FALSE(ac.toCommon().turbo);
ASSERT_FALSE(ac.toCommon().quiet);
ASSERT_FALSE(ac.toCommon().clean);
ASSERT_FALSE(ac.toCommon().beep);
ASSERT_FALSE(ac.toCommon().econo);
ASSERT_FALSE(ac.toCommon().light);
ASSERT_FALSE(ac.toCommon().filter);
ASSERT_EQ(-1, ac.toCommon().sleep);
ASSERT_EQ(-1, ac.toCommon().clock);
}