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

     uint8_t             timerNum;
     uint8_t             repeatCount;
     Ir_Protocol_Data_t  proto;
     uint8_t             stopSend;
     uint8_t             sendComplete;
+    // pronto params
+    uint8_t             onceSeqLen;
+    uint8_t             repSeqLen;
+    uint8_t             numberOfRepeats;
 } irTxChannel[IR_SUPPORTED_NUM_CHANNELS];
 #endif
 uint16_t    buf[IR_SUPPORTED_NUM_CHANNELS][MAX_NR_TIMES];
 #endif
 #define sns_irTransceive_BaseFrq (4145146ULL)
 #ifndef sns_irTransceive_PRONTO_SUPPORT
-#define sns_irTransceive_PRONTO_SUPPORT 0
+#define sns_irTransceive_PRONTO_SUPPORT 1
 #endif
 #if sns_irTransceive_PRONTO_SUPPORT==1
 volatile uint32_t sns_irTransceive_LastPronto=0;
+static uint8_t activeChannel = 0;
 #define sns_irTransceive_MAXTIMING (16*1000)
 void send_pronto(uint16_t *buffer, uint8_t len, uint8_t channel, uint8_t modfreq) {
     StdCan_Msg_t msg;
     while (StdCan_Put(&msg) != StdCan_Ret_OK) {}
     _delay_ms(1);
     /* Send pronto data */
-    uint16_t divider = (1000000ULL*modfreq/sns_irTransceive_BaseFrq);
+    uint16_t divider = ((1000000ULL*modfreq)/sns_irTransceive_BaseFrq);
     msg.Header.Command = CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA1;
     /* Counter for buffer */
     uint8_t i = 0;
     /* Counter for filling can frame data */
     uint8_t j = 0;
     if (    StdCan_Ret_class(rxMsg->Header) == CAN_MODULE_CLASS_SNS &&
         StdCan_Ret_direction(rxMsg->Header) == DIRECTIONFLAG_TO_OWNER &&
         rxMsg->Header.ModuleType == CAN_MODULE_TYPE_SNS_IRTRANSCEIVE &&
         rxMsg->Header.ModuleId == sns_irTransceive_ID)
+    {
-        uint8_t channel;
-        uint8_t length = rxMsg->Length;
+        //printf("CMD= %u", rxMsg->Header.Command);
         switch (rxMsg->Header.Command)
+        {
 #if IR_TX_ENABLE==1
-        case CAN_MODULE_CMD_PHYSICAL_IR:
+        case CAN_MODULE_CMD_PHYSICAL_IR: {
-            channel = rxMsg->Data[0]>>4;
+            uint8_t channel = rxMsg->Data[0]>>4;
             if ((0xf&rxMsg->Data[0]) == CAN_MODULE_ENUM_PHYSICAL_IR_STATUS_PRESSED && channel < IR_SUPPORTED_NUM_CHANNELS)
+            {
                 if (irTxChannel[channel].state == sns_irTransceive_STATE_IDLE)
+                {
                     irTxChannel[channel].proto.protocol = rxMsg->Data[1];
+                {
                     irTxChannel[channel].stopSend = TRUE;
+                }
+            }
             break;
+        }
         /* TODO: add struct which stores pronto info:
         channel, pronto receive state, buffer length of once burst pairs, buffer length of repeat burst pairs */
-        case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOSTART:
+        case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOSTART: {
+            uint8_t channel = rxMsg->Data[0]>>4;
+            if (channel >= IR_SUPPORTED_NUM_CHANNELS) {
+                // invalid channel
+                break;
+            }
+            if (irTxChannel[channel].state != sns_irTransceive_STATE_IDLE) {
+                // busy
+                break;
+            }
             /* TODO: check pronto state, response is different if already sending data */
-            if (((rxMsg->Data[0]&0xf) == 0) && rxMsg->Data[1] == 0)
+            uint16_t format = (uint16_t)(rxMsg->Data[0] & 0x0F) << 8 | (uint16_t)(rxMsg->Data[1]);
+            if (format != 0) {
+                // unsupported format
+                break;
-            {
+            }
-                uint8_t channel = (rxMsg->Data[0]>>4)&0xf;
+            irTxChannel[channel].state = sns_irTransceive_STATE_TRANSMIT_PREPARING_PRONTO;
-                /* TODO: add channel to pronto struct */
+            //irTxChannel[channel].modfreq = rxMsg->Data[2];
-                /* TODO: find freqdiv, number of once burst pairs, number of repeat burst pairs */
+            irTxChannel[channel].modfreq = (((F_CPU/2000)/IR_NEC_F_MOD) -1); // for testing
+            irTxChannel[channel].proto.modfreq = (((F_CPU/2000)/IR_NEC_F_MOD) -1);
-                uint8_t modfreq;
+            irTxChannel[channel].proto.timeout = 40;
-                uint8_t oncebursts;
+            irTxChannel[channel].proto.repeats = 1;
-                uint8_t repeatbursts;
+            irTxChannel[channel].onceSeqLen = rxMsg->Data[3];
-                /* TODO: add to pronto struct */
+            irTxChannel[channel].repSeqLen = rxMsg->Data[4];
-            }
+            activeChannel = channel;
             /* TODO: Send response frame */
             break;
+        }
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOSTOP:
             /* TODO: stop sending IR */
             /* TODO: Send response frame */
             break;
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOCONTINUE:
             /* TODO: reset timeout to continue sending repeat sequences */
             /* TODO: Send response frame */
             break;
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA1:  /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA2:  /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA3:  /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA4:  /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA5:  /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA11: /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA12: /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA13: /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA14: /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA15: /* Fall through */
-        case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA16: /* Fall through */
+        case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA16: {
-            ; /* Added to avoid compilation error "a label can only be part of a statement ..." */
-            uint8_t dataindex = rxMsg->Header.Command - CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA1;
-            for (uint8_t i=0; i<length; i++)
-            {
-                /* TODO: pack data into buffer irTxChannel[channel].txbuf */
+            if (activeChannel>=IR_SUPPORTED_NUM_CHANNELS) {
-            }
-            break;
+                break;
+            }
+            if (irTxChannel[activeChannel].state!=sns_irTransceive_STATE_TRANSMIT_PREPARING_PRONTO) {
+                // invalid state
+                break;
+            }
+            if ((uint16_t)irTxChannel[activeChannel].txlen+(uint16_t)rxMsg->Length >= MAX_NR_TIMES) {
+                // too long
+                break;
+            }
+            for (uint8_t i=0; i<rxMsg->Length; i++) {
+                // TODO: (109 * 1) / (4.145146 MHz) = 27, fix formula with modfreq
+                irTxChannel[activeChannel].txbuf[irTxChannel[activeChannel].txlen++] = 27*rxMsg->Data[i];
+            }
+            break;
+        }
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND1:   /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND2:   /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND3:   /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND4:   /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND5:   /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND12:  /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND13:  /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND14:  /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND15:  /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND16:  /* Fall through */
-        case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND17:  /* Fall through */
+        case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND17: {
+            if (activeChannel>=IR_SUPPORTED_NUM_CHANNELS) {
+                break;
+            }
+            if (irTxChannel[activeChannel].state!=sns_irTransceive_STATE_TRANSMIT_PREPARING_PRONTO) {
+                // invalid state
+                break;
+            }
+            if ((uint16_t)irTxChannel[activeChannel].txlen + (uint16_t)(rxMsg->Length-1) >= MAX_NR_TIMES) {
+                // too long
+                break;
+            }
-            ; /* Added to avoid compilation error "a label can only be part of a statement ..." */
+            // end packet does not always contain data, last byte is reserved
+            for (uint8_t i=0; i<rxMsg->Length-1; i++) {
+                // TODO: (109 * 1) / (4.145146 MHz) = 27, fix formula with modfreq
+                irTxChannel[activeChannel].txbuf[irTxChannel[activeChannel].txlen++] = 27*rxMsg->Data[i];
+            }
+            // last byte tells what to do with IR data (nr of repeats)
-            uint8_t endindex = rxMsg->Header.Command - CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND1;
+            irTxChannel[activeChannel].numberOfRepeats = rxMsg->Data[rxMsg->Length-1];
+            // send
-            /* TODO: pack data, if any, into buffer irTxChannel[channel].txbuf */
+            IrTransceiver_Transmit(activeChannel, irTxChannel[activeChannel].txbuf, 0, irTxChannel[activeChannel].txlen);
+            irTxChannel[activeChannel].state = sns_irTransceive_STATE_TRANSMITTING;
-            /* TODO: Last byte contains once/repeat information */
+            printf("SEND:%03u", irTxChannel[activeChannel].txlen);
             /* TODO: Send response frame */
-            /* TODO: start transmitt ir! */
             break;
+        }
 /* TODO: In IR state machine add sending a response frame when ir stops sending, also implement pronto repeat */
 #endif
-        case CAN_MODULE_CMD_IRTRANSCEIVE_IRCONFIG:
+        case CAN_MODULE_CMD_IRTRANSCEIVE_IRCONFIG: {
-            channel = rxMsg->Data[0]>>4;
+            uint8_t channel = rxMsg->Data[0]>>4;
             uint8_t config = rxMsg->Data[0] & 0x0f;
             uint8_t power = rxMsg->Data[1]>>6;
             uint8_t modfreq = rxMsg->Data[2];
             sns_irTransceive_setConfig(channel, config, power, modfreq);
+                }
                 EEDATA_UPDATE_CRC;
+            }
 #endif
             break;
+        }
         default:
             break;
+        }

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/module/sns_irTransceive/sns_irTransceive.c – Rev 1829 → 1830