5.10.0 20171201 * Upgrade library ArduinoJson to 5.11.2 * Upgrade library IRRemoteEsp8266 to 2.2.1 + 2 commits but disabled some protocols (code size reduction) * Upgrade library NeoPixelBus to 2.2.9 * Upgrade library OneWire to 2.3.3 + 6 commits and disabled CRC lookup-table (#define ONEWIRE_CRC8_TABLE 0) (code size reduction) * Update library PubSubClient to 2.6 + 9 commits and additional delay (#790) * Update core_esp8266_wiring_digital.c to latest (staged) level * Patch library I2Cdevlib-Core for esp8266-core 2.4.0-rc2 compatibility * Remove command EnergyReset 1..3 now replaced by ENergyReset1 to EnergyReset3 * Remove spaces in JSON messages (code size reduction) * Renamed xsns_05_ds18x20.ino to xsns_05_ds18x20_legacy.ino still using library OneWire and providing dynamic sensor scan * Fix possible iram1_0_seg compile error by shrinking ICACHE_RAM_ATTR code usage * Fix PWM watchdog timeout if Dimmer is set to 100 or Color set to 0xFF (#1146) * Fix Sonoff Bridge Learn Mode hang caused by unrecognised RF code (#1181) * Fix blank console log window by using XML character encoding (#1187) * Fix wrong response name for command HlwISet (#1214) * Fix DHT type sensor timeout recognition by distinguish "signal already there" from "timeout" (#1233) * Add fixed color options 1..12 to command Color * Add + (plus) and - (minus) to commands Dimmer (+10/-10), Speed and Scheme * Add + (plus) and - (minus) to command Color to select 1 out of 12 preset colors * Add + (plus) and - (minus) to command Ct to control ColdWarm led ColorTemperature (+34/-34) * Add commands EnergyReset1 0..42500, EnergyReset2 0..42500 and EnergyReset3 0..42500000 * to (Re)set Energy Today, Yesterday or Total respectively in Wh (#406, #685, #1202) * Add optional ADS1115 driver as alternative for unsupported I2Cdevlib in esp8266-core 2.4.0-rc2 * Add support for INA219 Voltage and Current sensor to be enabled in user_config.h with define USE_INA219 * Add support for Arilux LC11 (Clearing RF home code when selecting no Arilux module) * Add support for WS2812 RGBW ledstrips to be enabled in user_config.h with define USE_WS2812_CTYPE (#1156) * Add SettingsSaveAll routine to command SaveData to be used before controlled power down (#1202) * Add option PUSHBUTTON_TOGGLE (SwitchMode 7) to allow toggling on any switch change (#1221) * Add new xdrv_05_ds18x20.ino free from library OneWire and add the following features: * Add support for DS1822 * Add forced setting of 12-bit resolution for selected device types (#1222) * Add read temperature retry counter (#1215) * Fix lost sensors by performing sensor probe at restart only thereby removing dynamic sensor probe (#1215) * Fix sensor address sorting using ascending sort on sensor type followed by sensor address * Rewrite JSON resulting in shorter message allowing more sensors in default firmware image: * "DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6} * Add additional define in user_config.h to select either single sensor (defines disabled), new multi sensor (USE_DS18X20) or legacy multi sensor (USE_DS18X20_LEGACY) * Add clock support for more different pixel counts (#1226) * Add support for Sonoff Dual R2 (#1249) * Add FriendlyName to web page tab and add program information to web page footer (#1275)
273 lines
12 KiB
C++
273 lines
12 KiB
C++
// Copyright 2017 David Conran
|
|
|
|
#include "IRsend.h"
|
|
#include "IRsend_test.h"
|
|
#include "gtest/gtest.h"
|
|
|
|
// Tests for sendDenon().
|
|
|
|
// Test sending typical data only.
|
|
TEST(TestSendDenon, SendDataOnly) {
|
|
IRsendTest irsend(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
irsend.sendDenon(0x2278); // Denon AVR Power On. (Sharp)
|
|
EXPECT_EQ(
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s1820m260s780m260s780"
|
|
"m260s1820m260s1820m260s1820m260s1820m260s780m260s780m260s780"
|
|
"m260s43602"
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s780m260s1820m260s1820"
|
|
"m260s780m260s780m260s780m260s780m260s1820m260s1820m260s1820"
|
|
"m260s43602", irsend.outputStr());
|
|
|
|
irsend.reset();
|
|
// Denon Eco Mode On. (Panasonic/Kaseikyo)
|
|
irsend.sendDenon(0x2A4C028D6CE3, DENON_48_BITS);
|
|
EXPECT_EQ(
|
|
"m3456s1728"
|
|
"m432s432m432s432m432s1296m432s432m432s1296m432s432m432s1296m432s432"
|
|
"m432s432m432s1296m432s432m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s432m432s432m432s432m432s432m432s432m432s432m432s1296m432s432"
|
|
"m432s1296m432s432m432s432m432s432m432s1296m432s1296m432s432m432s1296"
|
|
"m432s432m432s1296m432s1296m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s1296m432s1296m432s1296m432s432m432s432m432s432m432s1296m432s1296"
|
|
"m432s129600", irsend.outputStr());
|
|
}
|
|
|
|
// Test sending with different repeats.
|
|
TEST(TestSendDenon, SendNormalWithRepeats) {
|
|
IRsendTest irsend(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
irsend.sendDenon(0x2278, DENON_BITS, 1); // 1 repeat.
|
|
EXPECT_EQ(
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s1820m260s780m260s780"
|
|
"m260s1820m260s1820m260s1820m260s1820m260s780m260s780m260s780"
|
|
"m260s43602"
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s780m260s1820m260s1820"
|
|
"m260s780m260s780m260s780m260s780m260s1820m260s1820m260s1820"
|
|
"m260s43602"
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s1820m260s780m260s780"
|
|
"m260s1820m260s1820m260s1820m260s1820m260s780m260s780m260s780"
|
|
"m260s43602"
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s780m260s1820m260s1820"
|
|
"m260s780m260s780m260s780m260s780m260s1820m260s1820m260s1820"
|
|
"m260s43602", irsend.outputStr());
|
|
irsend.sendDenon(0x2278, DENON_BITS, 2); // 2 repeats.
|
|
EXPECT_EQ(
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s1820m260s780m260s780"
|
|
"m260s1820m260s1820m260s1820m260s1820m260s780m260s780m260s780"
|
|
"m260s43602"
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s780m260s1820m260s1820"
|
|
"m260s780m260s780m260s780m260s780m260s1820m260s1820m260s1820"
|
|
"m260s43602"
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s1820m260s780m260s780"
|
|
"m260s1820m260s1820m260s1820m260s1820m260s780m260s780m260s780"
|
|
"m260s43602"
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s780m260s1820m260s1820"
|
|
"m260s780m260s780m260s780m260s780m260s1820m260s1820m260s1820"
|
|
"m260s43602"
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s1820m260s780m260s780"
|
|
"m260s1820m260s1820m260s1820m260s1820m260s780m260s780m260s780"
|
|
"m260s43602"
|
|
"m260s780m260s1820m260s780m260s780m260s780m260s780m260s1820m260s1820"
|
|
"m260s780m260s780m260s780m260s780m260s1820m260s1820m260s1820"
|
|
"m260s43602", irsend.outputStr());
|
|
}
|
|
|
|
TEST(TestSendDenon, Send48BitWithRepeats) {
|
|
IRsendTest irsend(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
irsend.sendDenon(0x2A4C028D6CE3, DENON_48_BITS, 1); // 1 repeat.
|
|
EXPECT_EQ(
|
|
"m3456s1728"
|
|
"m432s432m432s432m432s1296m432s432m432s1296m432s432m432s1296m432s432"
|
|
"m432s432m432s1296m432s432m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s432m432s432m432s432m432s432m432s432m432s432m432s1296m432s432"
|
|
"m432s1296m432s432m432s432m432s432m432s1296m432s1296m432s432m432s1296"
|
|
"m432s432m432s1296m432s1296m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s1296m432s1296m432s1296m432s432m432s432m432s432m432s1296m432s1296"
|
|
"m432s129600"
|
|
"m3456s1728"
|
|
"m432s432m432s432m432s1296m432s432m432s1296m432s432m432s1296m432s432"
|
|
"m432s432m432s1296m432s432m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s432m432s432m432s432m432s432m432s432m432s432m432s1296m432s432"
|
|
"m432s1296m432s432m432s432m432s432m432s1296m432s1296m432s432m432s1296"
|
|
"m432s432m432s1296m432s1296m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s1296m432s1296m432s1296m432s432m432s432m432s432m432s1296m432s1296"
|
|
"m432s129600", irsend.outputStr());
|
|
irsend.sendDenon(0x2A4C028D6CE3, DENON_48_BITS, 2); // 2 repeats.
|
|
EXPECT_EQ(
|
|
"m3456s1728"
|
|
"m432s432m432s432m432s1296m432s432m432s1296m432s432m432s1296m432s432"
|
|
"m432s432m432s1296m432s432m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s432m432s432m432s432m432s432m432s432m432s432m432s1296m432s432"
|
|
"m432s1296m432s432m432s432m432s432m432s1296m432s1296m432s432m432s1296"
|
|
"m432s432m432s1296m432s1296m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s1296m432s1296m432s1296m432s432m432s432m432s432m432s1296m432s1296"
|
|
"m432s129600"
|
|
"m3456s1728"
|
|
"m432s432m432s432m432s1296m432s432m432s1296m432s432m432s1296m432s432"
|
|
"m432s432m432s1296m432s432m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s432m432s432m432s432m432s432m432s432m432s432m432s1296m432s432"
|
|
"m432s1296m432s432m432s432m432s432m432s1296m432s1296m432s432m432s1296"
|
|
"m432s432m432s1296m432s1296m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s1296m432s1296m432s1296m432s432m432s432m432s432m432s1296m432s1296"
|
|
"m432s129600"
|
|
"m3456s1728"
|
|
"m432s432m432s432m432s1296m432s432m432s1296m432s432m432s1296m432s432"
|
|
"m432s432m432s1296m432s432m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s432m432s432m432s432m432s432m432s432m432s432m432s1296m432s432"
|
|
"m432s1296m432s432m432s432m432s432m432s1296m432s1296m432s432m432s1296"
|
|
"m432s432m432s1296m432s1296m432s432m432s1296m432s1296m432s432m432s432"
|
|
"m432s1296m432s1296m432s1296m432s432m432s432m432s432m432s1296m432s1296"
|
|
"m432s129600", irsend.outputStr());
|
|
}
|
|
|
|
// Test sending an atypical data size.
|
|
TEST(TestSendDenon, SendUnusualSize) {
|
|
IRsendTest irsend(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
irsend.sendDenon(0x12, 8);
|
|
EXPECT_EQ(
|
|
"m260s780m260s780m260s780m260s1820m260s780m260s780m260s1820m260s780"
|
|
"m260s43602"
|
|
"m260s1820m260s1820m260s1820m260s780m260s1820m260s1820m260s780m260s1820"
|
|
"m260s43602", irsend.outputStr());
|
|
|
|
irsend.reset();
|
|
irsend.sendDenon(0x1234567890ABCDEF, 64);
|
|
EXPECT_EQ(
|
|
"m3456s1728"
|
|
"m432s432m432s432m432s432m432s1296m432s432m432s432m432s1296m432s432"
|
|
"m432s432m432s432m432s1296m432s1296m432s432m432s1296m432s432m432s432"
|
|
"m432s432m432s1296m432s432m432s1296m432s432m432s1296m432s1296m432s432"
|
|
"m432s432m432s1296m432s1296m432s1296m432s1296m432s432m432s432m432s432"
|
|
"m432s1296m432s432m432s432m432s1296m432s432m432s432m432s432m432s432"
|
|
"m432s1296m432s432m432s1296m432s432m432s1296m432s432m432s1296m432s1296"
|
|
"m432s1296m432s1296m432s432m432s432m432s1296m432s1296m432s432m432s1296"
|
|
"m432s1296m432s1296m432s1296m432s432m432s1296m432s1296m432s1296m432s1296"
|
|
"m432s129600", irsend.outputStr());
|
|
}
|
|
|
|
// Tests for decodeDenon().
|
|
|
|
// Decode normal Denon messages.
|
|
TEST(TestDecodeDenon, NormalDecodeWithStrict) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
// Normal Denon 15-bit message. (Sharp)
|
|
irsend.reset();
|
|
irsend.sendDenon(0x2278);
|
|
irsend.makeDecodeResult();
|
|
|
|
ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, DENON_BITS, true));
|
|
EXPECT_EQ(DENON, irsend.capture.decode_type);
|
|
EXPECT_EQ(DENON_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0x2278, irsend.capture.value);
|
|
EXPECT_EQ(0x2, irsend.capture.address);
|
|
EXPECT_EQ(0x79, irsend.capture.command);
|
|
EXPECT_FALSE(irsend.capture.repeat);
|
|
|
|
// Legacy Denon 14-bit message.
|
|
irsend.reset();
|
|
irsend.sendDenon(0x1278, DENON_LEGACY_BITS);
|
|
irsend.makeDecodeResult();
|
|
|
|
ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, DENON_LEGACY_BITS, true));
|
|
EXPECT_EQ(DENON, irsend.capture.decode_type);
|
|
EXPECT_EQ(DENON_LEGACY_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0x1278, irsend.capture.value);
|
|
EXPECT_EQ(0x0, irsend.capture.address);
|
|
EXPECT_EQ(0x0, irsend.capture.command);
|
|
EXPECT_FALSE(irsend.capture.repeat);
|
|
|
|
// Normal Denon 48-bit message. (Panasonic/Kaseikyo)
|
|
irsend.reset();
|
|
irsend.sendDenon(0x2A4C028D6CE3, DENON_48_BITS);
|
|
irsend.makeDecodeResult();
|
|
ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, DENON_48_BITS, true));
|
|
EXPECT_EQ(DENON, irsend.capture.decode_type);
|
|
EXPECT_EQ(DENON_48_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0x2A4C028D6CE3, irsend.capture.value);
|
|
EXPECT_EQ(0x2A4C, irsend.capture.address);
|
|
EXPECT_EQ(0x028D6CE3, irsend.capture.command);
|
|
EXPECT_FALSE(irsend.capture.repeat);
|
|
}
|
|
|
|
// Decode a 'real' example via GlobalCache
|
|
TEST(TestDecodeDenon, DecodeGlobalCacheExample) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
// Denon AVR series Power On code from Global Cache. (Sharp style)
|
|
uint16_t gc_test_power[67] = {38000, 1, 1,
|
|
10, 30, 10, 70, 10, 30, 10, 30, 10, 30, 10, 70,
|
|
10, 30, 10, 30, 10, 70, 10, 70, 10, 70, 10, 70,
|
|
10, 30, 10, 30, 10, 30, 10, 1657,
|
|
10, 30, 10, 70, 10, 30, 10, 30, 10, 30, 10, 30,
|
|
10, 70, 10, 70, 10, 30, 10, 30, 10, 30, 10, 30,
|
|
10, 70, 10, 70, 10, 70, 10, 1657};
|
|
irsend.sendGC(gc_test_power, 67);
|
|
irsend.makeDecodeResult();
|
|
|
|
ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, DENON_BITS, true));
|
|
EXPECT_EQ(DENON, irsend.capture.decode_type);
|
|
EXPECT_EQ(DENON_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0x2278, irsend.capture.value);
|
|
EXPECT_EQ(0x2, irsend.capture.address);
|
|
EXPECT_EQ(0x79, irsend.capture.command);
|
|
EXPECT_FALSE(irsend.capture.repeat);
|
|
|
|
// Denon "Eco Mode Auto" code from Global Cache. (Panasonic style)
|
|
uint16_t gc_test_eco[103] = {37000, 1, 1, 128, 64, 16, 16, 16, 16, 16, 48,
|
|
16, 16, 16, 48, 16, 16, 16, 48, 16, 16, 16, 16,
|
|
16, 48, 16, 16, 16, 16, 16, 48, 16, 48, 16, 16,
|
|
16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
|
|
16, 16, 16, 48, 16, 16, 16, 48, 16, 16, 16, 16,
|
|
16, 16, 16, 48, 16, 48, 16, 16, 16, 48, 16, 16,
|
|
16, 48, 16, 48, 16, 16, 16, 48, 16, 48, 16, 16,
|
|
16, 16, 16, 48, 16, 48, 16, 48, 16, 16, 16, 16,
|
|
16, 16, 16, 48, 16, 48, 16, 2766};
|
|
irsend.reset();
|
|
irsend.sendGC(gc_test_eco, 103);
|
|
irsend.makeDecodeResult();
|
|
|
|
ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, DENON_48_BITS, true));
|
|
EXPECT_EQ(DENON, irsend.capture.decode_type);
|
|
EXPECT_EQ(DENON_48_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0x2A4C028D6CE3, irsend.capture.value);
|
|
EXPECT_EQ(0x2A4C, irsend.capture.address);
|
|
EXPECT_EQ(0x028D6CE3, irsend.capture.command);
|
|
EXPECT_FALSE(irsend.capture.repeat);
|
|
}
|
|
|
|
// Fail to decode a non-Denon example via GlobalCache
|
|
TEST(TestDecodeDenon, FailToDecodeNonDenonExample) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
uint16_t gc_test[39] = {38000, 1, 1, 322, 162, 20, 61, 20, 61, 20, 20, 20, 20,
|
|
20, 20, 20, 127, 20, 61, 9, 20, 20, 61, 20, 20, 20,
|
|
61, 20, 61, 20, 61, 20, 20, 20, 20, 20, 20, 20, 884};
|
|
irsend.sendGC(gc_test, 39);
|
|
irsend.makeDecodeResult();
|
|
|
|
ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture));
|
|
ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, DENON_LEGACY_BITS, false));
|
|
ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, DENON_BITS, false));
|
|
ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, DENON_48_BITS, false));
|
|
}
|