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

  * @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) {
     //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_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
     uint16_t rawbits = 0;
     for (uint8_t i = 0; i<len; i++) {
         //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 |= (1<<(13-(halfbitscnt>>1)));
+        }
         if (buf[i] > IR_RC5_HALF_BIT - IR_RC5_HALF_BIT/IR_RC5_TOL_DIV && buf[i] < IR_RC5_HALF_BIT + IR_RC5_HALF_BIT/IR_RC5_TOL_DIV) {
  *      IR_OK if data expanded successfully, one of several errormessages if not
  */
 int8_t expandRC5(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     uint8_t tempadress;
     uint8_t tempcommand;
     uint8_t previousBit;
     uint16_t tempdata;
     /* Set up startbit */
     buf[0] = 0; // no start-one
     buf[1] = IR_RC5_HALF_BIT;
             if (previousBit == 1){//11
                 buf[*len] = IR_RC5_HALF_BIT;
                 buf[*len+1] = IR_RC5_HALF_BIT;
                 *len = *len + 2;
             } else {//01
                 buf[*len-1] = IR_RC5_BIT;
                 buf[*len] = IR_RC5_HALF_BIT;
                 *len = *len + 1;
+            }
             previousBit = 1;
         } else {//10
             if (previousBit == 1){
                 buf[*len-1] = IR_RC5_BIT;
                 buf[*len] = IR_RC5_HALF_BIT;
                 *len = *len + 1;
             } else {//00
                 buf[*len] = IR_RC5_HALF_BIT;
                 buf[*len+1] = IR_RC5_HALF_BIT;
                 *len = *len + 2;
+            }
             previousBit = 0;
+        }
     }
     */
     tempadress = tempadress<<2;
     for(uint8_t i = 0; i < 5; i++) {
         tempadress = tempadress<<1;
         //temptemp = tempadress&0xA0;
         if (((tempadress&(0xA0))>>7)==1){
             if (previousBit == 1){//11
                 buf[*len] = IR_RC5_HALF_BIT;
                 buf[*len+1] = IR_RC5_HALF_BIT;
                 *len = *len + 2;
             } else {//01
                 buf[*len-1] = IR_RC5_BIT;
                 buf[*len] = IR_RC5_HALF_BIT;
                 *len = *len + 1;
             }
             previousBit = 1;
         } else {//10
             if (previousBit == 1){
                 buf[*len-1] = IR_RC5_BIT;
                 buf[*len] = IR_RC5_HALF_BIT;
                 *len = *len + 1;
             } else {//00
                 buf[*len] = IR_RC5_HALF_BIT;
                 buf[*len+1] = IR_RC5_HALF_BIT;
                 *len = *len + 2;
             }
             previousBit = 0;
         }
     }
     tempcommand = tempcommand << 1;
     for(uint8_t i = 0; i < 6; i++) {
         tempcommand = tempcommand<<1;
         //temptemp = tempadress&0xA0;
         if (((tempcommand&(0xA0))>>7)==1){
             if (previousBit == 1){//11
                 buf[*len] = IR_RC5_HALF_BIT;
                 buf[*len+1] = IR_RC5_HALF_BIT;
                 *len = *len + 2;
             } else {//01
                 buf[*len-1] = IR_RC5_BIT;
                 buf[*len] = IR_RC5_HALF_BIT;
 #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
  *      Pointer to protocol information
  * @return
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
 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 */
             } 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;
     proto->data=rawbits;
     return IR_OK;
+}
 #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
  *      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;
+    }
         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) {
                 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;
             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 */
                 buf[i+2] = IR_NEC_HIGH;
+            }
+        }
         proto->timeout=IR_NEC_TIMEOUT;
     } else {
+            }
+        }
+    }
     proto->protocol=IR_PROTO_SAMS;
     proto->timeout=IR_SAMS_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 expandSamsung(uint16_t *buf, uint8_t *len, Ir_Protocol_Data_t *proto) {
     /* Set up startbit */
     buf[0] = IR_SAMS_ST_BIT;
             } else {
                 buf[i+2] = IR_SAMS_LOW_ZERO;
+            }
         } 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 (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.
         //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_RC5_HALF_BIT - IR_RC5_HALF_BIT/IR_RC5_TOL_DIV && buf[i] < IR_RC5_HALF_BIT + IR_RC5_HALF_BIT/IR_RC5_TOL_DIV) {
+        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_RC5_BIT - IR_RC5_BIT/IR_RC5_TOL_DIV && buf[i] < IR_RC5_BIT + IR_RC5_BIT/IR_RC5_TOL_DIV) {
+        } 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_RC5_BIT - IR_RC5_BIT/IR_RC5_TOL_DIV && buf[i] < 3*IR_RC5_BIT + IR_RC5_BIT/IR_RC5_TOL_DIV) {
+        } 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;
         }
     }
     //rawbits = (uint32_t)1<<17;
     proto->protocol=IR_PROTO_MARANTZ;
