Update IRRemoteESP8266 version to 2.5.5

factorize IR send signal function between the 2 types of receiving Add new IRRemoteESP8266 protocols replace pins on mega according schema remove unecessaries spaces
2019-02-08 16:50:37 +01:00
1 parent 0180a0dbd5
commit f0305236db
@@ -14,52 +14,59 @@ TEST(TestSendSony, SendDataOnly) {
  irsend.reset();
  irsend.sendSony(0);
  // We expect three 20-bit commands to be sent.
-  EXPECT_EQ("m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m600s600m600s600m600s600m600s18600"
-            "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m600s600m600s600m600s600m600s18600"
-            "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m600s600m600s600m600s600m600s18600", irsend.outputStr());
+  EXPECT_EQ(
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s18600"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s18600"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s18600",
+      irsend.outputStr());

  irsend.reset();
-  irsend.sendSony(0x240C, SONY_20_BITS);
+  irsend.sendSony(0x240C, kSony20Bits);
  // We expect three 20-bit commands to be sent.
-  EXPECT_EQ("m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
-            "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m1200s600m1200s600m600s600m600s16200"
-            "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
-            "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m1200s600m1200s600m600s600m600s16200"
-            "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
-            "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m1200s600m1200s600m600s600m600s16200", irsend.outputStr());
+  EXPECT_EQ(
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200",
+      irsend.outputStr());

  irsend.reset();
-  irsend.sendSony(0x240C, SONY_15_BITS);
+  irsend.sendSony(0x240C, kSony15Bits);
  // We expect three 15-bit commands to be sent.
-  EXPECT_EQ("m2400s600m600s600m1200s600m600s600m600s600m1200s600m600s600"
-            "m600s600m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
-            "m600s22200"
-            "m2400s600m600s600m1200s600m600s600m600s600m1200s600m600s600"
-            "m600s600m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
-            "m600s22200"
-            "m2400s600m600s600m1200s600m600s600m600s600m1200s600m600s600"
-            "m600s600m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
-            "m600s22200", irsend.outputStr());
+  EXPECT_EQ(
+      "m2400s600m600s600m1200s600m600s600m600s600m1200s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+      "m600s22200"
+      "m2400s600m600s600m1200s600m600s600m600s600m1200s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+      "m600s22200"
+      "m2400s600m600s600m1200s600m600s600m600s600m1200s600m600s600"
+      "m600s600m600s600m600s600m600s600m600s600m1200s600m1200s600m600s600"
+      "m600s22200",
+      irsend.outputStr());

  irsend.reset();
-  irsend.sendSony(0xA90, SONY_12_BITS);
+  irsend.sendSony(0xA90, kSony12Bits);
  // We expect three 15-bit commands to be sent.
-  EXPECT_EQ("m2400s600m1200s600m600s600m1200s600m600s600m1200s600m600s600"
-            "m600s600m1200s600m600s600m600s600m600s600m600s25800"
-            "m2400s600m1200s600m600s600m1200s600m600s600m1200s600m600s600"
-            "m600s600m1200s600m600s600m600s600m600s600m600s25800"
-            "m2400s600m1200s600m600s600m1200s600m600s600m1200s600m600s600"
-            "m600s600m1200s600m600s600m600s600m600s600m600s25800",
-            irsend.outputStr());
+  EXPECT_EQ(
+      "m2400s600m1200s600m600s600m1200s600m600s600m1200s600m600s600"
+      "m600s600m1200s600m600s600m600s600m600s600m600s25800"
+      "m2400s600m1200s600m600s600m1200s600m600s600m1200s600m600s600"
+      "m600s600m1200s600m600s600m600s600m600s600m600s25800"
+      "m2400s600m1200s600m600s600m1200s600m600s600m1200s600m600s600"
+      "m600s600m1200s600m600s600m600s600m600s600m600s25800",
+      irsend.outputStr());
 }

 // Test sending with different repeats.
