Diff: targets/cmsis/TARGET_STM/TARGET_STM32F0/stm32f0xx_hal_tim_ex.h

Revision:

630:825f75ca301e

Parent:

441:d2c15dda23c1

--- a/targets/cmsis/TARGET_STM/TARGET_STM32F0/stm32f0xx_hal_tim_ex.h	Mon Sep 28 10:30:09 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32F0/stm32f0xx_hal_tim_ex.h	Mon Sep 28 10:45:10 2015 +0100
@@ -2,13 +2,13 @@
   ******************************************************************************
   * @file    stm32f0xx_hal_tim_ex.h
   * @author  MCD Application Team
-  * @version V1.2.0
-  * @date    11-December-2014
+  * @version V1.3.0
+  * @date    26-June-2015
   * @brief   Header file of TIM HAL Extended module.
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
+  * <h2><center>&copy; COPYRIGHT(c) 2015 STMicroelectronics</center></h2>
   *
   * Redistribution and use in source and binary forms, with or without modification,
   * are permitted provided that the following conditions are met:
@@ -33,7 +33,7 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   ******************************************************************************
-  */ 
+  */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32F0xx_HAL_TIM_EX_H
@@ -52,44 +52,45 @@
 
 /** @addtogroup TIMEx
   * @{
-  */ 
+  */
 
-/* Exported types ------------------------------------------------------------*/ 
-/** @defgroup TIMEx_Exported_Types TIMEx Extended Exported Types
+/* Exported types ------------------------------------------------------------*/
+/** @defgroup TIMEx_Exported_Types TIMEx Exported Types
   * @{
   */
 
-/** 
-  * @brief  TIM Hall sensor Configuration Structure definition  
+
+/**
+  * @brief  TIM Hall sensor Configuration Structure definition 
   */
 
 typedef struct
 {
-                                  
+
   uint32_t IC1Polarity;            /*!< Specifies the active edge of the input signal.
                                         This parameter can be a value of @ref TIM_Input_Capture_Polarity */
-                                                                   
+
   uint32_t IC1Prescaler;        /*!< Specifies the Input Capture Prescaler.
                                      This parameter can be a value of @ref TIM_Input_Capture_Prescaler */
-                                  
+
   uint32_t IC1Filter;           /*!< Specifies the input capture filter.
-                                     This parameter can be a number between Min_Data = 0x0 and Max_Data = 0xF */  
-  uint32_t Commutation_Delay;  /*!< Specifies the pulse value to be loaded into the Capture Compare Register. 
-                                    This parameter can be a number between Min_Data = 0x0000 and Max_Data = 0xFFFF */                              
+                                     This parameter can be a number between Min_Data = 0x0 and Max_Data = 0xF */
+  uint32_t Commutation_Delay;  /*!< Specifies the pulse value to be loaded into the Capture Compare Register.
+                                    This parameter can be a number between Min_Data = 0x0000 and Max_Data = 0xFFFF */
 } TIM_HallSensor_InitTypeDef;
 
-/** 
-  * @brief  TIM Master configuration Structure definition  
+/**
+  * @brief  TIM Master configuration Structure definition 
   */ 
 typedef struct {
   uint32_t  MasterOutputTrigger;   /*!< Trigger output (TRGO) selection 
-                                      This parameter can be a value of @ref TIM_Master_Mode_Selection */ 
+                                      This parameter can be a value of @ref TIM_Master_Mode_Selection */
   uint32_t  MasterSlaveMode;       /*!< Master/slave mode selection 
                                       This parameter can be a value of @ref TIM_Master_Slave_Mode */
 }TIM_MasterConfigTypeDef;
 
-/** 
-  * @brief  TIM Break and Dead time configuration Structure definition  
+/**
+  * @brief  TIM Break and Dead time configuration Structure definition 
   */ 
 typedef struct
 {
@@ -98,7 +99,7 @@
   uint32_t OffStateIDLEMode;	    /*!< TIM off state in IDLE mode
                                      This parameter can be a value of @ref TIM_OSSI_Off_State_Selection_for_Idle_mode_state */
   uint32_t LockLevel;             /*!< TIM Lock level
-                                     This parameter can be a value of @ref TIM_Lock_level */                             
+                                     This parameter can be a value of @ref TIM_Lock_level */
   uint32_t DeadTime;              /*!< TIM dead Time 
                                      This parameter can be a number between Min_Data = 0x00 and Max_Data = 0xFF */
   uint32_t BreakState;            /*!< TIM Break State 
@@ -106,18 +107,18 @@
   uint32_t BreakPolarity;         /*!< TIM Break input polarity 
                                      This parameter can be a value of @ref TIM_Break_Polarity */
   uint32_t AutomaticOutput;       /*!< TIM Automatic Output Enable state 
-                                     This parameter can be a value of @ref TIM_AOE_Bit_Set_Reset */           
+                                     This parameter can be a value of @ref TIM_AOE_Bit_Set_Reset */
 } TIM_BreakDeadTimeConfigTypeDef;
 
 /**
   * @}
-  */ 
+  */
 
 /* Exported constants --------------------------------------------------------*/
 /** @defgroup TIMEx_Exported_Constants TIMEx Exported Constants
   * @{
   */
