WebSVN – DashDisplay – Diff – /trunk/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c

 /**
   ******************************************************************************
   * @file    stm32f1xx_hal_irda.c
   * @author  MCD Application Team
-  * @version V1.0.1
+  * @version V1.0.4
-  * @date    31-July-2015
+  * @date    29-April-2016
   * @brief   IRDA HAL module driver.
   *          This file provides firmware functions to manage the following
   *          functionalities of the IrDA SIR ENDEC block (IrDA):
   *           + Initialization and de-initialization functions
   *           + IO operation functions
   @endverbatim
   ******************************************************************************
   * @attention
+  *
-  * <h2><center>&copy; COPYRIGHT(c) 2015 STMicroelectronics</center></h2>
+  * <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
+  *
   * Redistribution and use in source and binary forms, with or without modification,
   * are permitted provided that the following conditions are met:
   *   1. Redistributions of source code must retain the above copyright notice,
   *      this list of conditions and the following disclaimer.
   This subsection provides a set of functions allowing to initialize the USARTx or the UARTy
   in IrDA mode.
   (+) For the asynchronous mode only these parameters can be configured:
       (++) Baud Rate
       (++) Word Length
-      (++) Parity: If the parity is enabled, then the MSB bit of the data written
+      (++) Parity
-           in the data register is transmitted but is changed by the parity bit.
-           Depending on the frame length defined by the M bit (8-bits or 9-bits),
-           the possible IRDA frame formats are as listed in the following table:
-      (+++)    +-------------------------------------------------------------+
-      (+++)    |   M bit |  PCE bit  |            IRDA frame                 |
-      (+++)    |---------------------|---------------------------------------|
-      (+++)    |    0    |    0      |    | SB | 8 bit data | STB |          |
-      (+++)    |---------|-----------|---------------------------------------|
-      (+++)    |    0    |    1      |    | SB | 7 bit data | PB | STB |     |
-      (+++)    |---------|-----------|---------------------------------------|
-      (+++)    |    1    |    0      |    | SB | 9 bit data | STB |          |
-      (+++)    |---------|-----------|---------------------------------------|
-      (+++)    |    1    |    1      |    | SB | 8 bit data | PB | STB |     |
-      (+++)    +-------------------------------------------------------------+
       (++) Prescaler: A pulse of width less than two and greater than one PSC period(s) may or may
            not be rejected. The receiver set up time should be managed by software. The IrDA physical layer
            specification specifies a minimum of 10 ms delay between transmission and
            reception (IrDA is a half duplex protocol).
       (++) Mode: Receiver/transmitter modes
 @endverbatim
   * @{
   */
+/*
+  Additionnal remark: If the parity is enabled, then the MSB bit of the data written
+                      in the data register is transmitted but is changed by the parity bit.
+                      Depending on the frame length defined by the M bit (8-bits or 9-bits),
+                      the possible IRDA frame formats are as listed in the following table:
+    +-------------------------------------------------------------+
+    |   M bit |  PCE bit  |            IRDA frame                 |
+    |---------------------|---------------------------------------|
+    |    0    |    0      |    | SB | 8 bit data | STB |          |
+    |---------|-----------|---------------------------------------|
+    |    0    |    1      |    | SB | 7 bit data | PB | STB |     |
+    |---------|-----------|---------------------------------------|
+    |    1    |    0      |    | SB | 9 bit data | STB |          |
+    |---------|-----------|---------------------------------------|
+    |    1    |    1      |    | SB | 8 bit data | PB | STB |     |
+    +-------------------------------------------------------------+
+*/
 /**
   * @brief  Initializes the IRDA mode according to the specified
   *         parameters in the IRDA_InitTypeDef and create the associated handle.
   * @param  hirda: Pointer to a IRDA_HandleTypeDef structure that contains
   *                the configuration information for the specified IRDA module.
   *                the configuration information for the specified IRDA module.
   * @retval None
   */
  __weak void HAL_IRDA_MspInit(IRDA_HandleTypeDef *hirda)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(hirda);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_IRDA_MspInit can be implemented in the user file
    */
+}
   *                the configuration information for the specified IRDA module.
   * @retval None
   */
  __weak void HAL_IRDA_MspDeInit(IRDA_HandleTypeDef *hirda)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(hirda);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_IRDA_MspDeInit can be implemented in the user file
    */
+}
+    }
     /* Process Unlocked */
     __HAL_UNLOCK(hirda);
-    /* Enable the IRDA Error Interrupt: (Frame error, noise error, overrun error) */
-    __HAL_IRDA_ENABLE_IT(hirda, IRDA_IT_ERR);
     /* Enable the IRDA Transmit Data Register Empty Interrupt */
     __HAL_IRDA_ENABLE_IT(hirda, IRDA_IT_TXE);
     return HAL_OK;
+  }
   tmp_flag = __HAL_IRDA_GET_FLAG(hirda, IRDA_FLAG_PE);
   tmp_it_source = __HAL_IRDA_GET_IT_SOURCE(hirda, IRDA_IT_PE);
   /* IRDA parity error interrupt occurred -----------------------------------*/
   if((tmp_flag != RESET) && (tmp_it_source != RESET))
