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

     uint8_t             repeatCount;
     Ir_Protocol_Data_t  proto;
     uint8_t             stopSend;
     uint8_t             sendComplete;
     // pronto params
+    uint8_t             sendingPronto;
     uint8_t             onceSeqLen;
     uint8_t             repSeqLen;
     uint8_t             numberOfRepeats;
 } irTxChannel[IR_SUPPORTED_NUM_CHANNELS];
 #endif
+            {
                 irTxChannel[channel].state = sns_irTransceive_STATE_IDLE;
+            }
             break;
-        case sns_irTransceive_STATE_TRANSMIT_START_TRANSMIT_PRONTO:
+        case sns_irTransceive_STATE_START_TRANSMIT_PRONTO:
             IrTransceiver_Transmit(channel, irTxChannel[channel].txbuf, 0, irTxChannel[channel].txlen);
             irTxChannel[channel].state = sns_irTransceive_STATE_TRANSMITTING;
+            irTxChannel[channel].sendingPronto = TRUE;
             break;
         case sns_irTransceive_STATE_TRANSMITTING:
             if (irTxChannel[channel].sendComplete == TRUE)
+            {
             break;
         case sns_irTransceive_STATE_PAUSING:
             if (Timer_Expired(irTxChannel[channel].timerNum))
+            {
+                if (irTxChannel[channel].sendingPronto) {
-                irTxChannel[channel].state = sns_irTransceive_STATE_START_TRANSMIT;
+                    irTxChannel[channel].state = sns_irTransceive_STATE_START_TRANSMIT_PRONTO;
+                }
+                else {
+                    irTxChannel[channel].state = sns_irTransceive_STATE_START_TRANSMIT;
+                }
+            }
             /* transmission is stopped when such command is recevied on can */
             if (irTxChannel[channel].stopSend == TRUE && irTxChannel[channel].repeatCount >= irTxChannel[channel].proto.repeats)
+            {
                 //TODO maybe send message on can for status? to confirm stopped sending, ready for new command
                 irTxChannel[channel].state = sns_irTransceive_STATE_START_IDLE;
+            }
+            if (irTxChannel[channel].sendingPronto &&  irTxChannel[channel].repeatCount >= irTxChannel[channel].proto.repeats)
+            {
+                irTxChannel[channel].state = sns_irTransceive_STATE_START_IDLE;
+            }
             break;
         case sns_irTransceive_STATE_START_IDLE:
             irTxChannel[channel].stopSend = FALSE;
             irTxChannel[channel].repeatCount = 0;
             irTxChannel[channel].proto.framecnt = 0;
+            irTxChannel[channel].sendingPronto = FALSE;
             irTxChannel[channel].state = sns_irTransceive_STATE_IDLE;
             break;
         default:
     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)
+    {
-        //printf("CMD= %u\n", rxMsg->Header.Command);
         switch (rxMsg->Header.Command)
+        {
 #if IR_TX_ENABLE==1
         case CAN_MODULE_CMD_PHYSICAL_IR: {
             uint8_t channel = rxMsg->Data[0]>>4;
                 if (irTxChannel[channel].state == sns_irTransceive_STATE_IDLE)
+                {
                     irTxChannel[channel].proto.protocol = rxMsg->Data[1];
                     irTxChannel[channel].proto.data = rxMsg->Data[2];
                     irTxChannel[channel].proto.data = irTxChannel[channel].proto.data<<8;
                     irTxChannel[channel].proto.data |= rxMsg->Data[3];
                     irTxChannel[channel].proto.data = irTxChannel[channel].proto.data<<8;
                     irTxChannel[channel].proto.data |= rxMsg->Data[4];
                     irTxChannel[channel].proto.data = irTxChannel[channel].proto.data<<8;
                     irTxChannel[channel].proto.data |= rxMsg->Data[5];
             uint8_t channel = rxMsg->Data[0]>>4;
             if (channel >= IR_SUPPORTED_NUM_CHANNELS) {
                 // invalid channel
                 break;
+            }
+            printf("TxSt=%03d", irTxChannel[channel].state);
             if (irTxChannel[channel].state != sns_irTransceive_STATE_IDLE) {
                 // busy
                 break;
+            }
             if (format != 0) {
                 // unsupported format
                 break;
+            }
-            irTxChannel[channel].state = sns_irTransceive_STATE_TRANSMIT_PREPARING_PRONTO;
+            irTxChannel[channel].state = sns_irTransceive_STATE_PREPARING_PRONTO;
             irTxChannel[channel].txlen = 0;
             //irTxChannel[channel].modfreq = rxMsg->Data[2];
             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);
-            irTxChannel[channel].proto.timeout = 40;
+            irTxChannel[channel].proto.timeout = 100;
-            irTxChannel[channel].proto.repeats = 1;
+            irTxChannel[channel].proto.repeats = 2;
             irTxChannel[channel].onceSeqLen = rxMsg->Data[3];
             irTxChannel[channel].repSeqLen = rxMsg->Data[4];
             activeChannel = channel;
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA15: /* Fall through */
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTODATA16: {
             if (activeChannel>=IR_SUPPORTED_NUM_CHANNELS) {
                 break;
+            }
-            if (irTxChannel[activeChannel].state!=sns_irTransceive_STATE_TRANSMIT_PREPARING_PRONTO) {
+            if (irTxChannel[activeChannel].state!=sns_irTransceive_STATE_PREPARING_PRONTO) {
                 // invalid state
                 break;
+            }
             if ((uint16_t)irTxChannel[activeChannel].txlen+(uint16_t)rxMsg->Length >= MAX_NR_TIMES) {
                 // too long
         case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOEND16:  /* 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) {
+            if (irTxChannel[activeChannel].state!=sns_irTransceive_STATE_PREPARING_PRONTO) {
                 // invalid state
                 break;
+            }
             if ((uint16_t)irTxChannel[activeChannel].txlen + (uint16_t)(rxMsg->Length-1) >= MAX_NR_TIMES) {
                 // too long
+            }
             // last byte tells what to do with IR data (nr of repeats)
             irTxChannel[activeChannel].numberOfRepeats = rxMsg->Data[rxMsg->Length-1];
             // send
-            //IrTransceiver_Transmit(activeChannel, irTxChannel[activeChannel].txbuf, 0, irTxChannel[activeChannel].txlen);
-            irTxChannel[activeChannel].state = sns_irTransceive_STATE_TRANSMIT_START_TRANSMIT_PRONTO;
+            irTxChannel[activeChannel].state = sns_irTransceive_STATE_START_TRANSMIT_PRONTO;
-            //printf("SEND:%03u\n", irTxChannel[activeChannel].txlen);
+            irTxChannel[activeChannel].sendingPronto = TRUE;
             /* TODO: Send response frame */
             break;
+        }

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/module/sns_irTransceive/sns_irTransceive.c – Rev 1833 → 1834