Closes #722

Author: ArminJo

changelog.md

@@ -1,3 +1,6 @@
+## 2.8.1 2020/10
+- Fixed bug in Sony decode introduced in 2.8.0.
+
 ## 2.8.0 2020/10
 - Changed License to MIT see https://github.com/z3t0/Arduino-IRremote/issues/397.
 - Added ATtiny timer 1 support.

examples/IRtest/IRtest.ino

@@ -99,7 +99,7 @@ public:
 
 IRsendDummy irsenddummy;
 
-void verify(unsigned long val, int bits, int type) {
+void verify(unsigned long val, unsigned int bits, unsigned int type) {
     irsenddummy.useDummyBuf();
     IrReceiver.decode();
     Serial.print("Testing ");

examples/IRtest2/IRtest2.ino

@@ -118,7 +118,7 @@ void dump() {
 // The motivation behind this method is that the sender and the receiver
 // can do the same test calls, and the mode variable indicates whether
 // to send or receive.
-void test(const char *label, int type, uint32_t value, int bits) {
+void test(const char *label, int type, uint32_t value, unsigned int bits) {
     if (mode == SENDER) {
         Serial.println(label);
         if (type == NEC) {

src/IRremote.h

@@ -535,7 +535,7 @@ class IRsend {
      */
     void sendPronto(const char* prontoHexString, unsigned int times = 1U);
 
-    void sendPronto(const uint16_t* data, unsigned int length, unsigned int times = 1U);
+    void sendPronto(const uint16_t *data, unsigned int length, unsigned int times = 1U);
 
 #if HAS_FLASH_READ || defined(DOXYGEN)
     void sendPronto_PF(uint_farptr_t str, unsigned int times = 1U);

src/ir_Sony.cpp

@@ -27,7 +27,7 @@ void IRsend::sendSony(unsigned long data, int nbits) {
 
     // Header
     mark(SONY_HEADER_MARK);
-    space (SONY_SPACE);
+    space(SONY_SPACE);
 
     sendPulseDistanceWidthData(SONY_ONE_MARK, SONY_SPACE, SONY_ZERO_MARK, SONY_SPACE, data, nbits);
     /*
@@ -59,7 +59,7 @@ bool IRrecv::decodeSony() {
 
     // Some Sony's deliver repeats fast after first
     // unfortunately can't spot difference from of repeat from two fast clicks
-    if (results.rawbuf[offset] < (SONY_DOUBLE_SPACE_USECS / MICROS_PER_TICK)) {
+    if (results.rawbuf[0] < (SONY_DOUBLE_SPACE_USECS / MICROS_PER_TICK)) {
         DBG_PRINTLN("IR Gap found");
         results.bits = 0;
         results.value = REPEAT;
@@ -75,14 +75,16 @@ bool IRrecv::decodeSony() {
     }
     offset++;
 
-    // Check header "space"
-    if (!MATCH_SPACE(results.rawbuf[offset], SONY_SPACE)) {
-        return false;
-    }
-    offset++;
-
     // MSB first - Not compatible to standard, which says LSB first :-(
-    while (offset < results.rawlen) {
+    while (offset + 1 < results.rawlen) {
+
+        // First check for the constant space length, we do not have a space at the end of raw data
+        // we are lucky, since the start space is equal the data space.
+        if (!MATCH_SPACE(results.rawbuf[offset], SONY_SPACE)) {
+            return false;
+        }
+        offset++;
+
         // bit value is determined by length of the mark
         if (MATCH_MARK(results.rawbuf[offset], SONY_ONE_MARK)) {
             data = (data << 1) | 1;
@@ -93,11 +95,6 @@ bool IRrecv::decodeSony() {
         }
         offset++;
 
-        // check for the constant space length
-        if (!MATCH_SPACE(results.rawbuf[offset], SONY_SPACE)) {
-            return false;
-        }
-        offset++;
     }
 
     results.bits = SONY_BITS;

src/private/IRremoteInt.h

@@ -49,8 +49,8 @@ struct irparams_struct {
     uint8_t blinkpin;
     uint8_t blinkflag;              ///< true -> enable blinking of pin on IR processing
     uint16_t rawlen;                ///< counter of entries in rawbuf
-    uint16_t timer;             ///< State timer, counts 50uS ticks.
-    uint16_t rawbuf[RAW_BUFFER_LENGTH]; ///< raw data, first entry is the length of the gap between previous and current command
+    uint16_t timer;                 ///< State timer, counts 50uS ticks.
+    uint16_t rawbuf[RAW_BUFFER_LENGTH]; ///< raw data / tick counts per mark/space, first entry is the length of the gap between previous and current command
     uint8_t overflow;               ///< Raw buffer overflow occurred
 };