@@ -68,57 +75,63 @@ TEST(TestSendSony, SendWithDiffRepeats) {
  irsend.begin();

  irsend.reset();
-  irsend.sendSony(0x240C, SONY_20_BITS, 0);  // Send a command with 0 repeats.
-  EXPECT_EQ("m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
-            "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m1200s600m1200s600m600s600m600s16200", irsend.outputStr());
-  irsend.sendSony(0x240C, SONY_20_BITS, 1);  // Send a command with 1 repeat.
-  EXPECT_EQ("m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
-            "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m1200s600m1200s600m600s600m600s16200"
-            "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
-            "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m1200s600m1200s600m600s600m600s16200", irsend.outputStr());
-  irsend.sendSony(0x240C, SONY_20_BITS, 3);  // Send a command with 3 repeats.
-  EXPECT_EQ("m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
-            "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m1200s600m1200s600m600s600m600s16200"
-            "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
-            "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m1200s600m1200s600m600s600m600s16200"
-            "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
-            "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m1200s600m1200s600m600s600m600s16200"
-            "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
-            "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
-            "m600s600m1200s600m1200s600m600s600m600s16200", irsend.outputStr());
+  irsend.sendSony(0x240C, kSony20Bits, 0);  // Send a command with 0 repeats.
+  EXPECT_EQ(
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200",
+      irsend.outputStr());
+  irsend.sendSony(0x240C, kSony20Bits, 1);  // Send a command with 1 repeat.
+  EXPECT_EQ(
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200",
+      irsend.outputStr());
+  irsend.sendSony(0x240C, kSony20Bits, 3);  // Send a command with 3 repeats.
+  EXPECT_EQ(
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200"
+      "m2400s600m600s600m600s600m600s600m600s600m600s600m600s600m1200s600"
+      "m600s600m600s600m1200s600m600s600m600s600m600s600m600s600m600s600"
+      "m600s600m1200s600m1200s600m600s600m600s16200",
+      irsend.outputStr());
 }

 // Tests for encodeSony().

 TEST(TestEncodeSony, NormalSonyEncoding) {
  IRsendTest irsend(4);
-  EXPECT_EQ(0x0, irsend.encodeSony(SONY_12_BITS, 0, 0));
-  EXPECT_EQ(0xA90, irsend.encodeSony(SONY_12_BITS, 21, 1));
-  EXPECT_EQ(0xFFF, irsend.encodeSony(SONY_12_BITS, 0x7F, 0x1F));
+  EXPECT_EQ(0x0, irsend.encodeSony(kSony12Bits, 0, 0));
+  EXPECT_EQ(0xA90, irsend.encodeSony(kSony12Bits, 21, 1));
+  EXPECT_EQ(0xFFF, irsend.encodeSony(kSony12Bits, 0x7F, 0x1F));

-  EXPECT_EQ(0x0, irsend.encodeSony(SONY_15_BITS, 0, 0));
-  EXPECT_EQ(0x5480, irsend.encodeSony(SONY_15_BITS, 21, 1));
-  EXPECT_EQ(0x5455, irsend.encodeSony(SONY_15_BITS, 21, 0xAA));
-  EXPECT_EQ(0x7FFF, irsend.encodeSony(SONY_15_BITS, 0x7F, 0xFF));
+  EXPECT_EQ(0x0, irsend.encodeSony(kSony15Bits, 0, 0));
+  EXPECT_EQ(0x5480, irsend.encodeSony(kSony15Bits, 21, 1));
+  EXPECT_EQ(0x5455, irsend.encodeSony(kSony15Bits, 21, 0xAA));
+  EXPECT_EQ(0x7FFF, irsend.encodeSony(kSony15Bits, 0x7F, 0xFF));

-  EXPECT_EQ(0x0, irsend.encodeSony(SONY_20_BITS, 0, 0, 0));
-  EXPECT_EQ(0x81080, irsend.encodeSony(SONY_20_BITS, 1, 1, 1));
-  EXPECT_EQ(0xFFFFF, irsend.encodeSony(SONY_20_BITS, 0x7F, 0x1F, 0xFF));
+  EXPECT_EQ(0x0, irsend.encodeSony(kSony20Bits, 0, 0, 0));
+  EXPECT_EQ(0x81080, irsend.encodeSony(kSony20Bits, 1, 1, 1));
+  EXPECT_EQ(0xFFFFF, irsend.encodeSony(kSony20Bits, 0x7F, 0x1F, 0xFF));
 }

 TEST(TestEncodeSony, SonyEncodingWithOversizedValues) {
  IRsendTest irsend(4);
-  EXPECT_EQ(0xFFF, irsend.encodeSony(SONY_12_BITS, 0xFFFF, 0xFFFF));
+  EXPECT_EQ(0xFFF, irsend.encodeSony(kSony12Bits, 0xFFFF, 0xFFFF));

-  EXPECT_EQ(0x7FFF, irsend.encodeSony(SONY_15_BITS, 0xFFFF, 0xFFFF));
+  EXPECT_EQ(0x7FFF, irsend.encodeSony(kSony15Bits, 0xFFFF, 0xFFFF));

-  EXPECT_EQ(0xFFFFF, irsend.encodeSony(SONY_20_BITS, 0xFFFF, 0xFFFF, 0xFFFF));
+  EXPECT_EQ(0xFFFFF, irsend.encodeSony(kSony20Bits, 0xFFFF, 0xFFFF, 0xFFFF));
 }

 // Tests for decodeSony().
