WebSVN – HomeAutomation – Diff – /trunk/EmbeddedSoftware/AVR/avr-lib/drivers/ir/protocols.c

 //#include <drivers/mcu/gpio.h>
-int8_t parseProtocol(const uint16_t *buf, uint8_t len, Ir_Protocol_Data_t *proto) {
+int8_t parseProtocol(const uint16_t *buf, uint8_t len, uint8_t index, Ir_Protocol_Data_t *proto) {
     proto->protocol=IR_PROTO_UNKNOWN;
     proto->data=0;
     proto->timeout=1;
     /* Try all protocols in order. */
 #if (IR_PROTOCOLS_USE_SIRC)
     if (parsePanasonic(buf, len, proto)==IR_OK) return IR_OK;
 #endif
 #if (IR_PROTOCOLS_USE_SKY)
     if (parseSky(buf, len, proto)==IR_OK) return IR_OK;
 #endif
+/* RF protocols needs index parameter */
 #if (IR_PROTOCOLS_USE_NEXA2)
-    if (parseNexa2(buf, len, proto)==IR_OK) return IR_OK;
+    if (parseNexa2(buf, len, index, proto)==IR_OK) return IR_OK;
 #endif
 #if (IR_PROTOCOLS_USE_NEXA1)
-    if (parseNexa1(buf, len, proto)==IR_OK) return IR_OK;
+    if (parseNexa1(buf, len, index, proto)==IR_OK) return IR_OK;
 #endif
     /* No protocol matched. */
     proto->protocol = IR_PROTO_UNKNOWN;
     return IR_NOT_CORRECT_DATA;
+}
                 /* do nothing, a zero is already in rawbits */
             } else {
                 return IR_NOT_CORRECT_DATA;
+            }
+        }
     }
     proto->protocol = IR_PROTO_SIRC;
     proto->timeout = IR_SIRC_TIMEOUT;
     proto->data = rawbits;
     return IR_OK;
 #endif
 /**
  * Expand data from SIRC protocol
  * http://www.sbprojects.com/knowledge/ir/sirc.htm
  *
  * @param buf
  *      Pointer to buffer to store the expanded data
  * @param len
  *      Pointer to length of the data
  * @param proto
  *      Pointer to protocol information
  * @return
  *      IR_OK if data expanded successfully, one of several errormessages if not
  */
 int8_t expandSIRC(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     buf[0] = IR_SIRC_ST_BIT;
     buf[1] = IR_SIRC_LOW; //start pulse finished
 #if (IR_PROTOCOLS_USE_SAMSUNG)
 /**
  * Test data on Samsung protocol
  * Very much like NEC, different start bit/pause lengths etc.
  * http://www.sbprojects.com/knowledge/ir/nec.htm
  *
  * @param buf
  *      Pointer to buffer to where to data to parse is stored
  * @param len
  *      Length of the data
  * @param proto
  *      Pointer to protocol information
  * @return
 int8_t parseSamsung(const uint16_t *buf, uint8_t len, Ir_Protocol_Data_t *proto) {
     /* parse buf[], max is len */
     /* check if we have correct amount of data */
     if (len != 67) {
         return IR_NOT_CORRECT_DATA;
     }
     /* check startbit */
     if (buf[0] > IR_SAMS_ST_BIT + IR_SAMS_ST_BIT/IR_SAMS_TOL_DIV || buf[0] < IR_SAMS_ST_BIT - IR_SAMS_ST_BIT/IR_SAMS_TOL_DIV) {
         return IR_NOT_CORRECT_DATA;
+    }
                 return IR_NOT_CORRECT_DATA;
+            }
         } else {            /* if even, ir-bit */
             if (buf[i] > IR_SAMS_HIGH + IR_SAMS_HIGH/IR_SAMS_TOL_DIV || buf[i] < IR_SAMS_HIGH - IR_SAMS_HIGH/IR_SAMS_TOL_DIV) {
                 return IR_NOT_CORRECT_DATA;
             }
         }
     }
     proto->protocol=IR_PROTO_SAMS;
     proto->timeout=IR_SAMS_TIMEOUT;
     proto->data=rawbits;
     return IR_OK;
