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

  *      The number of stored ir-times in the array
  */
 uint8_t getRawDataCnt(void) {
     return timesCounter;
+}
-#if 1
 /**
  * Test data on SIRC protocol, 12-bit version
  * http://www.sbprojects.com/knowledge/ir/sirc.htm
+ *
     /* check if we have correct amount of data */
     if (timesCounter != 25) {
         return IR_NOT_CORRECT_DATA;
+    }
     /* check startbit */
     if (times[0] > IR_SIRC_ST_BIT + IR_SIRC_ST_BIT/IR_SIRC_TOL_DIV || times[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 < timesCounter; i++) {
         if ((i&1) == 1) {       /* if odd, ir-pause */
             /* check length of pause between bits */
             if (times[i] > IR_SIRC_LOW + IR_SIRC_LOW/IR_SIRC_TOL_DIV || times[i] < IR_SIRC_LOW - IR_SIRC_LOW/IR_SIRC_TOL_DIV) {
                 return IR_NOT_CORRECT_DATA;
+            }
         } else {            /* if even, ir-bit */
             if (times[i] > IR_SIRC_HIGH_ONE - IR_SIRC_HIGH_ONE/IR_SIRC_TOL_DIV && times[i] < IR_SIRC_HIGH_ONE + IR_SIRC_HIGH_ONE/IR_SIRC_TOL_DIV) {
             } else {
                 return IR_NOT_CORRECT_DATA;
+            }
+        }
+    }
     *command = ((uint8_t)rawbits&0x7f);
     *address = ((uint8_t)(rawbits>>7)&0x1f);
     return IR_OK;
+}
 /**
  * Test data on RC5 protocol
  * http://www.sbprojects.com/knowledge/ir/rc5.htm
  *
  * @param address
  *      Pointer to store the address of the received data
  * @param command
  *      Pointer to store the command of the received data
  * @return
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
 uint8_t testRC5(uint8_t *address, uint8_t *command) {
     uint8_t halfbitscnt = 1;
+    }
     uint16_t rawbits=0;
     for (uint8_t i = 1; i < timesCounter; i++) {
         if ((i&1) == 1) {       /* if odd, ir-pause */
             /* check length of pause between bits */
             if (times[i] > IR_SHARP_LOW_ONE - IR_SHARP_LOW_ONE/IR_SHARP_TOL_DIV && times[i] < IR_SHARP_LOW_ONE + IR_SHARP_LOW_ONE/IR_SHARP_TOL_DIV) {
                 /* write a one */
                 rawbits |= 1<<((i-1)>>1);
             } else if (times[i] > IR_SHARP_LOW_ZERO - IR_SHARP_LOW_ZERO/IR_SHARP_TOL_DIV && times[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 (times[i] > IR_SHARP_HIGH + IR_SHARP_HIGH/IR_SHARP_TOL_DIV || times[i] < IR_SHARP_HIGH - IR_SHARP_HIGH/IR_SHARP_TOL_DIV) {
                 return IR_NOT_CORRECT_DATA;
+            }
+        }
     return IR_OK;
+}
 /**
  * Test data on NEC protocol
  * http://www.sbprojects.com/knowledge/ir/nec.htm
  *
  * @param address
  *      Pointer to store the address of the received data
  * @param command
  *      Pointer to store the command of the received data
  * @return
  *      IR_OK if data parsed successfully, one of several errormessages if not
  */
 uint8_t testNEC(uint8_t *address, uint8_t *command) {
+    }
     *command = 0;
     *address = 0;
-    for (uint8_t i = 3; i < timesCounter; i++) {
+    for (uint8_t i = 2; i < timesCounter; i++) {
         if ((i&1) == 1) {       /* if odd, ir-pause */
             /* check length of pause between bits */
             if (times[i] > IR_SAMS_LOW_ONE - IR_SAMS_LOW_ONE/IR_SAMS_TOL_DIV && times[i] < IR_SAMS_LOW_ONE + IR_SAMS_LOW_ONE/IR_SAMS_TOL_DIV) {
                 if (i>2 && i<18) {
                     /* write a one */
     initTimer();
     //this routine should sample the timings for received irdata
     timesCounter = 0;
-    uint8_t gotTimout = 0;  // a timeout is a very long break in irdata (such as occurs between ir pulsetrains)
+    uint8_t gotTimout = 0;  // a timeout is a very long break in irdata (such as occurs between ir frames)
     while (!gotTimout && timesCounter < MAX_NR_TIMES-1) { //loop as long as no timeout occured and not to many pulses received
         setTimerVal(TIM_OVFL_RELOAD_VAL);
         //wait for positiv slope, while checking timer overflow
         while (!(IRPIN & (1<<IRBIT))) {
             //if timeout (if timer-ovflow-flaggan is set)
+    }
     return IR_NO_PROTOCOL;
+}
-#endif
 //TODO: skriv doxygen-header som för de andra funktionerna
 /**
+ *
+ *
  */
 void IrReceive_Init(void) {
     IRDDR &= ~(1<<IRBIT);
+}
-//varför är denna funktion så komplex? jo den filtrerar bort korta ir-pulser
+//varför är denna funktion så komplex? jo den filtrerar bort för korta ir-pulser
 //TODO: skriv doxygen-header som för de andra funktionerna
 uint8_t IrReceive_CheckIdle(void) {
     if (IRPIN & (1<<IRBIT)) return IR_NO_DATA;      //om irmodulen ger en etta så återgå
     //nu lägger irmodulen ut en nolla, "startbiten" alltså

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/avr-lib/drivers/ir/receiver/irreceiver.c @ 596 – Rev 533 → 548