-    proto->timeout=IR_RC5_TIMEOUT;
+    proto->timeout=IR_MARANTZ_TIMEOUT;
     //support RC5-extended keeping second startbit
     //remove togglebit
     //proto->data = rawbits&0x37ff;
     proto->data = rawbits&0x0001ffff;
  *      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_RC5_HALF_BIT;//first start bit
+    buf[0] = IR_MARANTZ_HALF_BIT;//first start bit
-    buf[1] = IR_RC5_HALF_BIT;
+    buf[1] = IR_MARANTZ_HALF_BIT;
-    buf[2] = IR_RC5_HALF_BIT;//second start bit
+    buf[2] = IR_MARANTZ_HALF_BIT;//second start bit
     //TODO: Toggle bit should be better, not hard-coded
-    buf[3] = IR_RC5_HALF_BIT;
+    buf[3] = IR_MARANTZ_HALF_BIT;
-    buf[4] = IR_RC5_HALF_BIT;//toggle 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_RC5_HALF_BIT;
+                buf[*len] = IR_MARANTZ_HALF_BIT;
-                buf[*len+1] = IR_RC5_HALF_BIT;
+                buf[*len+1] = IR_MARANTZ_HALF_BIT;
                 *len = *len + 2;
             } else {//01
-                buf[*len-1] = IR_RC5_BIT;
+                buf[*len-1] = IR_MARANTZ_BIT;
-                buf[*len] = IR_RC5_HALF_BIT;
+                buf[*len] = IR_MARANTZ_HALF_BIT;
                 *len = *len + 1;
+            }
             previousBit = 1;
         } else {
             if (previousBit == 1){//10
-                buf[*len-1] = IR_RC5_BIT;
+                buf[*len-1] = IR_MARANTZ_BIT;
-                buf[*len] = IR_RC5_HALF_BIT;
+                buf[*len] = IR_MARANTZ_HALF_BIT;
                 *len = *len + 1;
             } else {//00
-                buf[*len] = IR_RC5_HALF_BIT;
+                buf[*len] = IR_MARANTZ_HALF_BIT;
                 if (i==4){
-                    buf[*len+1] = IR_RC5_HALF_BIT*5;
+                    buf[*len+1] = IR_MARANTZ_HALF_BIT*5;
                 } else {
-                    buf[*len+1] = IR_RC5_HALF_BIT;
+                    buf[*len+1] = IR_MARANTZ_HALF_BIT;
+                }
                 *len = *len + 2;
             }
             previousBit = 0;
         }
+    }
     //make sure that we finish high by removing the last zero if needed
     if (*len%2 == 0){
         *len = *len - 1;
+    }
-    proto->modfreq=(((F_CPU/2000)/IR_RC5_F_MOD) -1);
+    proto->modfreq=(((F_CPU/2000)/IR_MARANTZ_F_MOD) -1);
-    proto->timeout=IR_RC5_TIMEOUT;
+    proto->timeout=IR_MARANTZ_TIMEOUT;
-    proto->repeats=IR_RC5_REPS;
+    proto->repeats=IR_MARANTZ_REPS;
     return IR_OK;
+}
 #endif

Subversion Repositories HomeAutomation

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