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

 /*-----------------------------------------------------------------------------
  * Interrupt Handlers
  *---------------------------------------------------------------------------*/
+ /* TRANSMIT */
 #if IR_TX_ENABLE==1
 ISR(IR_COMPARE_VECTOR)
+{
     /* find which channel */
     uint16_t time = IR_COMPARE_REG;
                     /* notify the application that a pulse train has been sent. */
                     drvIrTxChannel[channel].callback(channel);
+                }
+            }
+        }
     }
     channel = 0;
     diff = 0xffff;
     /* go through all channels and find the one that have the next overflow */
     for (uint8_t i=0; i < IR_SUPPORTED_NUM_CHANNELS; i++)
     {
         /* if channel is waiting for an overflow */
         if (drvIrTxChannel[i].timeoutEnable==TRUE)
+        {
             if (drvIrTxChannel[i].timeout - time < diff)
+            {
                 diff = drvIrTxChannel[i].timeout - time;
                 channel = i;
             }
             /* enable overflow interrupt */
             IR_UNMASK_COMPARE();
         }
     }
     /* set compare value to the channel that have the next overflow */
     IR_COMPARE_REG = drvIrTxChannel[channel].timeout;
+}
 #endif
 #if IR_RX_ENABLE==1
+/* RECEIVE */
 /* When this timeout occurs a pulsetrain is complete */
 ISR(IR_TIMEOUT_VECTOR)
+{
+#if IR_RX_CONTINUOUS_MODE==0
     for (uint8_t i=0; i < IR_SUPPORTED_NUM_CHANNELS; i++)
     {
         /* If more than 2 edges were recevied */
         if (drvIrRxChannel[i].storeEnable == TRUE && drvIrRxChannel[i].rxlen > 2)
+        {
             /* Notify the application that a pulse train has been received. */
             drvIrRxChannel[i].callback(i, drvIrRxChannel[i].rxbuf, drvIrRxChannel[i].rxlen);
         }
         drvIrRxChannel[i].storeEnable = FALSE;
+    }
     /* Disable ISR */
     IR_MASK_TIMEOUT();
+#endif
 //  gpio_toggle_pin(EXP_J);
+}
 #endif
 /*-----------------------------------------------------------------------------
  * Private Functions
  *---------------------------------------------------------------------------*/
 #if IR_RX_ENABLE==1
 /* these wrapper functions are called from the pcint driver (callback) */
 void IrTransceiver_Store_ch0(uint8_t id, uint8_t status)
+{
     IrTransceiver_Store(0);
 }
 void IrTransceiver_Store_ch1(uint8_t id, uint8_t status)
+{
     IrTransceiver_Store(1);
+}
 void IrTransceiver_Store_ch2(uint8_t id, uint8_t status)
 {
     IrTransceiver_Store(2);
+}
 void IrTransceiver_Store(uint8_t channel)
+{
     static uint16_t prev_time[3];
     uint16_t pulsewidth;
     /* Read the timer counter register to get the current "time". */
     uint16_t time = IR_COUNT_REG;
     /* Subtract the current measurement from the previous to get the pulse width. */
     pulsewidth = time - prev_time[channel];
     prev_time[channel] = time;
 #if IR_MIN_STARTPULSE_WIDTH>0
     if ((pulsewidth <= IR_MIN_STARTPULSE_WIDTH) && (drvIrRxChannel[channel].storeEnable == TRUE) && (drvIrRxChannel[channel].rxlen == 0))
     {
         IR_MASK_TIMEOUT();
         return;
     }
+    else
+    {
+        IR_UNMASK_TIMEOUT();
+    }
+#endif
+//gpio_toggle_pin(EXP_K);
+#if IR_RX_CONTINUOUS_MODE==0
+/* in continuous mode when short pulse arrives received len should be set to zero */
+//TODO
+    if ((pulsewidth <= IR_MIN_PULSE_WIDTH) && (drvIrRxChannel[channel].storeEnable == TRUE))
+    {
+        drvIrRxChannel[channel].rxlen = 0;
+        //IR_MASK_TIMEOUT();
+        return;
+    }
     else
+    {
-        IR_UNMASK_TIMEOUT();
+        //IR_UNMASK_TIMEOUT();
+    }
 #endif
-//gpio_toggle_pin(EXP_K);
     if (drvIrRxChannel[channel].storeEnable)
+    {
         /* Store the measurement. */
+        {
             drvIrRxChannel[channel].rxlen = MAX_NR_TIMES-1;
+        }
         else
+        {
+#if IR_RX_CONTINUOUS_MODE==0
             /* Set the timeout for detection of the end of the pulse train. */
             drvIrRxChannel[channel].timeout = time + IR_MAX_PULSE_WIDTH;
             IR_TIMEOUT_REG = drvIrRxChannel[channel].timeout;
+#else
+            /* Notify the application that a pulse has been received. */
+            drvIrRxChannel[i].callback(i, drvIrRxChannel[i].rxbuf, drvIrRxChannel[i].rxlen);
+#endif
+        }
+    }
-    }
     else if (drvIrRxChannel[channel].enable == TRUE)
+    {
         /* The first edge of the pulse train has been detected. Enable the storage of the following pulsewidths. */
         drvIrRxChannel[channel].storeEnable = TRUE;
         drvIrRxChannel[channel].rxlen = 0;
+#if IR_RX_CONTINUOUS_MODE==0
         /* Enable timeout interrupt for detection of the end of the pulse train. */
         IR_TIMEOUT_REG = time + IR_MAX_PULSE_WIDTH;
         IR_UNMASK_TIMEOUT();
+#endif
+    }
+}
 #endif

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/avr-lib/drivers/ir/transceiver/irtransceiverMulti.c – Rev 1875 → 1931