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

 /**
  * IR receiver and transmitter protocols.
+ *
  * @date    2006-12-10
+ *
- * @author  Anders Runeson, Andreas Fritiofson
+ * @author  Anders Runeson, Andreas Fritiofson, Martin Nordn
+ *
  */
 #include "protocols.h"
     uint8_t tempadress;
     uint8_t tempcommand;
     uint8_t previousBit;
     uint16_t tempdata;
-    //TODO: Implement this function. Martin testar!
     /* Set up startbit */
     buf[0] = 0; // no start-one
     buf[1] = IR_RC5_HALF_BIT;
     buf[2] = IR_RC5_HALF_BIT;//first start bit
     buf[3] = IR_RC5_HALF_BIT;
+    }
     //let's start with the adress bits..
     tempcommand = proto->data&(0b00111111);
     tempadress = (proto->data>>8)&(0b00011111);
+    //TODO: This requires massive cleanup
     //tempdata = ((((uint16_t)(proto->data)&(0x3F)) + ((uint16_t)((proto->data>>8)&(0x1F))<<6)))<<5;
     tempdata = (uint16_t)tempcommand + ((uint16_t)tempadress<<6);
     tempdata = tempdata<<5;
     /*
     for(uint8_t ijag t = 0; i < 11; i++) {
         tempdata = tempdata<<1;
         //temptemp = tempadress&0xA0;
         if (((tempdata&(0xA000))>>15)==1){
             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;
             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;
 #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 */
         } 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;
  * @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
+ *
 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;
+    }
                 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
             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;
 #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
         return IR_NOT_CORRECT_DATA;
+    }
     /* check pause after startbit */
     if (buf[1] > IR_SAMS_ST_PAUSE + IR_SAMS_ST_PAUSE/IR_SAMS_TOL_DIV || buf[1] < IR_SAMS_ST_PAUSE - IR_SAMS_ST_PAUSE/IR_SAMS_TOL_DIV) {
         return IR_NOT_CORRECT_DATA;
+    }
     uint32_t rawbits = 0;
     for (uint8_t i = 3; i < len; i++) {
                 /* 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;
+            }
 /**
  * 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 IR_OK;
+}
 /**
- * Expand data from Marantz
+ * Expand data from Marantz. Written by Martin Nordn
+ *
  * @param buf
  *      Pointer to buffer to store the expanded data
  * @param len
  *      Pointer to length of the 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;
-    uint32_t tempvariabel; //bra att ha eftersom jag inte har koll p alla typecastingar
-    //TODO: Implement this function. Martin testar!
     /* Set up startbits */
     buf[0] = IR_RC5_HALF_BIT;//first start bit
     buf[1] = IR_RC5_HALF_BIT;
     buf[2] = IR_RC5_HALF_BIT;//second start bit
     //TODO: Toggle bit should be better, not hard-coded
     buf[3] = IR_RC5_HALF_BIT;
     buf[4] = IR_RC5_HALF_BIT;//toggle bit
     *len=5;
     previousBit = 1;
-    tempdata = proto->data;
+    tempdata = (uint32_t)(proto->data)<<14;
-    tempdata = (uint32_t)tempdata<<14; //MSB at position 32.
-    for(uint8_t ij = 0; ij < 17; ij++) {
+    for(uint8_t i = 0; i < 17; i++) {
         tempdata = (uint32_t)tempdata<<1;
-        tempvariabel = (uint32_t)tempdata&(0x8000);
-        tempvariabel = (uint32_t)tempdata>>31;
-        if ((uint32_t)tempvariabel==1){
+        if (((uint32_t)tempdata>>31)==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;
             } else {//00
                 buf[*len] = IR_RC5_HALF_BIT;
-                if (ij==4){
+                if (i==4){
                     buf[*len+1] = IR_RC5_HALF_BIT*5;
                 } else {
                     buf[*len+1] = IR_RC5_HALF_BIT;
+                }

Subversion Repositories HomeAutomation

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