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

 #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
+#if (IR_PROTOCOLS_USE_VIKING_STEAK)
+    if (parseVikingSteak(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_SIRC)
 /**
  * Test data on SIRC protocol, 12-bit version
  * http://www.sbprojects.com/knowledge/ir/sirc.htm
  * http://picprojects.org.uk/projects/sirc/sonysirc.pdf
  *
  * @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 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.
            supporting two versions of SIRC:
 bit = 25, 15 bit = 31
            there is also a 20 bit protocol, but we don't support it
          */
         return IR_NOT_CORRECT_DATA;
+    }
     /* check startbit */
     if (buf[0] > IR_SIRC_ST_BIT + IR_SIRC_ST_BIT/IR_SIRC_TOL_DIV || buf[0] < IR_SIRC_ST_BIT - IR_SIRC_ST_BIT/IR_SIRC_TOL_DIV) {
         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 */
             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) {
                 /* 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
 /**
+ *
  * @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) {
 #if (IR_PROTOCOLS_USE_RC5)
 /**
  * Test data on RC5 protocol
  * http://www.sbprojects.com/knowledge/ir/rc5.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
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
 int8_t parseRC5(const uint16_t *buf, uint8_t len, Ir_Protocol_Data_t *proto) {
     uint8_t halfbitscnt = 1;
     uint16_t rawbits = 0;
 #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
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
 int8_t parseSamsung(const uint16_t *buf, uint8_t len, Ir_Protocol_Data_t *proto) {
     /* parse buf[], max is len */
     *len = 99;
     proto->modfreq=IR_PANA_F_MOD;
     proto->timeout=IR_PANA_TIMEOUT;
     proto->repeats=IR_PANA_REPS;
     return IR_OK;
 }
 #if (IR_PROTOCOLS_USE_SKY)
 /**
  * Test data on Sky protocol
+ *
         uint8_t i2;
 #if IR_RX_CONTINUOUS_MODE==0
         i2 = i;
 #else
         i2=index-(50-i);
         if (i2>index)
             i2+=MAX_NR_TIMES;
 #endif
         /* Check if '0' bit */
         if (
             (buf[i2+0] > IR_NEXA1_SHORT - IR_NEXA1_SHORT/IR_NEXA1_TOL_DIV) && (buf[i2+0] < IR_NEXA1_SHORT + IR_NEXA1_SHORT/IR_NEXA1_TOL_DIV) &&
             (buf[i2+1] > IR_NEXA1_LONG  - IR_NEXA1_LONG /IR_NEXA1_TOL_DIV) && (buf[i2+1] < IR_NEXA1_LONG  + IR_NEXA1_LONG /IR_NEXA1_TOL_DIV) &&
         return IR_NOT_CORRECT_DATA;
+    }
     proto->protocol=IR_PROTO_NEXA1;
     proto->timeout=IR_NEXA1_TIMEOUT;
     proto->data=rawbitsTemp;
     return IR_OK;
 }
 #endif
 /**
  * Expand data from Nexa1 protocol
+ *
  *
  * @param buf
  *      Pointer to buffer to store the expanded data
  * @param len
  *      Pointer to length of the data
  * @param proto
  */
 int8_t expandNexa1(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     uint64_t tempshift = proto->data;
     /* 12 data bits + 1 stop bit */
     *len = 49;
     /* encode data bits */
     for (uint8_t i = 0; i < 45; i += 4)
+    {
         if (tempshift & 1) {
             /* encode 0 bit */
             buf[i+0] = IR_NEXA1_SHORT;
             buf[i+1] = IR_NEXA1_LONG;
             buf[i+2] = IR_NEXA1_SHORT;
             buf[i+3] = IR_NEXA1_LONG;
         } else {
             /* encode X bit */
             buf[i+1] = IR_NEXA1_LONG;
             buf[i+2] = IR_NEXA1_LONG;
             buf[i+3] = IR_NEXA1_SHORT;
+        }
         tempshift = tempshift>>1;
     }
     /* encode stop/sync bit */
     buf[48] = IR_NEXA1_SHORT;
     proto->modfreq = IR_NEXA1_F_MOD;
     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)
+{
+#if IR_RX_CONTINUOUS_MODE==1
+    /* check if we have correct amount of data */
+    if (len < 90) {
+        return IR_NOT_CORRECT_DATA;
+    }
+    uint8_t i, i2;
+    uint64_t rawbitsTemp = 0;//0xffffffffffffffff;
+    for (i = 90; i > 0; i--)
+    {
+        i2=index-i;
+        if (i2>index)
+            i2+=MAX_NR_TIMES;
+        /* Check if correct amount of data have been received */
+        if ((i == 78) && (rawbitsTemp != 0b00001))
+            return IR_NOT_CORRECT_DATA;
+        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 = rawbitsTemp<<1;
+                rawbitsTemp |= 1;
+            }
+            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 */
+                rawbitsTemp = rawbitsTemp<<1;
+            }
+            else
+            {
+                return IR_NOT_CORRECT_DATA;
+            }
+        }
+    }
+    rawbitsTemp = ~rawbitsTemp;
+    rawbitsTemp = rawbitsTemp&0xFFFFFFFFFF;
+    proto->protocol=IR_PROTO_VIKING;
+    proto->timeout=0;
+    proto->data=rawbitsTemp;
+    return IR_OK;
+#else
+    return IR_NOT_CORRECT_DATA;
+#endif
+}
+#endif
+#if (IR_PROTOCOLS_USE_VIKING_STEAK)
 /**
- * Test data on Viking temperature sensor protocol
+ * Test data on Viking steak temperature sensor protocol
+ *
+ *
+ *
  * @param buf
  *      Pointer to buffer to where to data to parse is stored
  *      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)
+int8_t parseVikingSteak(const uint16_t *buf, uint8_t len, uint8_t index, Ir_Protocol_Data_t *proto)
 {
 #if IR_RX_CONTINUOUS_MODE==1
     /* check if we have correct amount of data */
