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

 #include <config.h>
 #include <drivers/ir/transceiver/irtransceiverMulti.h>
 #include <drivers/ir/protocols.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
+#include <drivers/mcu/pcint.h>
 /*-----------------------------------------------------------------------------
  * Globals
  *---------------------------------------------------------------------------*/
 #if IR_RX_ENABLE==1
 uint16_t *rxbuf;
 uint8_t rxlen;
+/*struct {
+    uint8_t     dataReceived;
+    uint16_t    timeout;
+    uint8_t     timeoutEnable;
+    uint16_t    *rxbuf;
+    uint8_t     rxlen;
+    uint8_t     storeEnable;
+} irRxChannel[3];
+*/
 #endif
 #if IR_TX_ENABLE==1
 uint16_t *txbuf;
 uint8_t txlen;
 #endif
 #endif
 volatile uint8_t data_received;
 volatile uint8_t data_transmitted;
 //uint8_t detect_edge;
 uint8_t store;
-uint8_t gPinB;
-uint8_t gPinC;
-uint8_t gPinD;
 /*-----------------------------------------------------------------------------
  * Prerequisites
  *---------------------------------------------------------------------------*/
 //TODO: how to handle more than one transmitter on one compare interrupt, spara en array med tider och nån enableflagga för varje kanal
 */
 #if IR_TX_ENABLE==1
 ISR(IR_COMPARE_VECTOR)
 {
     if ((bufIndex&1) == 1) {        /* if odd, ir-pause */
         IR_OUTP_LOW();
     } else {
         IR_OUTP_HIGH();
+    }
+    }
     store = 0;
+}
 #endif
-#if IR_RX_ENABLE==1
+#if 0
 //ISR(IR_CAPTURE_VECTOR)
 //TODO: skriv denna för multi receiver
 ISR(PCINT0_vect) {
 //  uint8_t p;
 /*-----------------------------------------------------------------------------
  * Private Functions
  *---------------------------------------------------------------------------*/
 #if IR_RX_ENABLE==1
+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;
     uint16_t pulsewidth;
     /* Read the measured transition time from the capture register. */
     //uint16_t time = IR_CAPTURE_REG;
     /* Read the timer counter register to get the current "time". */
     uint16_t time = IR_COUNT_REG;
-    /* Toggle the edge detection. */
-//  if (detect_edge == 0)
-//  {
-//      IR_CAPTURE_RISING();
-//      detect_edge = 1;
-//  }
-//  else
-//  {
-//      IR_CAPTURE_FALLING();
-//      detect_edge = 0;
-//  }
     /* Subtract the current measurement from the previous to get the pulse
      * width. */
     pulsewidth = time - prev_time;
     prev_time = time;
         //TODO: What to do in multi recevier?
         //TODO: Report overflow to application
         if (rxlen == MAX_NR_TIMES)
+        {
             //IR_MASK_CAPTURE();
         }
+    }
     else
     {
         /* The first edge of the pulse train has been detected. Enable the
          * storage of the following pulsewidths. */
         store = 1;
         /* Enable timeout interrupt for detection of the end of the pulse
          * train. */
         IR_UNMASK_TIMEOUT();
+        //TODO: if buffer resource coordinator is implemented this is where a buffer should be assinged to this channel
     }
+}
 #endif
 /*-----------------------------------------------------------------------------
  * Public Functions
  *---------------------------------------------------------------------------*/
 /* call this function like this:
-    IrTransceiver_Init_TX_Channel(0, buffer, callback, GPIO_D6);
+    IrTransceiver_Init_TX_Channel(0, buffer, callback, pcint-id, GPIO_D6);
     buffer is a memory location
     callback is a function to call when a receive/transmitt is complete
     also call with IO port to use
     function to deactivate channel may later be needed
 */
-/*
-void IrTransceiver_Init_TX_Channel(uint8_t channel, uint16_t *buffer, irCallback_t callback, volatile uint8_t* port, volatile uint8_t* pin, volatile uint8_t* ddr,uint8_t nr, uint8_t pcint)
+void IrTransceiver_Init_TX_Channel(uint8_t channel, uint16_t *buffer, irCallback_t callback, uint8_t pcint_id, volatile uint8_t* port, volatile uint8_t* pin, volatile uint8_t* ddr,uint8_t nr, uint8_t pcint)
+{
+    if (channel == 0)
+    {
+        Pcint_SetCallback(uint8_t pcint_id, uint8_t pcint, &IrTransceiver_Store_ch0);
+    }
+    else if (channel == 1)
+    {
+        Pcint_SetCallback(uint8_t pcint_id, uint8_t pcint, &IrTransceiver_Store_ch1);
+    }
+    else if (channel == 2)
+    {
+        Pcint_SetCallback(uint8_t pcint_id, uint8_t pcint, &IrTransceiver_Store_ch2);
+    }
+}
+/*
 void IrTransceiver_Init_RX_Channel(uint8_t channel, uint16_t *buffer, irCallback_t callback, volatile uint8_t* port, volatile uint8_t* pin, volatile uint8_t* ddr,uint8_t nr, uint8_t pcint)
+{
+}
 */

Subversion Repositories HomeAutomation

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