+}
         //halfbitscnt&1==1 in the middle of bits
         //i&1==0 positive flank
         if ((halfbitscnt&1)==1 && (i&1)==0) {       /* in the middle of bit AND a positve flank */
             rawbits |= (uint32_t)1<<(19-(halfbitscnt>>1));
         }
         if (buf[i] > IR_MARANTZ_HALF_BIT - IR_MARANTZ_HALF_BIT/IR_MARANTZ_TOL_DIV && buf[i] < IR_MARANTZ_HALF_BIT + IR_MARANTZ_HALF_BIT/IR_MARANTZ_TOL_DIV) {
             halfbitscnt += 1;
         } else if (buf[i] > IR_MARANTZ_BIT - IR_MARANTZ_BIT/IR_MARANTZ_TOL_DIV && buf[i] < IR_MARANTZ_BIT + IR_MARANTZ_BIT/IR_MARANTZ_TOL_DIV) {
             halfbitscnt += 2;
         } else if (buf[i] > IR_MARANTZ_BIT - IR_MARANTZ_BIT/IR_MARANTZ_TOL_DIV && buf[i] < 5*IR_MARANTZ_HALF_BIT + IR_MARANTZ_BIT/IR_MARANTZ_TOL_DIV) {
             halfbitscnt += 1; //It seems to work, not entirely sure of the purpose of this long zero though.
         } else {
             return IR_NOT_CORRECT_DATA;
         }
     }
     proto->protocol=IR_PROTO_MARANTZ;
     proto->timeout=IR_MARANTZ_TIMEOUT;
     proto->data = rawbits&0x0001ffff;
     return IR_OK;
+}
 #endif
 /**
  * Expand data from Marantz. Written by Martin Nordin
+ *
  * @param buf
  *      Pointer to buffer to store the expanded data
  * @param len
  *      Pointer to length of the data
  * @param proto
  *      Pointer to protocol information
  * @return
  *      IR_OK if data expanded successfully, one of several errormessages if not
     for(uint8_t i = 0; i < 17; i++) {
         tempdata = (uint32_t)tempdata<<1;
         if (((uint32_t)tempdata>>31)==1){
             if (previousBit == 1){//11
                 buf[*len] = IR_MARANTZ_HALF_BIT;
                 buf[*len+1] = IR_MARANTZ_HALF_BIT;
                 *len = *len + 2;
             } else {//01
                 buf[*len-1] = IR_MARANTZ_BIT;
                 buf[*len] = IR_MARANTZ_HALF_BIT;
 int8_t parsePanasonic(const uint16_t *buf, uint8_t len, Ir_Protocol_Data_t *proto) {
     /* parse buf[], max is len */
     /* check if we have correct amount of data */
     if (len != 99) {
         return IR_NOT_CORRECT_DATA;
     }
     /* check startbit */
     if (buf[0] > IR_PANA_ST_BIT + IR_PANA_ST_BIT/IR_PANA_TOL_DIV || buf[0] < IR_PANA_ST_BIT - IR_PANA_ST_BIT/IR_PANA_TOL_DIV) {
         return IR_NOT_CORRECT_DATA;
     }
     /* check pause after startbit */
     if (buf[1] > IR_PANA_ST_PAUSE + IR_PANA_ST_PAUSE/IR_PANA_TOL_DIV || buf[1] < IR_PANA_ST_PAUSE - IR_PANA_ST_PAUSE/IR_PANA_TOL_DIV) {
         return IR_NOT_CORRECT_DATA;
+    }
+    }
     proto->protocol=IR_PROTO_PANASONIC;
     proto->timeout=IR_PANA_TIMEOUT;
     proto->data=rawbits;
     return IR_OK;
