3403ca1e0a
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)
211 lines
7.7 KiB
C++
211 lines
7.7 KiB
C++
// Copyright 2017 David Conran
|
|
|
|
#include "IRsend.h"
|
|
#include "IRsend_test.h"
|
|
#include "gtest/gtest.h"
|
|
|
|
// Tests for sendNikai().
|
|
// Test sending typical data only.
|
|
TEST(TestSendNikai, SendDataOnly) {
|
|
IRsendTest irsend(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
irsend.sendNikai(0xD5F2A); // Nikai TV Power Off.
|
|
EXPECT_EQ("m4000s4000"
|
|
"m500s2000m500s2000m500s2000m500s2000m500s1000m500s1000m500s2000"
|
|
"m500s1000m500s2000m500s1000m500s2000m500s1000m500s1000m500s1000"
|
|
"m500s1000m500s1000m500s2000m500s2000m500s1000m500s2000m500s1000"
|
|
"m500s2000m500s1000m500s2000m500s8500",
|
|
irsend.outputStr());
|
|
|
|
irsend.reset();
|
|
}
|
|
|
|
// Test sending with different repeats.
|
|
TEST(TestSendNikai, SendWithRepeats) {
|
|
IRsendTest irsend(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
irsend.sendNikai(0xD5F2A, NIKAI_BITS, 1); // 1 repeat.
|
|
EXPECT_EQ("m4000s4000"
|
|
"m500s2000m500s2000m500s2000m500s2000m500s1000m500s1000m500s2000"
|
|
"m500s1000m500s2000m500s1000m500s2000m500s1000m500s1000m500s1000"
|
|
"m500s1000m500s1000m500s2000m500s2000m500s1000m500s2000m500s1000"
|
|
"m500s2000m500s1000m500s2000m500s8500"
|
|
"m4000s4000"
|
|
"m500s2000m500s2000m500s2000m500s2000m500s1000m500s1000m500s2000"
|
|
"m500s1000m500s2000m500s1000m500s2000m500s1000m500s1000m500s1000"
|
|
"m500s1000m500s1000m500s2000m500s2000m500s1000m500s2000m500s1000"
|
|
"m500s2000m500s1000m500s2000m500s8500",
|
|
irsend.outputStr());
|
|
irsend.sendNikai(0xD5F2A, NIKAI_BITS, 2); // 2 repeat.
|
|
EXPECT_EQ("m4000s4000"
|
|
"m500s2000m500s2000m500s2000m500s2000m500s1000m500s1000m500s2000"
|
|
"m500s1000m500s2000m500s1000m500s2000m500s1000m500s1000m500s1000"
|
|
"m500s1000m500s1000m500s2000m500s2000m500s1000m500s2000m500s1000"
|
|
"m500s2000m500s1000m500s2000m500s8500"
|
|
"m4000s4000"
|
|
"m500s2000m500s2000m500s2000m500s2000m500s1000m500s1000m500s2000"
|
|
"m500s1000m500s2000m500s1000m500s2000m500s1000m500s1000m500s1000"
|
|
"m500s1000m500s1000m500s2000m500s2000m500s1000m500s2000m500s1000"
|
|
"m500s2000m500s1000m500s2000m500s8500"
|
|
"m4000s4000"
|
|
"m500s2000m500s2000m500s2000m500s2000m500s1000m500s1000m500s2000"
|
|
"m500s1000m500s2000m500s1000m500s2000m500s1000m500s1000m500s1000"
|
|
"m500s1000m500s1000m500s2000m500s2000m500s1000m500s2000m500s1000"
|
|
"m500s2000m500s1000m500s2000m500s8500",
|
|
irsend.outputStr());
|
|
}
|
|
|
|
// Tests for decodeNikai().
|
|
|
|
// Decode normal Nikai messages.
|
|
TEST(TestDecodeNikai, NormalDecodeWithStrict) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
// Normal Nikai 24-bit message.
|
|
irsend.reset();
|
|
irsend.sendNikai(0x123456);
|
|
irsend.makeDecodeResult();
|
|
ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, NIKAI_BITS, true));
|
|
EXPECT_EQ(NIKAI, irsend.capture.decode_type);
|
|
EXPECT_EQ(NIKAI_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0x123456, irsend.capture.value);
|
|
|
|
irsend.reset();
|
|
irsend.sendNikai(0x101);
|
|
irsend.makeDecodeResult();
|
|
ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, NIKAI_BITS, true));
|
|
EXPECT_EQ(NIKAI, irsend.capture.decode_type);
|
|
EXPECT_EQ(NIKAI_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0x101, irsend.capture.value);
|
|
}
|
|
|
|
// Decode normal repeated Nikai messages.
|
|
TEST(TestDecodeNikai, NormalDecodeWithRepeatAndStrict) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
// Normal Nikai 24-bit message.
|
|
irsend.reset();
|
|
irsend.sendNikai(0xD5F2A, NIKAI_BITS, 2);
|
|
irsend.makeDecodeResult();
|
|
ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, NIKAI_BITS, true));
|
|
EXPECT_EQ(NIKAI, irsend.capture.decode_type);
|
|
EXPECT_EQ(NIKAI_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0xD5F2A, irsend.capture.value);
|
|
}
|
|
|
|
TEST(TestDecodeNikai, NormalDecodeWithNonStrict) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
// Illegal under length (16-bit) message
|
|
irsend.reset();
|
|
irsend.sendNikai(0x0, 16);
|
|
irsend.makeDecodeResult();
|
|
// Should fail with strict on.
|
|
ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, NIKAI_BITS, true));
|
|
// And it should fail when we expect more bits.
|
|
ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, NIKAI_BITS, false));
|
|
|
|
// Should pass if strict off if we ask for correct nr. of bits sent.
|
|
ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, 16, false));
|
|
EXPECT_EQ(NIKAI, irsend.capture.decode_type);
|
|
EXPECT_EQ(16, irsend.capture.bits);
|
|
EXPECT_EQ(0x0, irsend.capture.value);
|
|
|
|
// Should fail as we are expecting less bits than there are.
|
|
ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, 12, false));
|
|
}
|
|
|
|
// Decode (non-standard) 64-bit messages.
|
|
// Decode unsupported Nikai messages.
|
|
TEST(TestDecodeNikai, Decode64BitMessages) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
// Illegal size Nikai 64-bit message.
|
|
irsend.sendNikai(0xFFFFFFFFFFFFFFFF, 64);
|
|
irsend.makeDecodeResult();
|
|
ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, NIKAI_BITS, true));
|
|
// Should work with a 'normal' match (not strict)
|
|
ASSERT_TRUE(irrecv.decodeNikai(&irsend.capture, 64, false));
|
|
EXPECT_EQ(NIKAI, irsend.capture.decode_type);
|
|
EXPECT_EQ(64, irsend.capture.bits);
|
|
EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
|
|
}
|
|
|
|
// Decode real example via Issue #309
|
|
TEST(TestDecodeNikai, DecodeExamples) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
// Nikai TV Power Off from Issue #309
|
|
uint16_t rawdata_off[100] = {4060, 3918,
|
|
508, 2004, 508, 2002, 510, 2002, 508, 2004, 506, 1050, 508, 1048,
|
|
510, 2004, 508, 1048, 508, 2002, 510, 1050, 508, 2004, 510, 1048,
|
|
508, 1050, 508, 1048, 508, 1050, 508, 1050, 508, 2004, 508, 2002,
|
|
510, 1048, 508, 2004, 508, 1050, 506, 2004, 508, 1048, 510, 2002,
|
|
456, 8446,
|
|
3956, 3998,
|
|
508, 2004, 508, 2002, 508, 2004, 508, 1978, 532, 1050, 508, 1050,
|
|
508, 2002, 508, 1050, 508, 2004, 508, 1050, 508, 2002, 510, 1050,
|
|
508, 1050, 508, 1048, 508, 1050, 508, 1050, 508, 2002, 510, 2002,
|
|
508, 1050, 508, 2002, 510, 1050, 508, 2002, 508};
|
|
irsend.sendRaw(rawdata_off, 100, 38);
|
|
irsend.makeDecodeResult();
|
|
|
|
ASSERT_TRUE(irrecv.decode(&irsend.capture));
|
|
EXPECT_EQ(NIKAI, irsend.capture.decode_type);
|
|
EXPECT_EQ(NIKAI_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0xD5F2A, irsend.capture.value);
|
|
|
|
// Nikai TV Volume Up from Issue #309
|
|
uint16_t rawdata_volup[52] = {3972, 4002,
|
|
504, 1982, 526, 2010, 502, 2010, 502, 2010, 500, 1056, 502, 1056,
|
|
502, 2010, 500, 1056, 502, 2010, 502, 2010, 500, 2010, 502, 2010,
|
|
502, 1056, 502, 1056, 502, 1056, 500, 1056, 502, 2010, 502, 2010,
|
|
500, 1056, 502, 2008, 502, 1054, 504, 1054, 504, 1054, 500, 1056,
|
|
450};
|
|
|
|
irsend.reset();
|
|
irsend.sendRaw(rawdata_volup, 52, 38);
|
|
irsend.makeDecodeResult();
|
|
|
|
ASSERT_TRUE(irrecv.decode(&irsend.capture));
|
|
EXPECT_EQ(NIKAI, irsend.capture.decode_type);
|
|
EXPECT_EQ(NIKAI_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0xD0F2F, irsend.capture.value);
|
|
}
|
|
|
|
// Fail to decode a non-Nikai example via GlobalCache
|
|
TEST(TestDecodeNikai, FailToDecodeNonNikaiExample) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
uint16_t gc_test[71] = {38000, 1, 1, 172, 172, 22, 64, 22, 64, 22, 64, 22, 21,
|
|
22, 21, 22, 21, 22, 11, 22, 21, 22, 128, 22, 64, 22,
|
|
64, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 64,
|
|
22, 21, 22, 21, 22, 64, 22, 64, 22, 21, 22, 21, 22,
|
|
64, 22, 21, 22, 64, 22, 64, 22, 21, 22, 21, 22, 64,
|
|
22, 64, 22, 21, 22, 1820};
|
|
irsend.sendGC(gc_test, 71);
|
|
irsend.makeDecodeResult();
|
|
|
|
ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture));
|
|
ASSERT_FALSE(irrecv.decodeNikai(&irsend.capture, NIKAI_BITS, false));
|
|
}
|