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

  *---------------------------------------------------------------------------*/
 #if IR_RX_ENABLE==1
 struct {
     uint8_t     enable;
     uint16_t    timeout;
-    uint8_t     timeoutEnable;
     uint16_t    *rxbuf;
     uint8_t     rxlen;
     uint8_t     storeEnable;
     irRxCallback_t callback;
 } drvIrRxChannel[3];
 #endif
 #if IR_TX_ENABLE==1
 struct {
     uint8_t     enable;
     uint16_t    timeout;
     uint8_t     timeoutEnable;
     uint8_t     txindex;
     irTxCallback_t callback;
     volatile uint8_t    *port;
     uint8_t     pinmask;
 } drvIrTxChannel[3];
 #endif
 /*-----------------------------------------------------------------------------
  * Interrupt Handlers
  *---------------------------------------------------------------------------*/
 #if IR_TX_ENABLE==1
 ISR(IR_COMPARE_VECTOR)
 {
     /* find which channel */
     uint16_t time = IR_COMPARE_REG;
     uint16_t diff;
     uint8_t channel;
     /* go through all channels and check which of thems have overflowed */
     for (channel=0; channel < IR_SUPPORTED_NUM_CHANNELS; channel++)
     {
         /* if channel is waiting for an overflow */
         if (drvIrTxChannel[channel].timeoutEnable==TRUE)
+        {
             /* check if channel have overflowed or is about to overflow */
             diff = (time+50)-drvIrTxChannel[channel].timeout;
             if (diff < IR_MAX_PULSE_WIDTH)
             {
                 /* check what to output next */
                 if ((drvIrTxChannel[channel].txindex&1) == 1) {     /* if odd, ir-pause */
                     IR_OUTP_LOW();
                 } else {
                     IR_OUTP_HIGH();
     /* set compare value to the channel that have the next overflow */
     IR_COMPARE_REG = drvIrTxChannel[channel].timeout;
+}
 #endif
-#if IR_RX_ENABLE==1
-//TODO: hur hantera detta i multi receiver
-//TODO: ha en array med tider och nån enableflagga för varje kanal
-//TODO: mot slutet av ISRen laddas nästa tid in... likadant som för TX, se ovan ISR
+#if IR_RX_ENABLE==1
 /* When this timeout occurs a pulsetrain is complete */
 ISR(IR_TIMEOUT_VECTOR)
+{
-    /* Find which channel timed out */
+gpio_toggle_pin(GPIO_B0); /* Toggle debug output PB0 */
-    uint16_t timeDiff = 0xffff;
-    uint8_t channel = 0;
-/*  for (uint8_t i=0; i < 3; i++)
+    for (uint8_t i=0; i < 3; i++)
+    {
-        if ((drvIrRxChannel[channel].timeoutEnable==TRUE) && (IR_TIMEOUT_REG-drvIrRxChannel[i].timeout < timeDiff))
-        {
-            timeDiff = IR_TIMEOUT_REG-drvIrRxChannel[i].timeout;
-            channel = i;
-        }
-    }
-*/
-    /* If more than 3 flanks was recevied */
+        /* If more than 3 flanks was recevied */
-    if (drvIrRxChannel[channel].rxlen > 3)
+        if (drvIrRxChannel[i].storeEnable == TRUE && drvIrRxChannel[i].rxlen > 3)
+        {
-        /* Notify the application that a pulse train has been received. */
+            /* Notify the application that a pulse train has been received. */
-        drvIrRxChannel[channel].callback(channel, drvIrRxChannel[channel].rxbuf, drvIrRxChannel[channel].rxlen);
+            drvIrRxChannel[i].callback(i, drvIrRxChannel[i].rxbuf, drvIrRxChannel[i].rxlen);
-    }
+        }
-    drvIrRxChannel[channel].storeEnable = FALSE;
+        drvIrRxChannel[i].storeEnable = FALSE;
-    drvIrRxChannel[channel].timeoutEnable = FALSE;
+    }
+    /* Disable ISR */
     IR_MASK_TIMEOUT();
+}
+#endif
-//TODO: reset the timeout for next enabled channel
-/*
-    uint16_t nextTimeout = drvIrRxChannel[channel].timeout;
-    for (uint8_t i=0; i < 3; i++)
-    {
-//TODO: hitta den med timeout härnäst (svårt med tanke på att den tiden kan ha passerat eftersom vi är under interrupt)
-//kanske inte är så noga, i värsta fall tar det 65ms extra
-        if ((drvIrRxChannel[channel].timeoutEnable) && (drvIrRxChannel[i].timeout < nextTimeout))
-        {
-            nextTimeout = drvIrRxChannel[i].timeout;
-        }
-    }
-    IR_UNMASK_TIMEOUT();
-    IR_TIMEOUT_REG = nextTimeout;
-*/
-}
-#endif
 /*-----------------------------------------------------------------------------
  * Private Functions
  *---------------------------------------------------------------------------*/
 #if IR_RX_ENABLE==1
     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)
