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

                 /* 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].proto.modfreq);
+            }
             irTxChannel[channel].state = sns_irTransceive_STATE_TRANSMITTING;
+            break;
+        }
         case sns_irTransceive_STATE_TRANSMITTING:
+        {
             if (irTxChannel[channel].sendComplete == TRUE)
                 if (irTxChannel[channel].sendingPronto)
+                {
                     /* First repeat, or no repeat sequence defined => use last passive time in once seq. */
                     if(irTxChannel[channel].repeatCount == 0 || irTxChannel[channel].repSeqLen == 0)
                     {
                         /* 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;
                     irTxChannel[channel].state = sns_irTransceive_STATE_PAUSING;
+                }
                 else
+                {
                     irTxChannel[channel].state = sns_irTransceive_STATE_START_PAUSE;
                 }
             }
             break;
+        }
         case sns_irTransceive_STATE_START_PAUSE:
+        {
                 irTxChannel[channel].state = sns_irTransceive_STATE_IDLE;
+            }
             break;
+        }
         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:
+    {
         uint8_t channel = rxMsg->Data[0] >> 4;
         /* Sanity check. */
         if (channel >= IR_SUPPORTED_NUM_CHANNELS) {
             /* Invalid channel. Generic error code. */
             pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_ERROR);
             break;
         }
         /* Check channel configuration. */
         if (irTxChannel[channel].state == sns_irTransceive_STATE_DISABLED) {
             /* Not a TX channel. */
             pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_ERROR);
             break;
+        }
         /* Check if channel is busy. */
         if (irTxChannel[channel].state != sns_irTransceive_STATE_IDLE) {
             /* We're already transmitting on this channel. */
             pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_BUSY_CHANNELBUSY);
             break;
         }
         /* Check if format is supported. */
         if ((((uint16_t)(rxMsg->Data[0] & 0x0F) << 8) | (uint16_t)(rxMsg->Data[1])) != 0) {
             /* Invalid pronto format. Generic error code. */
             pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_ERROR);
             break;
         }
         /* Check if any other pronto transmission is ongoing (i.e. if the pronto activeChannel is busy). */
         if (prontoChannelIsAllocated() && irTxChannel[prontoAllocatedTxChannel].state != sns_irTransceive_STATE_IDLE) {
             /* Pronto data is already being transmitted (or prepared) on another channel. */
             pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_BUSY_ALREADYSENDINGPRONTO);
             break;
         /* Extract received data. */
         uint32_t divider = (rxMsg->Data[2] << 8) | (rxMsg->Data[3] << 0);
         if (divider == 0) {
             /* Invalid wFrqDiv value. Generic error code. */
             pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_ERROR);
             break;
+        }
         uint32_t freqkHz = (sns_irTransceive_BaseFrq / (divider*1000));
         if (freqkHz == 0) {
             /* Invalid wFrqDiv value. Generic error code. */
             pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_ERROR);
             break;
         }
         irTxChannel[channel].proto.modfreq = freqkHz;
         /* In case other channels are busy sending with other modfreqs, this will be reported by IrTransceiver_Transmit. */
         /* Convert lenghts to bytes. */
         irTxChannel[channel].onceSeqLen = 2*((((uint16_t)rxMsg->Data[4]) << 8) | (((uint16_t)rxMsg->Data[5]) << 0));
         irTxChannel[channel].repSeqLen = 2*((((uint16_t)rxMsg->Data[6]) << 8) | (((uint16_t)rxMsg->Data[7]) << 0));
         /* Enter prepering pronto state and clear transmit buffer. */
         irTxChannel[channel].state = sns_irTransceive_STATE_PREPARING_PRONTO;
         irTxChannel[channel].txlen = 0;
         irTxChannel[channel].expectedSeqNr = 0;
         prontoAllocatedTxChannel = channel;
     case CAN_MODULE_CMD_IRTRANSCEIVE_IRPRONTOSTOP:
+    {
         /* 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;
+        }
         /* Check channel configuration. */
         if (irTxChannel[channel].state == sns_irTransceive_STATE_DISABLED) {
             /* Not a TX channel. */
             pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_ERROR);
             break;
+        }
         irTxChannel[channel].stopSend = TRUE;
         if (!prontoChannelIsAllocated()) {
             /* Nothing to stop. No pronto TX channel allocated right now. */
             pronto_sendResponse(channel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_ALREADYSTOPPED);
+            irTxChannel[channel].state = sns_irTransceive_STATE_IDLE;
             break;
+        }
         /* State check. If we're not currently transmitting anything, the STOPPED reponse will never occur. */
         if (prontoChannelIsAllocated() &&
             irTxChannel[prontoAllocatedTxChannel].state != sns_irTransceive_STATE_PAUSING &&
             irTxChannel[prontoAllocatedTxChannel].state != sns_irTransceive_STATE_START_PAUSE)
+        {
             /* Nothing to stop. Not in TX state. Respond that we're already stopped. */
             pronto_sendResponse(prontoAllocatedTxChannel, CAN_MODULE_ENUM_IRTRANSCEIVE_IRPRONTORESPONSE_RESPONSE_ALREADYSTOPPED);
+            irTxChannel[channel].state = sns_irTransceive_STATE_IDLE;
             break;
+        }
         /* Is pronto activeChannel active, but wrong channel specified? */
         if (prontoChannelIsAllocated() && prontoAllocatedTxChannel != channel) {

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/module/sns_irTransceive/sns_irTransceive.c – Rev 2040 → 2045