-    if (len < 90) {
+    if (len < 76) {
         return IR_NOT_CORRECT_DATA;
     }
     uint8_t i, i2;
     uint64_t rawbitsTemp = 0;//0xffffffffffffffff;
+    /* Check start bit condition */
+    i2=index-76;
+    if (i2>index)
+        i2+=MAX_NR_TIMES;
+    if ((buf[i2] < IR_VIKING_STEAK_LOW_ZERO - IR_VIKING_STEAK_LOW_ZERO/IR_VIKING_TOL_DIV) || (buf[i2] > IR_VIKING_STEAK_LOW_ZERO + IR_VIKING_STEAK_LOW_ZERO/IR_VIKING_TOL_DIV))
+    {
+        return IR_NOT_CORRECT_DATA;
+    }
+    i2++;
+    if (i2>index)
+        i2+=MAX_NR_TIMES;
+    if ((buf[i2] < IR_VIKING_STEAK_HIGH - IR_VIKING_STEAK_HIGH/IR_VIKING_TOL_DIV) || (buf[i2] > IR_VIKING_STEAK_HIGH + IR_VIKING_STEAK_HIGH/IR_VIKING_TOL_DIV))
+    {
+        return IR_NOT_CORRECT_DATA;
+    }
+    i2++;
+    if (i2>index)
+        i2+=MAX_NR_TIMES;
+    if ((buf[i2] < IR_VIKING_STEAK_LOW_START - IR_VIKING_STEAK_LOW_START/IR_VIKING_TOL_DIV) || (buf[i2] > IR_VIKING_STEAK_LOW_START + IR_VIKING_STEAK_LOW_START/IR_VIKING_TOL_DIV))
+    {
+        return IR_NOT_CORRECT_DATA;
+    }
-    for (i = 90; i > 0; i--)
+    for (i = 73; i > 0; i--)
+    {
         i2=index-i;
         if (i2>index)
             i2+=MAX_NR_TIMES;
         /* Check if correct amount of data have been received */
-        if ((i == 78) && (rawbitsTemp != 0b00001))
+        //if ((i == 78) && (rawbitsTemp != 0b00001))
-            return IR_NOT_CORRECT_DATA;
+        //  return IR_NOT_CORRECT_DATA;
-        if ((i&1) == 0)
+        if ((i&1) != 0)
-        {       /* if even, no data */
+        {       /* if odd, 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))
+            if ((buf[i2] < IR_VIKING_STEAK_HIGH - IR_VIKING_STEAK_HIGH/IR_VIKING_TOL_DIV) || (buf[i2] > IR_VIKING_STEAK_HIGH + IR_VIKING_STEAK_HIGH/IR_VIKING_TOL_DIV))
+            {
                 return IR_NOT_CORRECT_DATA;
             }
+        }
         else
-        {           /* if odd, data */
+        {           /* if even, 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))
+            if ((buf[i2] > IR_VIKING_STEAK_LOW_ONE - IR_VIKING_STEAK_LOW_ONE/IR_VIKING_TOL_DIV) && (buf[i2] < IR_VIKING_STEAK_LOW_ONE + IR_VIKING_STEAK_LOW_ONE/IR_VIKING_TOL_DIV))
+            {
                 /* write a one */
                 rawbitsTemp = rawbitsTemp<<1;
                 rawbitsTemp |= 1;
+            }
-            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))
+            else if ((buf[i2] > IR_VIKING_STEAK_LOW_ZERO - IR_VIKING_STEAK_LOW_ZERO/IR_VIKING_TOL_DIV) && (buf[i2] < IR_VIKING_STEAK_LOW_ZERO + IR_VIKING_STEAK_LOW_ZERO/IR_VIKING_TOL_DIV))
+            {
                 /* do nothing, a zero is already in rawbits */
                 rawbitsTemp = rawbitsTemp<<1;
+            }
             else
+            {
                 return IR_NOT_CORRECT_DATA;
+            }
+        }
     }
+    //rawbitsTemp = ~rawbitsTemp;
+    //rawbitsTemp = rawbitsTemp&0xFFFFFFFFFF;
-    rawbitsTemp = ~rawbitsTemp;
-    rawbitsTemp = rawbitsTemp&0xFFFFFFFFFF;
-    proto->protocol=IR_PROTO_VIKING;
+    proto->protocol=IR_PROTO_VIKING_STEAK;
     proto->timeout=0;
     proto->data=rawbitsTemp;
     return IR_OK;
 #else

Subversion Repositories HomeAutomation

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