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

 #if (IR_PROTOCOLS_USE_PANASONIC)
     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
+#if (IR_PROTOCOLS_USE_NEXA2)
+    if (parseNexa2(buf, len, proto)==IR_OK) return IR_OK;
 #endif
     /* No protocol matched. */
     proto->protocol = IR_PROTO_UNKNOWN;
     return IR_NOT_CORRECT_DATA;
 }
 int8_t parseHash(const uint16_t *buf, uint8_t len, Ir_Protocol_Data_t *proto) {
     //TODO: Transform the buffer in some clever way to a 32 bit word. */
     proto->protocol = IR_PROTO_HASH;
     proto->timeout = 200;
     proto->data = 0;
     return 0;
 }
 int8_t expandProtocol(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     /* Call the expand function for the specified protocol. */
     switch (proto->protocol) {
     case IR_PROTO_SIRC:
         return expandSIRC(buf, len, proto);
+}
 #if (IR_PROTOCOLS_USE_SIRC)
 /**
  * Test data on SIRC protocol, 12-bit version
  * http://www.sbprojects.com/knowledge/ir/sirc.htm
+ *
  * @param buf
  *      Pointer to buffer to where to data to parse is stored
  * @param len
  *      Length of the data
  * @return
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
 int8_t parseSIRC(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 != 25) {
         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;
  *      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) {
     //TODO: Implement this function.
     buf[0] = IR_SIRC_ST_BIT;
     buf[1] = IR_SIRC_LOW;//start pulse finished
     return IR_NOT_CORRECT_DATA;
+}
 #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;
+    }
         } 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;
+            }
         } else {                /* if even, ir-bit */
             buf[i+2] = IR_SAMS_HIGH;
+        }
+    }
     *len = 67;
     proto->modfreq=(((F_CPU/2000)/IR_SAMS_F_MOD) -1);
     proto->timeout=IR_SAMS_TIMEOUT;
     proto->repeats=IR_SAMS_REPS;
  * @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++) {
         //halfbitscnt&1==1 in the middle of bits
         //i&1==0 positive flank
+    }
     proto->protocol=IR_PROTO_MARANTZ;
     proto->timeout=IR_MARANTZ_TIMEOUT;
     proto->data = rawbits&0x0001ffff;
     return IR_OK;
+}
 #endif
 /**
+ *
  * @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 expandMarantz(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     uint8_t previousBit;
     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;
+}
 #if (IR_PROTOCOLS_USE_PANASONIC)
 /**
  * Test data on Panasonic 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
  * @return
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
 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;
                 return IR_NOT_CORRECT_DATA;
+            }
         } else {            /* if even, ir-bit */
             if (buf[i] > IR_PANA_HIGH + IR_PANA_HIGH/IR_PANA_TOL_DIV || buf[i] < IR_PANA_HIGH - IR_PANA_HIGH/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;
+}
+}
 #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
  * @return
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
 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 SKYLONG 0
 #define SKYSHORT 1
         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;
+            }
     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
+ *
+ * @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
+ *      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 != 146 || len != 130) {
+        return IR_NOT_CORRECT_DATA;
+    }
+    uint32_t rawbits = 0;
+    uint64_t rawbitsTemp = 0;
+    if (buf[1] < IR_NEXA2_START - IR_NEXA2_START/IR_NEXA2_TOL_DIV && buf[1] > IR_NEXA2_START + IR_NEXA2_START/IR_NEXA2_TOL_DIV) { //check start bit
+        return IR_NOT_CORRECT_DATA;
+    }
+      uint8_t bitCounter = 0;
+    for (uint8_t i = 2; i < len; i++) { //Skip first bit
+        if ((i&1) == 1) {       /* if odd, ir-pause */
+            /* check length of pause between bits */
+            if (buf[1] > IR_NEXA2_LOW_ONE - IR_NEXA2_LOW_ONE/IR_NEXA2_TOL_DIV && buf[1] < IR_NEXA2_LOW_ONE + IR_NEXA2_LOW_ONE/IR_NEXA2_TOL_DIV) {
+                /* write a one */
+                rawbitsTemp |= 1<<(bitCounter++);
+            } else if (buf[1] > IR_NEXA2_LOW_ZERO - IR_NEXA2_LOW_ZERO/IR_NEXA2_TOL_DIV && buf[1] < 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 even, ir-bit */
+            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) {
+                return IR_NOT_CORRECT_DATA;
+            }
+        }
+    }
+    rawbits = (uint32_t) (0xffff & rawbitsTemp);
+    proto->protocol=IR_PROTO_NEXA2;
+    proto->timeout=IR_NEXA2_TIMEOUT;
+    proto->data=rawbits;
+    return IR_OK;
+}
+#endif

Subversion Repositories HomeAutomation

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