@@ -131,33 +144,33 @@ TEST(TestDecodeSony, NormalSonyDecodeWithStrict) {

  // Synthesised Normal Sony 20-bit message.
  irsend.reset();
-  irsend.sendSony(irsend.encodeSony(SONY_20_BITS, 0x1, 0x1, 0x1));
+  irsend.sendSony(irsend.encodeSony(kSony20Bits, 0x1, 0x1, 0x1));
  irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, SONY_20_BITS, true));
+  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
  EXPECT_EQ(SONY, irsend.capture.decode_type);
-  EXPECT_EQ(SONY_20_BITS, irsend.capture.bits);
+  EXPECT_EQ(kSony20Bits, irsend.capture.bits);
  EXPECT_EQ(0x81080, irsend.capture.value);
  EXPECT_EQ(0x1, irsend.capture.address);
  EXPECT_EQ(0x81, irsend.capture.command);

  // Synthesised Normal Sony 15-bit message.
  irsend.reset();
-  irsend.sendSony(irsend.encodeSony(SONY_15_BITS, 21, 1), SONY_15_BITS);
+  irsend.sendSony(irsend.encodeSony(kSony15Bits, 21, 1), kSony15Bits);
  irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, SONY_15_BITS, true));
+  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
  EXPECT_EQ(SONY, irsend.capture.decode_type);
-  EXPECT_EQ(SONY_15_BITS, irsend.capture.bits);
+  EXPECT_EQ(kSony15Bits, irsend.capture.bits);
  EXPECT_EQ(0x5480, irsend.capture.value);
  EXPECT_EQ(1, irsend.capture.address);
  EXPECT_EQ(21, irsend.capture.command);

  // Synthesised Normal Sony 12-bit message.
  irsend.reset();
-  irsend.sendSony(irsend.encodeSony(SONY_12_BITS, 21, 1), SONY_12_BITS);
+  irsend.sendSony(irsend.encodeSony(kSony12Bits, 21, 1), kSony12Bits);
  irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, SONY_12_BITS, true));
+  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
  EXPECT_EQ(SONY, irsend.capture.decode_type);
-  EXPECT_EQ(SONY_12_BITS, irsend.capture.bits);
+  EXPECT_EQ(kSony12Bits, irsend.capture.bits);
  EXPECT_EQ(0xA90, irsend.capture.value);
  EXPECT_EQ(1, irsend.capture.address);
  EXPECT_EQ(21, irsend.capture.command);
