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

     uint8_t     txindex;
     irTxCallback_t callback;
     volatile uint8_t    *port;
     uint8_t     pinmask;
 } drvIrTxChannel[3];
+uint16_t drvIrTxModFreqkHz = 38; /* Default to 38kHz */
 #endif
 /*-----------------------------------------------------------------------------
  * Interrupt Handlers
                     drvIrTxChannel[channel].timeout = IR_COMPARE_REG + drvIrTxChannel[channel].txbuf[drvIrTxChannel[channel].txindex++];
+                }
                 else
+                {
                     /* disable this channel */
                     drvIrTxChannel[channel].timeoutEnable = FALSE;
                     /* disable the overflow interrupt */
                     IR_MASK_COMPARE();
                     /* notify the application that a pulse train has been sent. */
                     drvIrTxChannel[channel].callback(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 (drvIrRxChannel[channel].storeEnable)
 void IrTransceiver_DeInitRxChannel(uint8_t channel, uint8_t pcint_id, volatile uint8_t* port, volatile uint8_t* pin, volatile uint8_t* ddr,uint8_t nr, uint8_t pcint)
+{
     /* Deactivate interrupt */
     Pcint_SetCallback(pcint_id, pcint, 0);
     if (channel < 3)
     {
         /* Deactivate channel */
         drvIrRxChannel[channel].enable = FALSE;
         drvIrRxChannel[channel].rxlen = 0;
         drvIrRxChannel[channel].storeEnable = FALSE;
         drvIrRxChannel[channel].callback = 0;
     }
 }
 uint8_t IrTransceiver_GetStoreEnableRx(uint8_t channel)
+{
     return drvIrRxChannel[channel].storeEnable;
 }
 void IrTransceiver_DisableRx(uint8_t channel)
+{
     if (channel < 3)
+    {
         /* Soft disable channel */
         drvIrRxChannel[channel].enable = TRUE;
+    }
+}
 void IrTransceiver_ResetRx(uint8_t channel)
 {
     if (channel < 3)
+    {
         /* Reset channel */
         drvIrRxChannel[channel].rxlen = 0;
         drvIrRxChannel[channel].storeEnable = FALSE;
     }
 }
 #endif
 void IrTransceiver_Init(void)
+{
     IR_TIMER_INIT();
     /* Set up transmitter */
     #if defined(__AVR_ATmega88__) || defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__)
     TCCR0A = (0<<COM0A1)|(0<<COM0A0)|(1<<WGM01)|(0<<WGM00);
     TCCR0B = (0<<WGM02)|(1<<CS00)|(0<<CS01)|(0<<CS02);
-    /* set up modulation frequency to 38kHz */
+    /* Set up modulation frequency */
-    IR_MODULATION_REG = (((F_CPU/2000)/38) -1);
+    IR_MODULATION_REG = (((F_CPU / 2000) / drvIrTxModFreqkHz) - 1);
     /* start pwm generator */
     TCCR0A |= (1<<COM0A0);
     #endif
         drvIrTxChannel[channel].enable = TRUE;
         drvIrTxChannel[channel].timeoutEnable = FALSE;
+    }
+}
-void IrTransceiver_Transmit(uint8_t channel, uint16_t *buffer, uint8_t start, uint8_t length)
+int IrTransceiver_Transmit(uint8_t channel, uint16_t *buffer, uint8_t start, uint8_t length, uint16_t modfreqkHz)
+{
+    if (modfreqkHz == 0) {
+        /* Invalid frequency. */
-    uint16_t diff;
+        return -1;
+    }
+    if (length == 0) {
-    uint8_t findchannel;
+        /* No data. */
+        return -2;
+    }
+    if (drvIrTxChannel[channel].timeoutEnable == TRUE) {
+        /* Channel busy. */
+        return -3;
+    }
+    /* New modulation frequency. */
+    if (modfreqkHz != drvIrTxModFreqkHz) {
+        /* Check that no transmissions are ongoing. */
+        for (uint8_t i = 0; i < IR_SUPPORTED_NUM_CHANNELS; i++) {
+            /* Channel is waiting for an overflow. */
+            if (drvIrTxChannel[i].timeoutEnable == TRUE) {
+                /* Transmission active. */
+                return -4;
+            }
+        }
+    }
+    /* Update modulation frequency. */
+    drvIrTxModFreqkHz = modfreqkHz;
-    if (length > 0)
-    {
-        if (drvIrTxChannel[channel].timeoutEnable == FALSE)
+    /* Start new transmission. */
-        {
-            drvIrTxChannel[channel].timeoutEnable = TRUE;
+    drvIrTxChannel[channel].timeoutEnable = TRUE;
-            drvIrTxChannel[channel].txbuf = buffer;
+    drvIrTxChannel[channel].txbuf = buffer;
-            drvIrTxChannel[channel].txlen = start+length;
+    drvIrTxChannel[channel].txlen = start + length;
-            /* first value will be loaded directly to timer below, therefore index is set to 1 here */
+    /* first value will be loaded directly to timer below, therefore index is set to 1 here */
-            drvIrTxChannel[channel].txindex = 1+start;
+    drvIrTxChannel[channel].txindex = 1 + start;
-            drvIrTxChannel[channel].timeout = IR_COUNT_REG + drvIrTxChannel[channel].txbuf[start];
+    drvIrTxChannel[channel].timeout = IR_COUNT_REG + drvIrTxChannel[channel].txbuf[start];
-            findchannel = 0;
-            diff = 0xffff;
-            uint16_t time = IR_COMPARE_REG;
-            /* go through all channels and find the one that have the next overflow */
+    /* go through all channels and find the one that have the next overflow */
+    uint8_t nextChannel = 0;
+    uint16_t timeRemaining = 0xffff;
+    uint16_t timeNow = IR_COMPARE_REG;
-            for (uint8_t i=0; i < IR_SUPPORTED_NUM_CHANNELS; i++)
+    for (uint8_t i = 0; i < IR_SUPPORTED_NUM_CHANNELS; i++)
+    {
-                /* if channel is waiting for an overflow */
+        /* channel is not waiting for an overflow */
-                if (drvIrTxChannel[i].timeoutEnable==TRUE)
+        if (drvIrTxChannel[i].timeoutEnable == FALSE) continue;
-                {
-                    if (drvIrTxChannel[i].timeout - time < diff)    // || (timeout - time > 0xffff-IR_MAX_PULSE_WIDTH)
+        if (drvIrTxChannel[i].timeout - timeNow < timeRemaining)    // || (timeout - time > 0xffff-IR_MAX_PULSE_WIDTH)
-                    {
+        {
-                        diff = drvIrTxChannel[i].timeout - time;
+            timeRemaining = drvIrTxChannel[i].timeout - timeNow;
-                        findchannel = i;
+            nextChannel = i;
-                    }
+        }
+    }
-            /* set compare value to the channel that have the next overflow */
+    /* set compare value to the channel that have the next overflow */
-            IR_COMPARE_REG = drvIrTxChannel[findchannel].timeout;
+    IR_COMPARE_REG = drvIrTxChannel[nextChannel].timeout;
+    /* set up modulation frequency */
+    IR_MODULATION_REG = (((F_CPU / 2000) / drvIrTxModFreqkHz) - 1);
-            /* Start send on pin */
+    /* Start send on pin */
-            IR_OUTP_HIGH();
+    IR_OUTP_HIGH();
-            /* enable overflow interrupt */
+    /* enable overflow interrupt */
-            IR_UNMASK_COMPARE();
+    IR_UNMASK_COMPARE();
-        }
-    }
+}
 #endif

Subversion Repositories HomeAutomation

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