+{
+gpio_toggle_pin(GPIO_B7); /* Toggle debug output PB7 */
+//gpio_toggle_pin(GPIO_D7); /* Toggle debug output PD7 */
     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;
+    {
         /* Store the measurement. */
         drvIrRxChannel[channel].rxbuf[drvIrRxChannel[channel].rxlen++] = pulsewidth;
         /* Disable future measurements if we've filled the buffer. */
-        //TODO: What to do in multi recevier?
         //TODO: Report overflow to application
         if (drvIrRxChannel[channel].rxlen == MAX_NR_TIMES)
+        {
             drvIrRxChannel[channel].rxlen = MAX_NR_TIMES-1;
+        }
+        else
+        {
+            /* 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 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;
-        drvIrRxChannel[channel].timeoutEnable = TRUE;
-        /* Set the timeout for detection of the end of the pulse train. */
-        drvIrRxChannel[channel].timeout = time + IR_MAX_PULSE_WIDTH;
-        uint16_t nextTimeout = drvIrRxChannel[channel].timeout;
-        for (uint8_t i=0; i < 3; i++)
-        {
-    //TODO: hitta den med timeout härnäst (svårt med tanke på att den tiden kan ha passerat eftersom vi är under interrupt)
-    //kanske inte är så noga, i värsta fall tar det 65ms extra
-            if ((drvIrRxChannel[channel].timeoutEnable) && (drvIrRxChannel[i].timeout < nextTimeout))
-            {
-                nextTimeout = drvIrRxChannel[i].timeout;
-            }
-        }
-        IR_TIMEOUT_REG = nextTimeout;
         /* Enable timeout interrupt for detection of the end of the pulse train. */
+        IR_TIMEOUT_REG = time + IR_MAX_PULSE_WIDTH;
         IR_UNMASK_TIMEOUT();
-        //TODO: if buffer resource coordinator is implemented this is where a buffer should be assinged to this channel
+    }
+}
 #endif
         *ddr &= ~(1 << nr);
         drvIrRxChannel[channel].rxbuf = buffer;
         drvIrRxChannel[channel].rxlen = 0;
         drvIrRxChannel[channel].storeEnable = FALSE;
-        drvIrRxChannel[channel].timeoutEnable = FALSE;
         drvIrRxChannel[channel].callback = callback;
         drvIrRxChannel[channel].enable = TRUE;
+    }
+}
+    {
         /* Deactivate channel */
         drvIrRxChannel[channel].enable = FALSE;
         drvIrRxChannel[channel].rxlen = 0;
         drvIrRxChannel[channel].storeEnable = FALSE;
-        drvIrRxChannel[channel].timeoutEnable = FALSE;
         drvIrRxChannel[channel].callback = 0;
+    }
+}
 uint8_t IrTransceiver_GetStoreEnableRx(uint8_t channel)
     if (channel < 3)
+    {
         /* Reset channel */
         drvIrRxChannel[channel].rxlen = 0;
         drvIrRxChannel[channel].storeEnable = FALSE;
-        drvIrRxChannel[channel].timeoutEnable = FALSE;
+    }
+}
 #endif
 #if IR_RX_ENABLE==1
     for (uint8_t i = 0; i < 3; i++)
+    {
         drvIrRxChannel[i].storeEnable = FALSE;
-        drvIrRxChannel[i].timeoutEnable = FALSE;
         drvIrRxChannel[i].rxlen = 0;
+    }
 #endif
 #if IR_TX_ENABLE==1

Subversion Repositories HomeAutomation

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