@@ -171,46 +184,46 @@ TEST(TestDecodeSony, SonyDecodeWithUnexpectedLegalSize) {

  // Synthesised Normal Sony 20-bit message decoded when looking for 12-bits
  irsend.reset();
-  irsend.sendSony(irsend.encodeSony(SONY_20_BITS, 0x1, 0x1, 0x1));
+  irsend.sendSony(irsend.encodeSony(kSony20Bits, 0x1, 0x1, 0x1));
  irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, SONY_MIN_BITS));
+  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kSonyMinBits));
  EXPECT_EQ(SONY, irsend.capture.decode_type);
-  EXPECT_EQ(SONY_20_BITS, irsend.capture.bits);
+  EXPECT_EQ(kSony20Bits, irsend.capture.bits);
  EXPECT_EQ(0x81080, irsend.capture.value);
  EXPECT_EQ(0x1, irsend.capture.address);
  EXPECT_EQ(0x81, irsend.capture.command);

  // Synthesised Normal Sony 12-bit message when expecting 20-bits.
  irsend.reset();
-  irsend.sendSony(irsend.encodeSony(SONY_12_BITS, 21, 1), SONY_12_BITS);
+  irsend.sendSony(irsend.encodeSony(kSony12Bits, 21, 1), kSony12Bits);
  irsend.makeDecodeResult();
-  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, SONY_20_BITS));
+  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kSony20Bits));
  EXPECT_EQ(SONY, irsend.capture.decode_type);
-  EXPECT_EQ(SONY_12_BITS, irsend.capture.bits);
+  EXPECT_EQ(kSony12Bits, irsend.capture.bits);
  EXPECT_EQ(0xA90, irsend.capture.value);
  EXPECT_EQ(1, irsend.capture.address);
  EXPECT_EQ(21, irsend.capture.command);

  // 12-bit message should be regected when using strict and a different size.
  irsend.reset();
-  irsend.sendSony(irsend.encodeSony(SONY_12_BITS, 21, 1), SONY_12_BITS);
+  irsend.sendSony(irsend.encodeSony(kSony12Bits, 21, 1), kSony12Bits);
  irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_20_BITS, true));
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_15_BITS, true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));

  // 15-bit message should be regected when using strict and a different size.
  irsend.reset();
-  irsend.sendSony(irsend.encodeSony(SONY_15_BITS, 21, 1), SONY_15_BITS);
+  irsend.sendSony(irsend.encodeSony(kSony15Bits, 21, 1), kSony15Bits);
  irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_12_BITS, true));
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_20_BITS, true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));

  // 20-bit message should be regected when using strict and a different size.
  irsend.reset();
-  irsend.sendSony(irsend.encodeSony(SONY_20_BITS, 1, 1, 1), SONY_20_BITS);
+  irsend.sendSony(irsend.encodeSony(kSony20Bits, 1, 1, 1), kSony20Bits);
  irsend.makeDecodeResult();
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_12_BITS, true));
-  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_15_BITS, true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
+  ASSERT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
 }

 // Decode unsupported Sony messages. i.e non-standard sizes.
@@ -223,10 +236,10 @@ TEST(TestDecodeSony, SonyDecodeWithIllegalSize) {
  irsend.sendSony(0xFF, 8);  // Illegal 8-bit Sony-like message.
  irsend.makeDecodeResult();
  // Should fail with strict on.
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_MIN_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_12_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_15_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_20_BITS, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSonyMinBits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
  // Should work with a 'normal' match (not strict)
  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture));
  EXPECT_EQ(SONY, irsend.capture.decode_type);
@@ -239,10 +252,10 @@ TEST(TestDecodeSony, SonyDecodeWithIllegalSize) {
  irsend.sendSony(0x1FFF, 13);  // Illegal 13-bit Sony-like message.
  irsend.makeDecodeResult();
  // Should fail with strict on.
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_MIN_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_12_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_15_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_20_BITS, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSonyMinBits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
  // Should work with a 'normal' match (not strict)
  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture));
  EXPECT_EQ(SONY, irsend.capture.decode_type);