+  {
-    __HAL_IRDA_CLEAR_PEFLAG(hirda);
     hirda->ErrorCode |= HAL_IRDA_ERROR_PE;
+  }
   tmp_flag = __HAL_IRDA_GET_FLAG(hirda, IRDA_FLAG_FE);
   tmp_it_source = __HAL_IRDA_GET_IT_SOURCE(hirda, IRDA_IT_ERR);
   /* IRDA frame error interrupt occurred ------------------------------------*/
   if((tmp_flag != RESET) && (tmp_it_source != RESET))
+  {
-    __HAL_IRDA_CLEAR_FEFLAG(hirda);
     hirda->ErrorCode |= HAL_IRDA_ERROR_FE;
+  }
   tmp_flag = __HAL_IRDA_GET_FLAG(hirda, IRDA_FLAG_NE);
   /* IRDA noise error interrupt occurred ------------------------------------*/
   if((tmp_flag != RESET) && (tmp_it_source != RESET))
+  {
-    __HAL_IRDA_CLEAR_NEFLAG(hirda);
     hirda->ErrorCode |= HAL_IRDA_ERROR_NE;
+  }
   tmp_flag = __HAL_IRDA_GET_FLAG(hirda, IRDA_FLAG_ORE);
   /* IRDA Over-Run interrupt occurred ---------------------------------------*/
   if((tmp_flag != RESET) && (tmp_it_source != RESET))
+  {
-    __HAL_IRDA_CLEAR_OREFLAG(hirda);
     hirda->ErrorCode |= HAL_IRDA_ERROR_ORE;
+  }
   /* Call the Error call Back in case of Errors */
   if(hirda->ErrorCode != HAL_IRDA_ERROR_NONE)
     /* Disable PE and ERR interrupt */
     __HAL_IRDA_DISABLE_IT(hirda, IRDA_IT_ERR);
     __HAL_IRDA_DISABLE_IT(hirda, IRDA_IT_PE);
     __HAL_IRDA_DISABLE_IT(hirda, IRDA_IT_TXE);
+    /* Clear all the error flag at once */
+    __HAL_IRDA_CLEAR_PEFLAG(hirda);
     /* Set the IRDA state ready to be able to start again the process */
     hirda->State = HAL_IRDA_STATE_READY;
     HAL_IRDA_ErrorCallback(hirda);
+  }
   *                the configuration information for the specified IRDA module.
   * @retval None
   */
  __weak void HAL_IRDA_TxCpltCallback(IRDA_HandleTypeDef *hirda)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(hirda);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_IRDA_TxCpltCallback can be implemented in the user file
    */
+}
   *                the configuration information for the specified USART module.
   * @retval None
   */
  __weak void HAL_IRDA_TxHalfCpltCallback(IRDA_HandleTypeDef *hirda)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(hirda);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_IRDA_TxHalfCpltCallback can be implemented in the user file
    */
+}
   *                the configuration information for the specified IRDA module.
   * @retval None
   */
 __weak void HAL_IRDA_RxCpltCallback(IRDA_HandleTypeDef *hirda)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(hirda);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_IRDA_RxCpltCallback can be implemented in the user file
    */
+}
   *                the configuration information for the specified IRDA module.
   * @retval None
   */
 __weak void HAL_IRDA_RxHalfCpltCallback(IRDA_HandleTypeDef *hirda)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(hirda);
   /* NOTE : This function should not be modified, when the callback is needed,
             the HAL_IRDA_RxHalfCpltCallback can be implemented in the user file
    */
+}
   *                the configuration information for the specified IRDA module.
   * @retval None
   */
  __weak void HAL_IRDA_ErrorCallback(IRDA_HandleTypeDef *hirda)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(hirda);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_IRDA_ErrorCallback can be implemented in the user file
    */
+}
+      }
+    }
     if(--hirda->RxXferCount == 0)
+    {
       __HAL_IRDA_DISABLE_IT(hirda, IRDA_IT_RXNE);
       if(hirda->State == HAL_IRDA_STATE_BUSY_TX_RX)
+      {
         hirda->State = HAL_IRDA_STATE_BUSY_TX;
+      }
       else
+      {
+        /* Disable the IRDA Error Interrupt: (Frame error, noise error, overrun error) */
+        __HAL_IRDA_DISABLE_IT(hirda, IRDA_IT_ERR);
         /* Disable the IRDA Parity Error Interrupt */
         __HAL_IRDA_DISABLE_IT(hirda, IRDA_IT_PE);
-        /* Disable the IRDA Error Interrupt: (Frame error, noise error, overrun error) */
-        __HAL_IRDA_DISABLE_IT(hirda, IRDA_IT_ERR);
         hirda->State = HAL_IRDA_STATE_READY;
+      }
       HAL_IRDA_RxCpltCallback(hirda);

Subversion Repositories DashDisplay

(root)/trunk/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c – Rev 2 → 5