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)
300 lines
11 KiB
C++
300 lines
11 KiB
C++
// Copyright 2017 David Conran
|
|
|
|
#include "IRsend.h"
|
|
#include "IRsend_test.h"
|
|
#include "gtest/gtest.h"
|
|
|
|
// Tests for sendJVC().
|
|
|
|
// Test sending typical data only.
|
|
TEST(TestSendJVC, SendDataOnly) {
|
|
IRsendTest irsend(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
irsend.sendJVC(0xC2B8); // JVC VCR Power On.
|
|
EXPECT_EQ(
|
|
"m8400s4200"
|
|
"m525s1725m525s1725m525s525m525s525m525s525m525s525m525s1725m525s525"
|
|
"m525s1725m525s525m525s1725m525s1725m525s1725m525s525m525s525m525s525"
|
|
"m525s60000", irsend.outputStr());
|
|
}
|
|
|
|
// Test sending with different repeats.
|
|
TEST(TestSendJVC, SendWithRepeats) {
|
|
IRsendTest irsend(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
irsend.sendJVC(0xC2B8, JVC_BITS, 1); // 1 repeat.
|
|
EXPECT_EQ(
|
|
"m8400s4200"
|
|
"m525s1725m525s1725m525s525m525s525m525s525m525s525m525s1725m525s525"
|
|
"m525s1725m525s525m525s1725m525s1725m525s1725m525s525m525s525m525s525"
|
|
"m525s60000"
|
|
"m525s1725m525s1725m525s525m525s525m525s525m525s525m525s1725m525s525"
|
|
"m525s1725m525s525m525s1725m525s1725m525s1725m525s525m525s525m525s525"
|
|
"m525s60000", irsend.outputStr());
|
|
irsend.sendJVC(0xC2B8, JVC_BITS, 2); // 2 repeats.
|
|
EXPECT_EQ(
|
|
"m8400s4200"
|
|
"m525s1725m525s1725m525s525m525s525m525s525m525s525m525s1725m525s525"
|
|
"m525s1725m525s525m525s1725m525s1725m525s1725m525s525m525s525m525s525"
|
|
"m525s60000"
|
|
"m525s1725m525s1725m525s525m525s525m525s525m525s525m525s1725m525s525"
|
|
"m525s1725m525s525m525s1725m525s1725m525s1725m525s525m525s525m525s525"
|
|
"m525s60000"
|
|
"m525s1725m525s1725m525s525m525s525m525s525m525s525m525s1725m525s525"
|
|
"m525s1725m525s525m525s1725m525s1725m525s1725m525s525m525s525m525s525"
|
|
"m525s60000", irsend.outputStr());
|
|
}
|
|
|
|
// Test sending an atypical data size.
|
|
TEST(TestSendJVC, SendUsualSize) {
|
|
IRsendTest irsend(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
irsend.sendJVC(0x0, 8);
|
|
EXPECT_EQ(
|
|
"m8400s4200"
|
|
"m525s525m525s525m525s525m525s525m525s525m525s525m525s525m525s525"
|
|
"m525s60000", irsend.outputStr());
|
|
|
|
irsend.reset();
|
|
irsend.sendJVC(0x1234567890ABCDEF, 64);
|
|
EXPECT_EQ(
|
|
"m8400s4200"
|
|
"m525s525m525s525m525s525m525s1725m525s525m525s525m525s1725m525s525"
|
|
"m525s525m525s525m525s1725m525s1725m525s525m525s1725m525s525m525s525"
|
|
"m525s525m525s1725m525s525m525s1725m525s525m525s1725m525s1725m525s525"
|
|
"m525s525m525s1725m525s1725m525s1725m525s1725m525s525m525s525m525s525"
|
|
"m525s1725m525s525m525s525m525s1725m525s525m525s525m525s525m525s525"
|
|
"m525s1725m525s525m525s1725m525s525m525s1725m525s525m525s1725m525s1725"
|
|
"m525s1725m525s1725m525s525m525s525m525s1725m525s1725m525s525m525s1725"
|
|
"m525s1725m525s1725m525s1725m525s525m525s1725m525s1725m525s1725m525s1725"
|
|
"m525s60000", irsend.outputStr());
|
|
}
|
|
|
|
// Tests for encodeJVC().
|
|
|
|
TEST(TestEncodeJVC, NormalEncoding) {
|
|
IRsendTest irsend(4);
|
|
EXPECT_EQ(0x0, irsend.encodeJVC(0, 0));
|
|
EXPECT_EQ(0x8080, irsend.encodeJVC(1, 1));
|
|
EXPECT_EQ(0x8040, irsend.encodeJVC(1, 2));
|
|
EXPECT_EQ(0xC2B8, irsend.encodeJVC(0x43, 0x1D));
|
|
EXPECT_EQ(0x55AA, irsend.encodeJVC(0xAA, 0x55));
|
|
EXPECT_EQ(0xFFFF, irsend.encodeJVC(0xFF, 0xFF));
|
|
}
|
|
|
|
// Tests for decodeJVC().
|
|
|
|
// Decode normal JVC messages.
|
|
TEST(TestDecodeJVC, NormalDecodeWithStrict) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
// Normal JVC 16-bit message.
|
|
irsend.reset();
|
|
irsend.sendJVC(0xC2B8);
|
|
irsend.makeDecodeResult();
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0xC2B8, irsend.capture.value);
|
|
EXPECT_EQ(0x43, irsend.capture.address);
|
|
EXPECT_EQ(0x1D, irsend.capture.command);
|
|
EXPECT_FALSE(irsend.capture.repeat);
|
|
|
|
// Synthesised Normal JVC 16-bit message.
|
|
irsend.reset();
|
|
irsend.sendJVC(irsend.encodeJVC(0x07, 0x99));
|
|
irsend.makeDecodeResult();
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0xE099, irsend.capture.value);
|
|
EXPECT_EQ(0x07, irsend.capture.address);
|
|
EXPECT_EQ(0x99, irsend.capture.command);
|
|
EXPECT_FALSE(irsend.capture.repeat);
|
|
|
|
// Synthesised Normal JVC 16-bit message.
|
|
irsend.reset();
|
|
irsend.sendJVC(irsend.encodeJVC(0x1, 0x1));
|
|
irsend.makeDecodeResult();
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0x8080, irsend.capture.value);
|
|
EXPECT_EQ(0x1, irsend.capture.address);
|
|
EXPECT_EQ(0x1, irsend.capture.command);
|
|
EXPECT_FALSE(irsend.capture.repeat);
|
|
}
|
|
|
|
// Decode normal repeated JVC messages.
|
|
TEST(TestDecodeJVC, NormalDecodeWithRepeatAndStrict) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
// Normal JVC 16-bit message with 2 repeats.
|
|
irsend.reset();
|
|
irsend.sendJVC(0xC2B8, JVC_BITS, 2);
|
|
irsend.makeDecodeResult();
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0xC2B8, irsend.capture.value);
|
|
EXPECT_EQ(0x43, irsend.capture.address);
|
|
EXPECT_EQ(0x1D, irsend.capture.command);
|
|
EXPECT_FALSE(irsend.capture.repeat);
|
|
|
|
irsend.makeDecodeResult(2 * JVC_BITS + 4);
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0xC2B8, irsend.capture.value);
|
|
EXPECT_TRUE(irsend.capture.repeat);
|
|
|
|
irsend.makeDecodeResult(2 * JVC_BITS + 4 + 2 * JVC_BITS + 2);
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0xC2B8, irsend.capture.value);
|
|
EXPECT_TRUE(irsend.capture.repeat);
|
|
|
|
// Simulate 'just' a JVC repeat command.
|
|
// JVC VCR Power On from Global Cache, but modified to be a repeat message.
|
|
uint16_t gc_test[37] = {38000, 1, 1, 20, 61, 20, 61, 20, 20, 20, 20,
|
|
20, 20, 20, 20, 20, 61, 20, 20, 20, 61, 20, 20, 20,
|
|
61, 20, 61, 20, 61, 20, 20, 20, 20, 20, 20, 20, 884};
|
|
irsend.reset();
|
|
irsend.sendGC(gc_test, 37);
|
|
irsend.makeDecodeResult();
|
|
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0xC2B8, irsend.capture.value);
|
|
EXPECT_EQ(0x43, irsend.capture.address);
|
|
EXPECT_EQ(0x1D, irsend.capture.command);
|
|
EXPECT_TRUE(irsend.capture.repeat);
|
|
}
|
|
|
|
// Decode unsupported JVC messages.
|
|
TEST(TestDecodeJVC, DecodeWithNonStrictValues) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
irsend.sendJVC(0x0, 8); // Illegal value JVC 8-bit message.
|
|
irsend.makeDecodeResult();
|
|
// Should fail with strict on.
|
|
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
|
|
// Should pass if strict off.
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, 8, false));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(8, irsend.capture.bits);
|
|
EXPECT_EQ(0x0, irsend.capture.value);
|
|
EXPECT_EQ(0x0, irsend.capture.address);
|
|
EXPECT_EQ(0x0, irsend.capture.command);
|
|
|
|
irsend.reset();
|
|
irsend.sendJVC(0x12345678, 32); // Illegal value JVC 32-bit message.
|
|
irsend.makeDecodeResult();
|
|
// Should not pass with strict when we ask for less bits than we got.
|
|
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
|
|
|
|
irsend.makeDecodeResult();
|
|
// Should fail with strict when we ask for the wrong bit size.
|
|
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, 32, true));
|
|
// Should pass if strict off.
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, 32, false));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(32, irsend.capture.bits);
|
|
EXPECT_EQ(0x12345678, irsend.capture.value);
|
|
EXPECT_EQ(0x12346A, irsend.capture.address);
|
|
EXPECT_EQ(0x1E, irsend.capture.command);
|
|
|
|
// Illegal over length (36-bit) message.
|
|
irsend.reset();
|
|
irsend.sendJVC(irsend.encodeJVC(2, 3), 36);
|
|
irsend.makeDecodeResult();
|
|
|
|
// Shouldn't pass if strict off and the wrong expected bits.
|
|
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, false));
|
|
|
|
// Re-decode with correct bit size.
|
|
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, 36, true));
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, 36, false));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(36, irsend.capture.bits);
|
|
EXPECT_EQ(0x40C0, irsend.capture.value);
|
|
EXPECT_EQ(0x2, irsend.capture.address);
|
|
EXPECT_EQ(0x3, irsend.capture.command);
|
|
}
|
|
|
|
// Decode (non-standard) 64-bit messages.
|
|
TEST(TestDecodeJVC, Decode64BitMessages) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
// Illegal value & size JVC 64-bit message.
|
|
irsend.sendJVC(0xFFFFFFFFFFFFFFFF, 64);
|
|
irsend.makeDecodeResult();
|
|
// Should work with a 'normal' match (not strict)
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, 64, false));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(64, irsend.capture.bits);
|
|
EXPECT_EQ(0xFFFFFFFFFFFFFFFF, irsend.capture.value);
|
|
EXPECT_EQ(0xFFFFFFFF, irsend.capture.address);
|
|
EXPECT_EQ(0xFF, irsend.capture.command);
|
|
}
|
|
|
|
// Decode a 'real' example via GlobalCache
|
|
TEST(TestDecodeJVC, DecodeGlobalCacheExample) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
// JVC VCR Power On from Global Cache.
|
|
uint16_t gc_test[39] = {38000, 1, 1, 322, 162, 20, 61, 20, 61, 20, 20, 20, 20,
|
|
20, 20, 20, 20, 20, 61, 20, 20, 20, 61, 20, 20, 20,
|
|
61, 20, 61, 20, 61, 20, 20, 20, 20, 20, 20, 20, 884};
|
|
// 38000,1,37,320,161,21,59,21,59,21,19,21,19,21,19,21,19,21,59,21,19,21,59,21,59,21,19,21,59,21,19,21,19,21,19,21,19,21,838,21,59,21,59,21,19,21,19,21,19,21,19,21,59,21,19,21,59,21,19,21,59,21,59,21,59,21,19,21,19,21,19,21,850};
|
|
irsend.sendGC(gc_test, 39);
|
|
irsend.makeDecodeResult();
|
|
|
|
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture));
|
|
EXPECT_EQ(JVC, irsend.capture.decode_type);
|
|
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
|
|
EXPECT_EQ(0xC2B8, irsend.capture.value);
|
|
EXPECT_EQ(0x43, irsend.capture.address);
|
|
EXPECT_EQ(0x1D, irsend.capture.command);
|
|
EXPECT_FALSE(irsend.capture.repeat);
|
|
}
|
|
|
|
// Fail to decode a non-JVC example via GlobalCache
|
|
TEST(TestDecodeJVC, FailToDecodeNonJVCExample) {
|
|
IRsendTest irsend(4);
|
|
IRrecv irrecv(4);
|
|
irsend.begin();
|
|
|
|
irsend.reset();
|
|
// Modified a few entries to unexpected values, based on previous test case.
|
|
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.decodeJVC(&irsend.capture));
|
|
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, false));
|
|
}
|