WebSVN – HomeAutomation – Diff – /trunk/EmbeddedSoftware/AVR/module/sns_irTransceive/sns_irTransceive.c

 #include "sns_irTransceive.h"
+#if IR_RX_ENABLE==1
 struct {
     uint8_t             state;
     uint8_t             newData;
-    uint16_t            rxbuf[MAX_NR_TIMES];
+    uint16_t            *rxbuf;
     uint8_t             rxlen;
     uint8_t             timerNum;
     Ir_Protocol_Data_t  proto;
 } irRxChannel[sns_irTransceive_SUPPORTED_NUM_CHANNELS];
+#endif
+uint16_t    buf0[MAX_NR_TIMES];
+uint16_t    buf1[MAX_NR_TIMES];
+uint16_t    buf2[MAX_NR_TIMES];
 StdCan_Msg_t        irTxMsg;
 #if (sns_irTransceive_SEND_DEBUG==1)
 void send_debug(uint16_t *buffer, uint8_t len) {
+        }
         /* buffers will be filled when sending more than 2-3 messages, so retry until sent */
         while (StdCan_Put(&dbgIrTxMsg) != StdCan_Ret_OK) {}
         _delay_ms(1);
+    }
 }
 #endif
+#if IR_RX_ENABLE==1
-void sns_irTransceive_RX_done_callback(uint8_t channel, uint16_t* buffer, uint8_t len)
+void sns_irTransceive_RX_done_callback(uint8_t channel, uint16_t *buffer, uint8_t len)
 {
     if (channel < sns_irTransceive_SUPPORTED_NUM_CHANNELS)
     {
         irRxChannel[channel].newData = TRUE;
         irRxChannel[channel].rxlen = len;
+    }
+}
+#endif
+void sns_irTransceive_TX_done_callback(uint8_t channel)
+{
+}
 void sns_irTransceive_Init(void)
