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

 #if (IR_PROTOCOLS_USE_SKY)
     if (parseSky(buf, len, proto)==IR_OK) return IR_OK;
 #endif
 #if (IR_PROTOCOLS_USE_NEXA2)
     if (parseNexa2(buf, len, proto)==IR_OK) return IR_OK;
+#endif
+#if (IR_PROTOCOLS_USE_NEXA1)
+    if (parseNexa1(buf, len, proto)==IR_OK) return IR_OK;
 #endif
     /* No protocol matched. */
     proto->protocol = IR_PROTO_UNKNOWN;
     return IR_NOT_CORRECT_DATA;
+}
         return expandPanasonic(buf, len, proto);
     case IR_PROTO_SKY:
         return expandSky(buf, len, proto);
     case IR_PROTO_NEXA2:
         return expandNexa2(buf, len, proto);
+    case IR_PROTO_NEXA1:
+        return expandNexa1(buf, len, proto);
+    }
     /* Invalid protocol specified. */
     return IR_NOT_CORRECT_DATA;
+}
     for (uint8_t i = 1; i < len; i++) {
         if ((i&1) == 1) {       /* if odd, ir-pause */
             /* check length of pause between bits */
             if (buf[i] > IR_SIRC_LOW + IR_SIRC_LOW/IR_SIRC_TOL_DIV || buf[i] < IR_SIRC_LOW - IR_SIRC_LOW/IR_SIRC_TOL_DIV) {
                 return IR_NOT_CORRECT_DATA;
             }
         } else {            /* if even, ir-bit */
             if (buf[i] > IR_SIRC_HIGH_ONE - IR_SIRC_HIGH_ONE/IR_SIRC_TOL_DIV && buf[i] < IR_SIRC_HIGH_ONE + IR_SIRC_HIGH_ONE/IR_SIRC_TOL_DIV) {
                 /* write a one */
                 rawbits |= 1<<((i-2)>>1);
             } else if (buf[i] > IR_SIRC_HIGH_ZERO - IR_SIRC_HIGH_ZERO/IR_SIRC_TOL_DIV && buf[i] < IR_SIRC_HIGH_ZERO + IR_SIRC_HIGH_ZERO/IR_SIRC_TOL_DIV) {
+    }
     proto->protocol = IR_PROTO_SIRC;
     proto->timeout = IR_SIRC_TIMEOUT;
     proto->data = rawbits;
     return IR_OK;
+}
 #endif
 /**
           *len = 31;
+        }
         for (uint8_t i = 0; i < *len-2; i++) {
           if ((i&1) == 1) {     /* if odd, ir-pause */
             buf[i+2] = IR_SIRC_LOW;
           } else {          /* if even, ir-bit */
             if ((proto->data>>(i>>1))&1) {
               buf[i+2] = IR_SIRC_HIGH_ONE;
             } else {
               buf[i+2] = IR_SIRC_HIGH_ZERO;
+            }
  *      Pointer to protocol information
  * @return
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
 int8_t parseNEC(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_NEC_ST_BIT + IR_NEC_ST_BIT/IR_NEC_TOL_DIV || buf[0] < IR_NEC_ST_BIT - IR_NEC_ST_BIT/IR_NEC_TOL_DIV) {
         return IR_NOT_CORRECT_DATA;
     }
     /* check pause after startbit */
     if (buf[1] > IR_NEC_ST_PAUSE + IR_NEC_ST_PAUSE/IR_NEC_TOL_DIV || buf[1] < IR_NEC_ST_PAUSE - IR_NEC_ST_PAUSE/IR_NEC_TOL_DIV) {
         return IR_NOT_CORRECT_DATA;
+    }
     uint32_t rawbits = 0;
     for (uint8_t i = 3; i < len; i++) {
         if ((i&1) == 1) {       /* if odd, ir-pause */
             /* check length of pause between bits */
             if (buf[i] > IR_NEC_LOW_ONE - IR_NEC_LOW_ONE/IR_NEC_TOL_DIV && buf[i] < IR_NEC_LOW_ONE + IR_NEC_LOW_ONE/IR_NEC_TOL_DIV) {
                 /* write a one */
                 rawbits |= 1UL<<((i-3)>>1);
             } else if (buf[i] > IR_NEC_LOW_ZERO - IR_NEC_LOW_ZERO/IR_NEC_TOL_DIV && buf[i] < IR_NEC_LOW_ZERO + IR_NEC_LOW_ZERO/IR_NEC_TOL_DIV) {
                 /* do nothing, a zero is already in place */
             } else {
                 return IR_NOT_CORRECT_DATA;
+            }
         } else {            /* if even, ir-bit */
             if (buf[i] > IR_NEC_HIGH + IR_NEC_HIGH/IR_NEC_TOL_DIV || buf[i] < IR_NEC_HIGH - IR_NEC_HIGH/IR_NEC_TOL_DIV) {
                 return IR_NOT_CORRECT_DATA;
+            }
+        }
     }
     proto->protocol=IR_PROTO_NEC;
     proto->timeout=IR_NEC_TIMEOUT;
     proto->data=rawbits;
     return IR_OK;
+}
 #endif
 /**
  * Expand data from NEC protocol
  * http://www.sbprojects.com/knowledge/ir/nec.htm
+ *
  * @param buf
  *      Pointer to buffer to store the expanded data
  *      IR_OK if data expanded successfully, one of several errormessages if not
  */
 int8_t expandNEC(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     /* Set up startbit */
     buf[0] = IR_NEC_ST_BIT;
     if (proto->framecnt == 0) {
         buf[1] = IR_NEC_ST_PAUSE;
         *len = 67;
         for (uint8_t i = 0; i < 65; i++) {
             /* check length of pause between bits */
             if (buf[i] > IR_SAMS_LOW_ONE - IR_SAMS_LOW_ONE/IR_SAMS_TOL_DIV && buf[i] < IR_SAMS_LOW_ONE + IR_SAMS_LOW_ONE/IR_SAMS_TOL_DIV) {
                 /* write a one */
                 rawbits |= 1UL<<((i-3)>>1);
             } else if (buf[i] > IR_SAMS_LOW_ZERO - IR_SAMS_LOW_ZERO/IR_SAMS_TOL_DIV && buf[i] < IR_SAMS_LOW_ZERO + IR_SAMS_LOW_ZERO/IR_SAMS_TOL_DIV) {
                 /* do nothing, a zero is already in rawbits */
             } else {
                 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;
+}
 /**
  * Expand data from 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 store the expanded data
  * @param len
  *      Pointer to length of the data
  * @param proto
  *      Pointer to protocol information
  * @return
     *len = 67;
     proto->modfreq=IR_SAMS_F_MOD;
     proto->timeout=IR_SAMS_TIMEOUT;
     proto->repeats=IR_SAMS_REPS;
     return IR_OK;
 }
 #if (IR_PROTOCOLS_USE_MARANTZ)
 /**
  * Test data on Marantz protocol
  * Reverse-Engineered by Noddan, very similar to RC-5.
  * Not tested with odd adresses since I have no remote that sends them.
  *      Length of the data
  * @param proto
  *      Pointer to protocol information
  * @return
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
 int8_t parseMarantz(const uint16_t *buf, uint8_t len, Ir_Protocol_Data_t *proto) {
     uint8_t halfbitscnt = 1;
     uint32_t rawbits = 0;
     for (uint8_t i = 0; i<len; i++) {
     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
  *      IR_OK if data expanded successfully, one of several errormessages if not
  */
 int8_t expandMarantz(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     uint8_t previousBit;
     uint32_t tempdata;
     /* Set up startbits */
     buf[0] = IR_MARANTZ_HALF_BIT;//first start bit
     buf[1] = IR_MARANTZ_HALF_BIT;
     buf[2] = IR_MARANTZ_HALF_BIT;//second start bit
     //TODO: Toggle bit should be better, not hard-coded
     buf[3] = IR_MARANTZ_HALF_BIT;
     buf[4] = IR_MARANTZ_HALF_BIT;//toggle bit
     *len=5;
     previousBit = 1;
     tempdata = (uint32_t)(proto->data)<<14;
     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;
                 *len = *len + 1;
+            }
             previousBit = 1;
         } else {
             if (previousBit == 1){//10
                 buf[*len-1] = IR_MARANTZ_BIT;
                 buf[*len] = IR_MARANTZ_HALF_BIT;
                 *len = *len + 1;
             } else {//00
                 buf[*len] = IR_MARANTZ_HALF_BIT;
                 if (i==4){
                     buf[*len+1] = IR_MARANTZ_HALF_BIT*5;
             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;
         }
+    }
     /* then add the value bits */
     for (uint8_t i = 0; i < 65; i++) {
         if ((i&1) == 1) {       /* if odd, ir-pause */
                 buf[i+2+32] = IR_PANA_LOW_ZERO;
+            }
         } else {                /* if even, ir-bit */
             buf[i+2+32] = IR_PANA_HIGH;
+        }
     }
     *len = 99;
     proto->modfreq=IR_PANA_F_MOD;
     proto->timeout=IR_PANA_TIMEOUT;
     proto->repeats=IR_PANA_REPS;
+}
 #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
  *      Pointer to protocol information
 int8_t parseSky(const uint16_t *buf, uint8_t len, Ir_Protocol_Data_t *proto) {
     /* parse buf[], max is len */
     /* check startbit */
     if (buf[0] > IR_SKY_ST_BIT + IR_SKY_ST_BIT/IR_SKY_TOL_DIV || buf[0] < IR_SKY_ST_BIT - IR_SKY_ST_BIT/IR_SKY_TOL_DIV) {
         return IR_NOT_CORRECT_DATA;
     }
     uint32_t rawbits=0;
     uint8_t current=0;
     uint8_t previous=0;
     uint8_t cnt=0;
 #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;
+            }
             else {
                 cnt = 0;
+            }
                 rawbits = rawbits<<1;
                 rawbits |= 1;
+            }
             else {
                 cnt = 0;
             }
         }
         previous=current;
     }
     proto->protocol = IR_PROTO_SKY;
     proto->timeout = IR_SKY_TIMEOUT;
     proto->data = rawbits;
