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

 /**
   ******************************************************************************
   * @file    stm32f1xx_hal_uart.c
   * @author  MCD Application Team
-  * @version V1.0.1
+  * @version V1.0.4
-  * @date    31-July-2015
+  * @date    29-April-2016
   * @brief   UART HAL module driver.
   *          This file provides firmware functions to manage the following
   *          functionalities of the Universal Asynchronous Receiver Transmitter (UART) peripheral:
   *           + 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.
     in asynchronous mode.
       (+) For the asynchronous mode only these parameters can be configured:
         (++) Baud Rate
         (++) Word Length
         (++) Stop Bit
-        (++) 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 UART frame formats are as listed in the following table:
-        (+++)    +-------------------------------------------------------------+
-        (+++)    |   M bit |  PCE bit  |            UART 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 |     |
-        (+++)    +-------------------------------------------------------------+
         (++) Hardware flow control
         (++) Receiver/transmitter modes
     [..]
     The HAL_UART_Init(), HAL_HalfDuplex_Init(), HAL_LIN_Init() and HAL_MultiProcessor_Init() APIs
     follow respectively the UART asynchronous, UART Half duplex, LIN and Multi-Processor
 @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 UART frame formats are as listed in the following table:
+    +-------------------------------------------------------------+
+    |   M bit |  PCE bit  |            UART 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 UART mode according to the specified parameters in
   *         the UART_InitTypeDef and create the associated handle.
   * @param  huart: Pointer to a UART_HandleTypeDef structure that contains
   *                the configuration information for the specified UART module.
   *                the configuration information for the specified UART module.
   * @retval None
   */
  __weak void HAL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(huart);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_UART_MspInit can be implemented in the user file
    */
+}
   *                the configuration information for the specified UART module.
   * @retval None
   */
  __weak void HAL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(huart);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_UART_MspDeInit can be implemented in the user file
    */
+}
+    }
     /* Process Unlocked */
     __HAL_UNLOCK(huart);
-    /* Enable the UART Error Interrupt: (Frame error, noise error, overrun error) */
-    __HAL_UART_ENABLE_IT(huart, UART_IT_ERR);
     /* Enable the UART Transmit data register empty Interrupt */
     __HAL_UART_ENABLE_IT(huart, UART_IT_TXE);
     return HAL_OK;
+  }
   tmp_flag = __HAL_UART_GET_FLAG(huart, UART_FLAG_PE);
   tmp_it_source = __HAL_UART_GET_IT_SOURCE(huart, UART_IT_PE);
   /* UART parity error interrupt occurred ------------------------------------*/
   if((tmp_flag != RESET) && (tmp_it_source != RESET))
+  {
-    __HAL_UART_CLEAR_PEFLAG(huart);
     huart->ErrorCode |= HAL_UART_ERROR_PE;
+  }
   tmp_flag = __HAL_UART_GET_FLAG(huart, UART_FLAG_FE);
   tmp_it_source = __HAL_UART_GET_IT_SOURCE(huart, UART_IT_ERR);
   /* UART frame error interrupt occurred -------------------------------------*/
   if((tmp_flag != RESET) && (tmp_it_source != RESET))
+  {
-    __HAL_UART_CLEAR_FEFLAG(huart);
     huart->ErrorCode |= HAL_UART_ERROR_FE;
+  }
   tmp_flag = __HAL_UART_GET_FLAG(huart, UART_FLAG_NE);
   /* UART noise error interrupt occurred -------------------------------------*/
   if((tmp_flag != RESET) && (tmp_it_source != RESET))
+  {
-    __HAL_UART_CLEAR_NEFLAG(huart);
     huart->ErrorCode |= HAL_UART_ERROR_NE;
+  }
   tmp_flag = __HAL_UART_GET_FLAG(huart, UART_FLAG_ORE);
   /* UART Over-Run interrupt occurred ----------------------------------------*/
   if((tmp_flag != RESET) && (tmp_it_source != RESET))
+  {
-    __HAL_UART_CLEAR_OREFLAG(huart);
     huart->ErrorCode |= HAL_UART_ERROR_ORE;
+  }
   tmp_flag = __HAL_UART_GET_FLAG(huart, UART_FLAG_RXNE);
   tmp_it_source = __HAL_UART_GET_IT_SOURCE(huart, UART_IT_RXNE);
     UART_EndTransmit_IT(huart);
+  }
   if(huart->ErrorCode != HAL_UART_ERROR_NONE)
+  {
+    /* Clear all the error flag at once */
+    __HAL_UART_CLEAR_PEFLAG(huart);
     /* Set the UART state ready to be able to start again the process */
     huart->State = HAL_UART_STATE_READY;
     HAL_UART_ErrorCallback(huart);
+  }
   *                the configuration information for the specified UART module.
   * @retval None
   */
  __weak void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(huart);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_UART_TxCpltCallback can be implemented in the user file
    */
+}
   *                the configuration information for the specified UART module.
   * @retval None
   */
  __weak void HAL_UART_TxHalfCpltCallback(UART_HandleTypeDef *huart)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(huart);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_UART_TxHalfCpltCallback can be implemented in the user file
    */
+}
   *                the configuration information for the specified UART module.
   * @retval None
   */
 __weak void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(huart);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_UART_RxCpltCallback can be implemented in the user file
    */
+}
   *                the configuration information for the specified UART module.
   * @retval None
   */
 __weak void HAL_UART_RxHalfCpltCallback(UART_HandleTypeDef *huart)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(huart);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_UART_RxHalfCpltCallback can be implemented in the user file
    */
+}
   *                the configuration information for the specified UART module.
   * @retval None
   */
  __weak void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(huart);
   /* NOTE: This function should not be modified, when the callback is needed,
            the HAL_UART_ErrorCallback can be implemented in the user file
    */
+}
+  {
     huart->State = HAL_UART_STATE_BUSY_RX;
+  }
   else
+  {
-    /* Disable the UART Error Interrupt: (Frame error, noise error, overrun error) */
-    __HAL_UART_DISABLE_IT(huart, UART_IT_ERR);
     huart->State = HAL_UART_STATE_READY;
+  }
   HAL_UART_TxCpltCallback(huart);

Subversion Repositories DashDisplay

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