+}
 #endif
 /**
  * Expand data from Panasonic protocol
  *      Pointer to length of the data
  * @param proto
  *      Pointer to protocol information
  * @return
  *      IR_OK if data expanded successfully, one of several errormessages if not
  */
 int8_t expandPanasonic(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     /* Set up startbit */
     buf[0] = IR_PANA_ST_BIT;
     buf[1] = IR_PANA_ST_PAUSE;
         if ((i&1) == 1) {       /* if odd, ir-pause */
             if ((staticBits>>(i>>1))&1) {
                 buf[i+2] = IR_PANA_LOW_ONE;
             } else {
                 buf[i+2] = IR_PANA_LOW_ZERO;
             }
         } else {                /* if even, ir-bit */
             buf[i+2] = IR_PANA_HIGH;
+        }
+    }
 #if (IR_PROTOCOLS_USE_SKY)
 /**
  * Test data on Sky protocol
+ *
  *
  * @param buf
  *      Pointer to buffer to where to data to parse is stored
  * @param len
  *      Length of the data
  * @param proto
 #define SKYSHORT 1
     for (uint8_t i = 1; i < len; i++)
+    {
         if (buf[i] > IR_SKY_SHORT - IR_SKY_SHORT/IR_SKY_TOL_DIV && buf[i] < IR_SKY_SHORT + IR_SKY_SHORT/IR_SKY_TOL_DIV) {
             current = SKYSHORT;
         }
         else if (buf[i] > IR_SKY_LONG - IR_SKY_LONG/IR_SKY_TOL_DIV && buf[i] < IR_SKY_LONG + IR_SKY_LONG/IR_SKY_TOL_DIV) {
             current = SKYLONG;
         }
         else {
             return IR_NOT_CORRECT_DATA;
+        }
         /* if level is low */
         if ((rawbits&1)==0) {
             /* and there is a long pulse */
             if (current == SKYLONG) {
                 /* push a one */
                 rawbits = rawbits<<1;
                 rawbits |= 1;
                 cnt = 0;
+            }
             else if (cnt == 0) {
                 cnt=1;
                 /* push a zero */
                 rawbits = rawbits<<1;
+ *
  * @param buf
  *      Pointer to buffer to store the expanded data
  * @param len
  *      Pointer to length of the data
  * @param proto
  *      Pointer to protocol information
  * @return
  *      IR_OK if data expanded successfully, one of several errormessages if not
  */
 int8_t expandSky(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     //TODO: Implement this function.
  *      Pointer to protocol information
  * @return
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
-int8_t parseNexa2(const uint16_t *buf, uint8_t len, Ir_Protocol_Data_t *proto) {
+int8_t parseNexa2(const uint16_t *buf, uint8_t len, uint8_t index, Ir_Protocol_Data_t *proto)
+{
     /* check if we have correct amount of data */
     if (len < 132) {
         return IR_NOT_CORRECT_DATA;
+    }
+    uint8_t i;
+#if IR_RX_CONTINUOUS_MODE==0
+    i = 0;
+#else
+    i=index-132;
+    if (i>index)
+        i+=MAX_NR_TIMES;
+#endif
-    if ((buf[len-132] < IR_NEXA2_START1 - IR_NEXA2_START1/IR_NEXA2_TOL_DIV) || (buf[len-132] > IR_NEXA2_START1 + IR_NEXA2_START1/IR_NEXA2_TOL_DIV)) { //check start bit
+    if ((buf[i] < IR_NEXA2_START1 - IR_NEXA2_START1/IR_NEXA2_TOL_DIV) || (buf[i] > IR_NEXA2_START1 + IR_NEXA2_START1/IR_NEXA2_TOL_DIV)) { //check start bit
         return IR_NOT_CORRECT_DATA;
     }
+#if IR_RX_CONTINUOUS_MODE==0
+    i = 1;
+#else
+    i=index-131;
+    if (i>index)
+        i+=MAX_NR_TIMES;
+#endif
-    if ((buf[len-131] < IR_NEXA2_HIGH - IR_NEXA2_HIGH/IR_NEXA2_TOL_DIV) || (buf[len-131] > IR_NEXA2_HIGH + IR_NEXA2_HIGH/IR_NEXA2_TOL_DIV)) { //check start bit
+    if ((buf[i] < IR_NEXA2_HIGH - IR_NEXA2_HIGH/IR_NEXA2_TOL_DIV) || (buf[i] > IR_NEXA2_HIGH + IR_NEXA2_HIGH/IR_NEXA2_TOL_DIV)) { //check start bit
         return IR_NOT_CORRECT_DATA;
+    }
+#if IR_RX_CONTINUOUS_MODE==0
+    i = 2;
+#else
+    i=index-130;
+    if (i>index)
+        i+=MAX_NR_TIMES;
+#endif
-    if ((buf[len-130] < IR_NEXA2_START2 - IR_NEXA2_START2/IR_NEXA2_TOL_DIV) || (buf[len-130] > IR_NEXA2_START2 + IR_NEXA2_START2/IR_NEXA2_TOL_DIV)) { //check start bit
+    if ((buf[i] < IR_NEXA2_START2 - IR_NEXA2_START2/IR_NEXA2_TOL_DIV) || (buf[i] > IR_NEXA2_START2 + IR_NEXA2_START2/IR_NEXA2_TOL_DIV)) { //check start bit
         return IR_NOT_CORRECT_DATA;
+    }
     /* Incoming data could actually be longer than 32bits when a dimming command is received */
     uint64_t rawbitsTemp = 0;
     uint8_t bitCounter = 0;
+    uint8_t i2;
-    for (uint8_t i = len-129; i < len; i++) {
+    for (i = 3; i < 132; i++) {
+#if IR_RX_CONTINUOUS_MODE==0
+        i2 = i;
+#else
+        i2=index-(132-i);
+        if (i2>index)
+            i2+=MAX_NR_TIMES;
+#endif
         if ((i&1) == 0) {       /* if even, data */
             /* check length of transmit pulse */
-            if (buf[i] > IR_NEXA2_LOW_ONE - IR_NEXA2_LOW_ONE/IR_NEXA2_TOL_DIV && buf[i] < IR_NEXA2_LOW_ONE + IR_NEXA2_LOW_ONE/IR_NEXA2_TOL_DIV) {
+            if ((buf[i2] > IR_NEXA2_LOW_ONE - IR_NEXA2_LOW_ONE/IR_NEXA2_TOL_DIV) && (buf[i2] < IR_NEXA2_LOW_ONE + IR_NEXA2_LOW_ONE/IR_NEXA2_TOL_DIV)) {
                 /* write a one */
                 rawbitsTemp |= (1UL)<<(bitCounter++);
-            } else if (buf[i] > IR_NEXA2_LOW_ZERO - IR_NEXA2_LOW_ZERO/IR_NEXA2_TOL_DIV && buf[i] < IR_NEXA2_LOW_ZERO + IR_NEXA2_LOW_ZERO/IR_NEXA2_TOL_DIV) {
+            } else if ((buf[i2] > IR_NEXA2_LOW_ZERO - IR_NEXA2_LOW_ZERO/IR_NEXA2_TOL_DIV) && (buf[i2] < IR_NEXA2_LOW_ZERO + IR_NEXA2_LOW_ZERO/IR_NEXA2_TOL_DIV)) {
                 /* do nothing, a zero is already in rawbits */
                 bitCounter++;
             } else {
                 return IR_NOT_CORRECT_DATA;
+            }
             i+=2;   // skip every other bit, implement check here in the future
         } else {            /* if odd, no data */
-            if (buf[i] < IR_NEXA2_HIGH - IR_NEXA2_HIGH/IR_NEXA2_TOL_DIV && buf[i] > IR_NEXA2_HIGH + IR_NEXA2_HIGH/IR_NEXA2_TOL_DIV) {
+            if ((buf[i2] < IR_NEXA2_HIGH - IR_NEXA2_HIGH/IR_NEXA2_TOL_DIV) && (buf[i2] > IR_NEXA2_HIGH + IR_NEXA2_HIGH/IR_NEXA2_TOL_DIV)) {
                 return IR_NOT_CORRECT_DATA;
+            }
+        }
+    }
  * @param proto
  *      Pointer to protocol information
  * @return
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
-int8_t parseNexa1(const uint16_t *buf, uint8_t len, Ir_Protocol_Data_t *proto) {
+int8_t parseNexa1(const uint16_t *buf, uint8_t len, uint8_t index, Ir_Protocol_Data_t *proto) {
     /* parse buf[], max is len */
     /* check if we have correct amount of data */
     if (len != 50) {
         return IR_NOT_CORRECT_DATA;

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/avr-lib/drivers/ir/protocols.c – Rev 2198 → 2199