@@ -255,10 +268,10 @@ TEST(TestDecodeSony, SonyDecodeWithIllegalSize) {
  irsend.sendSony(0x1FFFF, 17);  // Illegal 17-bit Sony-like message.
  irsend.makeDecodeResult();
  // Should fail with strict on.
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_MIN_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_12_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_15_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_20_BITS, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSonyMinBits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
  // Should work with a 'normal' match (not strict)
  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture));
  EXPECT_EQ(SONY, irsend.capture.decode_type);
@@ -271,10 +284,10 @@ TEST(TestDecodeSony, SonyDecodeWithIllegalSize) {
  irsend.sendSony(0x1FFFFF, 21);  // Illegal 21-bit Sony-like message.
  irsend.makeDecodeResult();
  // Should fail with strict on.
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_MIN_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_12_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_15_BITS, true));
-  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, SONY_20_BITS, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSonyMinBits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony15Bits, true));
+  EXPECT_FALSE(irrecv.decodeSony(&irsend.capture, kSony20Bits, true));
  // Should work with a 'normal' match (not strict)
  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture));
  EXPECT_EQ(SONY, irsend.capture.decode_type);
@@ -296,7 +309,6 @@ TEST(TestDecodeSony, SonyDecodeWithIllegalSize) {
  EXPECT_EQ(0x0, irsend.capture.command);
 }

-
 // Decode unsupported Sony messages. i.e non-standard sizes.
 TEST(TestDecodeSony, DecodeGlobalCacheExample) {
  IRsendTest irsend(4);
@@ -305,9 +317,9 @@ TEST(TestDecodeSony, DecodeGlobalCacheExample) {

  irsend.reset();
  // Sony "Power On" from Global Cache.
-  uint16_t gc_test[29] = {40000, 1, 1, 96, 24, 24, 24, 48, 24, 48, 24, 48, 24,
-                          24, 24, 48, 24, 24, 24, 48, 24, 24, 24, 24, 24, 24,
-                          24, 24, 1013};
+  uint16_t gc_test[29] = {40000, 1,  1,  96, 24, 24, 24, 48, 24,  48,
+                          24,    48, 24, 24, 24, 48, 24, 24, 24,  48,
+                          24,    24, 24, 24, 24, 24, 24, 24, 1013};
  irsend.sendGC(gc_test, 29);
  irsend.makeDecodeResult();

@@ -319,5 +331,27 @@ TEST(TestDecodeSony, DecodeGlobalCacheExample) {
  EXPECT_EQ(0x1, irsend.capture.address);
  EXPECT_EQ(0x2E, irsend.capture.command);
  // With strict and correct size.
-  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, SONY_12_BITS, true));
+  ASSERT_TRUE(irrecv.decodeSony(&irsend.capture, kSony12Bits, true));
+}
+
+// Encoding & Decode 20 bit Sony messages. Issue #476
+TEST(TestEncodeSony, Issue476) {
+  IRsendTest irsend(0);
+  IRrecv irrecv(0);
+  irsend.begin();
+
+  irsend.reset();
+  irsend.sendSony(0x6AB47, 20);
+  irsend.makeDecodeResult();
+
+  // Without strict.
+  ASSERT_TRUE(irrecv.decode(&irsend.capture));
+  EXPECT_EQ(SONY, irsend.capture.decode_type);
+  EXPECT_EQ(20, irsend.capture.bits);
+  EXPECT_EQ(0x6AB47, irsend.capture.value);   // 20 bits
+  EXPECT_EQ(0x1A, irsend.capture.address);    // 5 bits
+  EXPECT_EQ(0x7156, irsend.capture.command);  // 15 bits
+  EXPECT_EQ(0x56, 0x7156 & 0x7F);             // command (lower 7 bits)
+  EXPECT_EQ(0xE2, (0x7156 >> 7) & 0xFF);      // extended (top 8 of 15 bits)
+  EXPECT_EQ(0x6AB47, irsend.encodeSony(20, 0x56, 0x1A, 0xE2));
 }