+{
 gpio_set_out(EXP_A);
     irTxMsg.Header.Command = CAN_MODULE_CMD_PHYSICAL_IR;
     irTxMsg.Length = 6;
     for (uint8_t i = 0; i < sns_irTransceive_SUPPORTED_NUM_CHANNELS; i++)
+    {
+#if IR_RX_ENABLE==1
         irRxChannel[i].state = sns_irTransceive_STATE_RECEIVING;
         irRxChannel[i].newData = FALSE;
         irRxChannel[i].rxlen = 0;
         irRxChannel[i].proto.timeout=0;
         irRxChannel[i].proto.data=0;
         irRxChannel[i].proto.repeats=0;
         irRxChannel[i].proto.protocol=0;
+#endif
+    }
+#if IR_RX_ENABLE==1
     irRxChannel[0].timerNum=sns_irTransceive_RX0_REPEATE_TIMER;
     irRxChannel[1].timerNum=sns_irTransceive_RX1_REPEATE_TIMER;
     irRxChannel[2].timerNum=sns_irTransceive_RX2_REPEATE_TIMER;
+#endif
     IrTransceiver_Init();
+#if IR_RX_ENABLE==1
+    irRxChannel[0].rxbuf = buf0;
-    IrTransceiver_Init_TX_Channel(0, irRxChannel[0].rxbuf, sns_irTransceive_RX_done_callback, sns_irTransceive_RX0_PCINT, sns_irTransceive_RX0_PIN);
+    IrTransceiver_InitRxChannel(0, irRxChannel[0].rxbuf, sns_irTransceive_RX_done_callback, sns_irTransceive_RX0_PCINT, sns_irTransceive_RX0_PIN);
+#endif
+#if IR_TX_ENABLE==1
+    IrTransceiver_InitTxChannel(0, sns_irTransceive_TX_done_callback, sns_irTransceive_TX0_PIN);
+#endif
+}
 void sns_irTransceive_Process(void)
 {
     uint8_t res;
     for (uint8_t channel=0; channel < sns_irTransceive_SUPPORTED_NUM_CHANNELS; channel++)
     {
 //gpio_toggle_pin(EXP_A);
+#if IR_RX_ENABLE==1
         switch (irRxChannel[channel].state)
+        {
         case sns_irTransceive_STATE_IDLE:
             irRxChannel[channel].state = sns_irTransceive_STATE_START_RECEIVE;
             break;
         case sns_irTransceive_STATE_START_RECEIVE:
-            IrTransceiver_Reset(channel);
+            IrTransceiver_ResetRx(channel);
             cli();
             irRxChannel[channel].newData = FALSE;
             sei();
             irRxChannel[channel].state = sns_irTransceive_STATE_RECEIVING;
             break;
         case sns_irTransceive_STATE_RECEIVING:
             if (irRxChannel[channel].newData == TRUE) {
+                //TODO: move this line to the RX callback
-                IrTransceiver_Disable(channel);
+                IrTransceiver_DisableRx(channel);
                 cli();
                 irRxChannel[channel].newData = FALSE;
                 sei();
                 /* Let protocol driver parse and then send on CAN */
                 uint8_t res2 = parseProtocol(irRxChannel[channel].rxbuf, irRxChannel[channel].rxlen, &irRxChannel[channel].proto);
                 if (res2 == IR_OK && irRxChannel[channel].proto.protocol != IR_PROTO_UNKNOWN) {
                 else if (irRxChannel[channel].proto.protocol == IR_PROTO_UNKNOWN)
+                {
 #if (sns_irTransceive_SEND_DEBUG==1)
                     send_debug(irRxChannel[channel].rxbuf, irRxChannel[channel].rxlen);
                     irRxChannel[channel].proto.timeout=300;
 #endif
                 }
                 /* Enable the receiver again */
-                IrTransceiver_Enable(channel);
+                IrTransceiver_EnableRx(channel);
                 irRxChannel[channel].state = sns_irTransceive_STATE_START_PAUSE;
+            }
             break;
         case sns_irTransceive_STATE_START_PAUSE:
             /* set a timer so we can send release button event when no new IR is arriving */
             Timer_SetTimeout(irRxChannel[channel].timerNum, irRxChannel[channel].proto.timeout, TimerTypeOneShot, 0);
             irRxChannel[channel].state = sns_irTransceive_STATE_PAUSING;
             break;
         case sns_irTransceive_STATE_PAUSING:
             /* reset timer if new IR arrived */
-            if (irRxChannel[channel].newData == TRUE || IrTransceiver_GetStoreEnable(channel) == TRUE) {
+            if (irRxChannel[channel].newData == TRUE || IrTransceiver_GetStoreEnableRx(channel) == TRUE) {
                 cli();
                 irRxChannel[channel].newData = FALSE;
                 sei();
                 Timer_SetTimeout(irRxChannel[channel].timerNum, irRxChannel[channel].proto.timeout, TimerTypeOneShot, 0);
             }
             if (Timer_Expired(irRxChannel[channel].timerNum)) {
                 irRxChannel[channel].state = sns_irTransceive_STATE_START_IDLE;
             }
             break;
         case sns_irTransceive_STATE_START_IDLE:
             if (irRxChannel[channel].proto.protocol != IR_PROTO_UNKNOWN) {
                 /* Send button release command on CAN */
                 irTxMsg.Data[1] = irRxChannel[channel].proto.protocol;
                 irTxMsg.Data[2] = (irRxChannel[channel].proto.data>>24)&0xff;
                 irTxMsg.Data[3] = (irRxChannel[channel].proto.data>>16)&0xff;
                 irTxMsg.Data[4] = (irRxChannel[channel].proto.data>>8)&0xff;
                 irTxMsg.Data[5] = irRxChannel[channel].proto.data&0xff;
                 StdCan_Put(&irTxMsg);
+            }
             irRxChannel[channel].state = sns_irTransceive_STATE_IDLE;
             break;
+        }
+#endif
+    }
+}
 void sns_irTransceive_HandleMessage(StdCan_Msg_t *rxMsg)
+{

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/module/sns_irTransceive/sns_irTransceive.c – Rev 1479 → 1483