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

 #if (IR_PROTOCOLS_USE_NEXA2)
     if (parseNexa2(buf, len, index, proto)==IR_OK) return IR_OK;
 #endif
 #if (IR_PROTOCOLS_USE_NEXA1)
     if (parseNexa1(buf, len, index, proto)==IR_OK) return IR_OK;
+#endif
+#if (IR_PROTOCOLS_USE_VIKING)
+    if (parseViking(buf, len, index, proto)==IR_OK) return IR_OK;
 #endif
     /* No protocol matched. */
     proto->protocol = IR_PROTO_UNKNOWN;
     return IR_NOT_CORRECT_DATA;
+}
 #if (IR_PROTOCOLS_USE_SHARP)
 /**
  * Test data on SHARP protocol
  * http://www.sbprojects.com/knowledge/ir/sharp.htm
  *
  * @param buf
  *      Pointer to buffer to where to data to parse is stored
  * @param len
  *      Length of the data
  * @param proto
 int8_t parseSharp(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 != 31) {
         return IR_NOT_CORRECT_DATA;
     }
     uint16_t rawbits=0;
     for (uint8_t i = 1; i < len; i++) {
         if ((i&1) == 1) {       /* if odd, ir-pause */
             /* check length of pause between bits */
                 /* write a one */
                 rawbits |= 1<<((i-1)>>1);
             } else if (buf[i] > IR_SHARP_LOW_ZERO - IR_SHARP_LOW_ZERO/IR_SHARP_TOL_DIV && buf[i] < IR_SHARP_LOW_ZERO + IR_SHARP_LOW_ZERO/IR_SHARP_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_SHARP_HIGH + IR_SHARP_HIGH/IR_SHARP_TOL_DIV || buf[i] < IR_SHARP_HIGH - IR_SHARP_HIGH/IR_SHARP_TOL_DIV) {
                 return IR_NOT_CORRECT_DATA;
             }
+        }
+    }
     proto->protocol=IR_PROTO_SHARP;
     proto->timeout=IR_SHARP_TIMEOUT;
 #endif
 /**
  * Expand data from Sharp protocol
  * http://www.sbprojects.com/knowledge/ir/sharp.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 expandSharp(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     //TODO: Implement this function.
     return IR_NOT_CORRECT_DATA;
+}
 #if (IR_PROTOCOLS_USE_NEC)
 /**
  * Test data on NEC protocol
  * 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
 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++) {
             if ((i&1) == 1) {       /* if odd, ir-pause */
                 if ((proto->data>>(i>>1))&1) {
                     buf[i+2] = IR_NEC_LOW_ONE;
                 } else {
                     buf[i+2] = IR_NEC_LOW_ZERO;
+                }
             } else {            /* if even, ir-bit */
                 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
  *      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.
     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
  * http://pastebin.com/PJX3bRAs
     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[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;
     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[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
                 rawbitsTemp |= (1UL)<<(bitCounter++);
             } 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[i2] < IR_NEXA2_HIGH - IR_NEXA2_HIGH/IR_NEXA2_TOL_DIV) && (buf[i2] > 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;
+            }
+        }
     }
     proto->protocol=IR_PROTO_NEXA2;
     proto->timeout=IR_NEXA2_TIMEOUT;
     proto->data=rawbitsTemp;
     return IR_OK;
+}
 #endif
 /**
  * Expand data from Nexa2 protocol
+ *
     proto->timeout = IR_NEXA1_START/1000;
     proto->repeats = IR_NEXA1_REPS;
     return IR_OK;
+}
+#if (IR_PROTOCOLS_USE_VIKING)
+/**
+ * Test data on Viking temperature sensor 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 parseViking(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 < 94) {
+        return IR_NOT_CORRECT_DATA;
+    }
+    uint8_t i, i2;
+    uint32_t rawbitsTemp = 0;
+    uint8_t bitCounter = 0;
+    for (i = 0; i < 94; i++) {
+#if IR_RX_CONTINUOUS_MODE==0
+        i2 = i;
+#else
+        i2=index-(94-i);
+        if (i2>index)
+            i2+=MAX_NR_TIMES;
+#endif
+        if ((i&1) == 0)
+        {       /* if even, no data */
+            if ((buf[i2] < IR_VIKING_LOW - IR_VIKING_LOW/IR_VIKING_TOL_DIV) || (buf[i2] > IR_VIKING_LOW + IR_VIKING_LOW/IR_VIKING_TOL_DIV))
+            {
+                return IR_NOT_CORRECT_DATA;
+            }
+        }
+        else
+        {           /* if odd, data */
+            /* check length of transmit pulse */
+            if ((buf[i2] > IR_VIKING_HIGH_ONE - IR_VIKING_HIGH_ONE/IR_VIKING_TOL_DIV) && (buf[i2] < IR_VIKING_HIGH_ONE + IR_VIKING_HIGH_ONE/IR_VIKING_TOL_DIV))
+            {
+                /* write a one */
+                rawbitsTemp |= (1UL)<<(bitCounter++);
+            }
+            else if ((buf[i2] > IR_VIKING_HIGH_ZERO - IR_VIKING_HIGH_ZERO/IR_VIKING_TOL_DIV) && (buf[i2] < IR_VIKING_HIGH_ZERO + IR_VIKING_HIGH_ZERO/IR_VIKING_TOL_DIV))
+            {
+                /* do nothing, a zero is already in rawbits */
+                bitCounter++;
+            }
+            else
+            {
+                return IR_NOT_CORRECT_DATA;
+            }
+        }
+    }
+    proto->protocol=IR_PROTO_VIKING;
+    proto->timeout=0;
+    proto->data=rawbitsTemp;
+    return IR_OK;
+}
+#endif

Subversion Repositories HomeAutomation

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