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

             /* Start IR transmission. */
             IrTransceiver_Transmit(channel, irTxChannel[channel].txbuf, 0, irTxChannel[channel].onceSeqLen - 1);
             /* Enter transmitting state. */
             irTxChannel[channel].sendingPronto = TRUE;
+            irTxChannel[channel].stopSend = FALSE;
             irTxChannel[channel].state = sns_irTransceive_STATE_TRANSMITTING;
             break;
         }
         case sns_irTransceive_STATE_PRONTO_REPEAT:
+        {
             /* Check if done. */
             if ((irTxChannel[channel].repeatCount >= irTxChannel[channel].proto.repeats && irTxChannel[channel].proto.repeats != 0xFF) || irTxChannel[channel].stopSend) {
                 /* Pronto transmission was stopped/completed */
                 /* Use once seq */
                 /* Don't transmit last passive. last passive handled by timer */
                 IrTransceiver_Transmit(channel, irTxChannel[channel].txbuf, 0, irTxChannel[channel].txlen - 1);
+            }
             irTxChannel[channel].state = sns_irTransceive_STATE_TRANSMITTING;
         }
         case sns_irTransceive_STATE_TRANSMITTING:
+        {
             if (irTxChannel[channel].sendComplete == TRUE)
+            {
                         /* Use last passive time as timeout */
                         uint16_t lastPasTime = irTxChannel[channel].txbuf[irTxChannel[channel].onceSeqLen - 1] / 1000;
                         Timer_SetTimeout(irTxChannel[channel].timerNum, lastPasTime==0 ? 1 : lastPasTime, TimerTypeOneShot, 0);
+                    }
                     /* Second, or later repeat => use last passive time in repeat seq */
                     else
+                    {
                         /* Use last passive time as timeout */
                         uint16_t lastPasTime = irTxChannel[channel].txbuf[irTxChannel[channel].txlen - 1]  / 1000;
                         Timer_SetTimeout(irTxChannel[channel].timerNum, lastPasTime==0 ? 1 : lastPasTime, TimerTypeOneShot, 0);
+                    }
+                }
                 else
+                {
                     irTxChannel[channel].state = sns_irTransceive_STATE_START_PAUSE;
+                }
             }
             break;
         }
         case sns_irTransceive_STATE_START_PAUSE:
+        {
             if (irTxChannel[channel].repeatCount < irTxChannel[channel].proto.repeats)
             {
                 irTxChannel[channel].repeatCount++;
             }
             Timer_SetTimeout(irTxChannel[channel].timerNum, irTxChannel[channel].proto.timeout, TimerTypeOneShot, 0);
             if (irTxChannel[channel].proto.framecnt != 255)
             {
                 irTxChannel[channel].proto.framecnt++;
+            }
             irTxChannel[channel].state = sns_irTransceive_STATE_PAUSING;
             break;
+        }
         case sns_irTransceive_STATE_PAUSING:
+        {
             if (irTxChannel[channel].sendingPronto)
             {
                 if (Timer_Expired(irTxChannel[channel].timerNum))
+                {
                     irTxChannel[channel].state = sns_irTransceive_STATE_PRONTO_REPEAT;
                 }
                 break;
             }
             if (Timer_Expired(irTxChannel[channel].timerNum))
+            {
                 irTxChannel[channel].state = sns_irTransceive_STATE_START_TRANSMIT;
+            }
                 /* TODO: Not sure we want this response when sending non-pronto data, but probably doesn't hurt? /jm */
                 pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_STOPPED);
                 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;
         default:
             break;
+        }
 #endif
-    }
+    }
+}
 /* Handle incoming CAN data */
 void sns_irTransceive_HandleMessage(StdCan_Msg_t *rxMsg)
 {
     /* Sanity check. */
     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) return;
     switch (rxMsg->Header.Command)
+    {
 #if IR_TX_ENABLE==1
     case CAN_MODULE_CMD_PHYSICAL_IR:
     {
         /* Get IR channel. */
         uint8_t channel = rxMsg->Data[0] >> 4;
         /* Sanity check. */
         if (channel >= IR_SUPPORTED_NUM_CHANNELS) {
             /* Invalid channel */
             break;
+        }
         if ((0xf&rxMsg->Data[0]) == CAN_MODULE_ENUM_PHYSICAL_IR_STATUS_PRESSED)
         {
             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];
                 irTxChannel[channel].state = sns_irTransceive_STATE_START_TRANSMIT;
+            }
+        }
         else if ((0xf&rxMsg->Data[0]) == CAN_MODULE_ENUM_PHYSICAL_IR_STATUS_RELEASED)
         {
             if (irTxChannel[channel].state != sns_irTransceive_STATE_IDLE)
+            {
                 irTxChannel[channel].stopSend = TRUE;
+            }
+        }
         break;
+    }
 #if sns_irTransceive_PRONTO_SUPPORT==1
     case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOSTART:
     {
         /* Get IR channel. */
         uint8_t channel = rxMsg->Data[0] >> 4;
         /* Sanity check. */
         if (channel >= IR_SUPPORTED_NUM_CHANNELS) {
             /* Invalid channel */
             pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_ERROR);
             break;
+        }
         if (irTxChannel[channel].state != sns_irTransceive_STATE_IDLE) {
             /* We're already transmitting on this channel */
             pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_ERROR);
             break;
+        }
         irTxChannel[channel].stopSend = TRUE;
+        /* State check. If we're not currently transmitting anything, the STOPPED reponse will never occur. */
+        /* TODO: better way to check this? /jm */
+        if (irTxChannel[activeChannel].state != sns_irTransceive_STATE_START_TRANSMIT_PRONTO &&
+            irTxChannel[activeChannel].state != sns_irTransceive_STATE_TRANSMITTING &&
+            irTxChannel[activeChannel].state != sns_irTransceive_STATE_PRONTO_REPEAT &&
+            irTxChannel[activeChannel].state != sns_irTransceive_STATE_PAUSING &&
+            irTxChannel[activeChannel].state != sns_irTransceive_STATE_START_PAUSE)
+        {
+            /* Nothing to stop. Not in TX state. Respond that we're already stopped */
+            pronto_sendResponse(activeChannel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_ALREADYSTOPPED);
+            break;
+        }
         /* Response will be sent when transmission has been completed (i.e. stopped) */
         break;
+    }

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/module/sns_irTransceive/sns_irTransceive.c – Rev 1856 → 1858