+}
 #endif
 /**
  * Expand data from Sky protocol
  *
  *
  * @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
  */
 int8_t expandSky(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     //TODO: Implement this function.
     buf[0] = IR_SKY_ST_BIT;
     buf[1] = IR_SKY_LONG;   //
     return IR_NOT_CORRECT_DATA;
 }
 #if (IR_PROTOCOLS_USE_NEXA2)
 /**
  * Test data on NEXA protocol
  * http://elektronikforumet.com/wiki/index.php?title=RF_Protokoll_-_Nexa_sj%C3%A4lvl%C3%A4rande
+ *
  *      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) {
     /* parse buf[], max is len */
     /* check if we have correct amount of data */
     if (len != 148 && len != 132) {
         return IR_NOT_CORRECT_DATA;
     }
     if (buf[0] < IR_NEXA2_START1 - IR_NEXA2_START1/IR_NEXA2_TOL_DIV && buf[0] > IR_NEXA2_START1 + IR_NEXA2_START1/IR_NEXA2_TOL_DIV) { //check start bit
         return IR_NOT_CORRECT_DATA;
+    }
     if (buf[1] < IR_NEXA2_HIGH - IR_NEXA2_HIGH/IR_NEXA2_TOL_DIV && buf[1] > IR_NEXA2_HIGH + IR_NEXA2_HIGH/IR_NEXA2_TOL_DIV) { //check start bit
         return IR_NOT_CORRECT_DATA;
+    }
     if (buf[2] < IR_NEXA2_START2 - IR_NEXA2_START2/IR_NEXA2_TOL_DIV && buf[2] > 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 */
     uint32_t rawbitsTemp = 0;
     uint8_t bitCounter = 0;
     for (uint8_t i = 3; i < len; i++) {
         if ((i&1) == 0) {       /* if even, 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) {
                 return IR_NOT_CORRECT_DATA;
+            }
+        }
+    }
-//gpio_set_pin(EXP_H);
     proto->protocol=IR_PROTO_NEXA2;
     proto->timeout=IR_NEXA2_TIMEOUT;
     proto->data=rawbitsTemp;
     return IR_OK;
  * @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) {
     /* parse buf[], max is len */
+//gpio_set_pin(EXP_H);
     /* check if we have correct amount of data */
     if (len != 50) {
         return IR_NOT_CORRECT_DATA;
     }
+    if (buf[0] < IR_NEXA1_START - IR_NEXA1_START/IR_NEXA1_TOL_DIV && buf[0] > IR_NEXA1_START + IR_NEXA1_START/IR_NEXA1_TOL_DIV) { //check start bit
+        return IR_NOT_CORRECT_DATA;
+    }
     uint32_t rawbitsTemp = 0;
+    uint8_t bitCounter = 0;
+    for (uint8_t i = 1; i < len; i+=4) {
+        /* Check if '0' bit */
+        if (
+            (buf[i+0] > IR_NEXA1_SHORT - IR_NEXA1_SHORT/IR_NEXA1_TOL_DIV && buf[i+0] < IR_NEXA1_SHORT + IR_NEXA1_SHORT/IR_NEXA1_TOL_DIV) &&
+            (buf[i+1] > IR_NEXA1_LONG - IR_NEXA1_LONG/IR_NEXA1_TOL_DIV && buf[i+1] < IR_NEXA1_LONG + IR_NEXA1_LONG/IR_NEXA1_TOL_DIV) &&
+            (buf[i+2] > IR_NEXA1_SHORT - IR_NEXA1_SHORT/IR_NEXA1_TOL_DIV && buf[i+2] < IR_NEXA1_SHORT + IR_NEXA1_SHORT/IR_NEXA1_TOL_DIV) &&
+            (buf[i+3] > IR_NEXA1_LONG - IR_NEXA1_LONG/IR_NEXA1_TOL_DIV && buf[i+3] < IR_NEXA1_LONG + IR_NEXA1_LONG/IR_NEXA1_TOL_DIV))
+        {
+            /* write a one */
+            rawbitsTemp |= (1UL)<<(bitCounter++);
+        }
+        /* Check if 'X' bit */
+        else if (
+            (buf[i+0] > IR_NEXA1_SHORT - IR_NEXA1_SHORT/IR_NEXA1_TOL_DIV && buf[i+0] < IR_NEXA1_SHORT + IR_NEXA1_SHORT/IR_NEXA1_TOL_DIV) &&
+            (buf[i+1] > IR_NEXA1_LONG - IR_NEXA1_LONG/IR_NEXA1_TOL_DIV && buf[i+1] < IR_NEXA1_LONG + IR_NEXA1_LONG/IR_NEXA1_TOL_DIV) &&
+            (buf[i+2] > IR_NEXA1_LONG - IR_NEXA1_LONG/IR_NEXA1_TOL_DIV && buf[i+2] < IR_NEXA1_LONG + IR_NEXA1_LONG/IR_NEXA1_TOL_DIV) &&
+            (buf[i+3] > IR_NEXA1_SHORT - IR_NEXA1_SHORT/IR_NEXA1_TOL_DIV && buf[i+3] < IR_NEXA1_SHORT + IR_NEXA1_SHORT/IR_NEXA1_TOL_DIV))
+        {
+            /* do nothing, a zero is already in rawbits */
+            bitCounter++;
+        }
+    }
     proto->protocol=IR_PROTO_NEXA1;
     proto->timeout=IR_NEXA1_TIMEOUT;
     proto->data=rawbitsTemp;
     return IR_OK;

Subversion Repositories HomeAutomation

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