-    
+
 /** @defgroup TIMEx_Remap TIMEx Remap
   * @{
   */
@@ -135,10 +136,10 @@
   * @}
   */
 
-/** @defgroup TIM_Clock_Filter TIM Clock Filter
+/** @defgroup TIMEx_Clock_Filter TIMEx Clock Filter
   * @{
   */
-#define IS_TIM_DEADTIME(DEADTIME)      ((DEADTIME) <= 0xFF) 
+#define IS_TIM_DEADTIME(DEADTIME)      ((DEADTIME) <= 0xFF)          /*!< BreakDead Time */
 /**
   * @}
   */
@@ -154,8 +155,7 @@
   * @{
   */
 
-/** @addtogroup TIMEx_Exported_Functions_Group1 Timer Hall Sensor functions 
- *  @brief    Timer Hall Sensor functions
+/** @addtogroup TIMEx_Exported_Functions_Group1
  * @{
  */
 /*  Timer Hall Sensor functions  **********************************************/
@@ -178,8 +178,7 @@
   * @}
   */
 
-/** @addtogroup TIMEx_Exported_Functions_Group2 Timer Complementary Output Compare functions
- *  @brief   Timer Complementary Output Compare functions
+/** @addtogroup TIMEx_Exported_Functions_Group2
  * @{
  */
 /*  Timer Complementary Output Compare functions  *****************************/
@@ -198,8 +197,7 @@
   * @}
   */
 
-/** @addtogroup TIMEx_Exported_Functions_Group3 Timer Complementary PWM functions
- *  @brief    Timer Complementary PWM functions
+/** @addtogroup TIMEx_Exported_Functions_Group3
  * @{
  */
 /*  Timer Complementary PWM functions  ****************************************/
@@ -217,8 +215,7 @@
   * @}
   */
 
-/** @addtogroup TIMEx_Exported_Functions_Group4 Timer Complementary One Pulse functions
- *  @brief    Timer Complementary One Pulse functions
+/** @addtogroup TIMEx_Exported_Functions_Group4
  * @{
  */
 /*  Timer Complementary One Pulse functions  **********************************/
@@ -233,8 +230,7 @@
   * @}
   */
 
-/** @addtogroup TIMEx_Exported_Functions_Group5 Peripheral Control functions
- *  @brief    Peripheral Control functions
+/** @addtogroup TIMEx_Exported_Functions_Group5
  * @{
  */
 /* Extended Control functions  ************************************************/
@@ -248,20 +244,17 @@
   * @}
   */
 
-/** @addtogroup TIMEx_Exported_Functions_Group6 Extension Callbacks functions 
-  * @brief    Extended Callbacks functions
+/** @addtogroup TIMEx_Exported_Functions_Group6
   * @{
   */
 /* Extension Callback *********************************************************/
 void HAL_TIMEx_CommutationCallback(TIM_HandleTypeDef *htim);
 void HAL_TIMEx_BreakCallback(TIM_HandleTypeDef *htim);
-void HAL_TIMEx_DMACommutationCplt(DMA_HandleTypeDef *hdma);
 /**
   * @}
   */
 
-/** @addtogroup TIMEx_Exported_Functions_Group7 Extension Peripheral State functions 
-  * @brief    Extended Peripheral State functions
+/** @addtogroup TIMEx_Exported_Functions_Group7
   * @{
   */
 /* Extension Peripheral State functions  **************************************/
@@ -272,16 +265,27 @@
 
 /**
   * @}
-  */ 
+  */
+/* End of exported functions -------------------------------------------------*/
 
+/* Private functions----------------------------------------------------------*/
+/** @defgroup TIMEx_Private_Functions TIMEx Private Functions
+* @{
+*/
+void TIMEx_DMACommutationCplt(DMA_HandleTypeDef *hdma);
 /**
-  * @}
-  */ 
+* @}
+*/ 
+/* End of private functions --------------------------------------------------*/
 
 /**
   * @}
   */
-  
+
+/**
+  * @}
+  */
+
 #ifdef __cplusplus
 }
 #endif
@@ -290,4 +294,3 @@
 #endif /* __STM32F0xx_HAL_TIM_EX_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-