Diff: TARGET_NUCLEO_F072RB/stm32f0xx_hal_gpio.h

Revision:

92:4fc01daae5a5

Parent:

85:024bf7f99721

Child:

93:e188a91d3eaa

--- a/TARGET_NUCLEO_F072RB/stm32f0xx_hal_gpio.h	Wed Oct 29 11:02:04 2014 +0000
+++ b/TARGET_NUCLEO_F072RB/stm32f0xx_hal_gpio.h	Thu Nov 27 13:33:22 2014 +0000
@@ -2,8 +2,8 @@
   ******************************************************************************
   * @file    stm32f0xx_hal_gpio.h
   * @author  MCD Application Team
-  * @version V1.0.0
-  * @date    28-May-2014
+  * @version V1.1.0
+  * @date    03-Oct-2014
   * @brief   Header file of GPIO HAL module.
   ******************************************************************************
   * @attention
@@ -56,22 +56,25 @@
 
 /* Exported types ------------------------------------------------------------*/ 
 
+/** @defgroup GPIO_Exported_Types GPIO Exported Types
+  * @{
+  */
 /** 
   * @brief   GPIO Init structure definition  
   */
 typedef struct
 {
   uint32_t Pin;       /*!< Specifies the GPIO pins to be configured.
-                           This parameter can be any value of @ref GPIO_pins_define */
+                           This parameter can be any value of @ref GPIO_pins */
 
   uint32_t Mode;      /*!< Specifies the operating mode for the selected pins.
-                           This parameter can be a value of @ref GPIO_mode_define */
+                           This parameter can be a value of @ref GPIO_mode */
 
   uint32_t Pull;      /*!< Specifies the Pull-up or Pull-Down activation for the selected pins.
-                           This parameter can be a value of @ref GPIO_pull_define */
+                           This parameter can be a value of @ref GPIO_pull */
 
   uint32_t Speed;     /*!< Specifies the speed for the selected pins.
-                           This parameter can be a value of @ref GPIO_speed_define */
+                           This parameter can be a value of @ref GPIO_speed */
 
   uint32_t Alternate;  /*!< Peripheral to be connected to the selected pins 
                             This parameter can be a value of @ref GPIOEx_Alternate_function_selection */
@@ -85,15 +88,25 @@
   GPIO_PIN_RESET = 0,
   GPIO_PIN_SET
 }GPIO_PinState;
-#define IS_GPIO_PIN_ACTION(ACTION) (((ACTION) == GPIO_PIN_RESET) || ((ACTION) == GPIO_PIN_SET))
-
+/**
+  * @}
+  */
+  
 /* Exported constants --------------------------------------------------------*/
 
-/** @defgroup GPIO_Exported_Constants GPIO_Exported_Constants
+/** @defgroup GPIO_Exported_Constants GPIO Exported Constants
   * @{
   */
 
-/** @defgroup GPIO_pins_define GPIO_pins_define
+/** @defgroup GPIO_pin_actions GPIO pin actions
+  * @{
+  */
+#define IS_GPIO_PIN_ACTION(ACTION) (((ACTION) == GPIO_PIN_RESET) || ((ACTION) == GPIO_PIN_SET))
+/**
+  * @}
+  */
+
+/** @defgroup GPIO_pins GPIO pins
   * @{
   */
 #define GPIO_PIN_0                 ((uint16_t)0x0001)  /* Pin 0 selected    */
@@ -116,12 +129,12 @@
 
 #define GPIO_PIN_MASK              ((uint32_t)0x0000FFFF) /* PIN mask for assert test */
 
-#define IS_GPIO_PIN(PIN)           ((PIN & GPIO_PIN_MASK ) != (uint32_t)0x00)
+#define IS_GPIO_PIN(PIN)           (((PIN) & GPIO_PIN_MASK) != (uint32_t)0x00)
 /**
   * @}
   */
 
-/** @defgroup GPIO_mode_define GPIO_mode_define
+/** @defgroup GPIO_mode GPIO mode
   * @brief GPIO Configuration Mode 
   *        Elements values convention: 0xX0yz00YZ
   *           - X  : GPIO mode or EXTI Mode
@@ -164,7 +177,7 @@
   * @}
   */
                                                          
-/** @defgroup GPIO_speed_define GPIO_speed_define
+/** @defgroup GPIO_speed GPIO speed
   * @brief GPIO Output Maximum frequency
   * @{
   */  
@@ -178,7 +191,7 @@
   * @}
   */
 
- /** @defgroup GPIO_pull_define GPIO_pull_define
+ /** @defgroup GPIO_pull GPIO pull
    * @brief GPIO Pull-Up or Pull-Down Activation
    * @{
    */  
@@ -198,6 +211,10 @@
 
 /* Exported macro ------------------------------------------------------------*/
 
+/** @defgroup GPIO_Exported_Macros GPIO Exported Macros
+  * @{
+  */
+  
 /**
   * @brief  Checks whether the specified EXTI line flag is set or not.
   * @param  __EXTI_LINE__: specifies the EXTI line flag to check.
@@ -238,14 +255,35 @@
   */
 #define __HAL_GPIO_EXTI_GENERATE_SWIT(__EXTI_LINE__) (EXTI->SWIER |= (__EXTI_LINE__))
 
+/**
+  * @}
+  */
+
 /* Include GPIO HAL Extension module */
 #include "stm32f0xx_hal_gpio_ex.h"
 
 /* Exported functions --------------------------------------------------------*/ 
+/** @addtogroup GPIO_Exported_Functions GPIO Exported Functions
+  * @{
+  */
+
+/** @addtogroup GPIO_Exported_Functions_Group1 Initialization/de-initialization functions 
+ *  @brief    Initialization and Configuration functions
+ * @{
+ */
+     
 /* Initialization and de-initialization functions *****************************/
 void              HAL_GPIO_Init(GPIO_TypeDef  *GPIOx, GPIO_InitTypeDef *GPIO_Init);
 void              HAL_GPIO_DeInit(GPIO_TypeDef  *GPIOx, uint32_t GPIO_Pin);
 
+/**
+  * @}
+  */
+
+/** @addtogroup GPIO_Exported_Functions_Group2 IO operation functions 
+ * @{
+ */
+   
 /* IO operation functions *****************************************************/
 GPIO_PinState     HAL_GPIO_ReadPin(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin);
 void              HAL_GPIO_WritePin(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin, GPIO_PinState PinState);
@@ -262,6 +300,14 @@
   * @}
   */ 
 
+/**
+  * @}
+  */ 
+
+/**
+  * @}
+  */  
+  
 #ifdef __cplusplus
 }
 #endif
@@ -269,3 +315,4 @@
 #endif /* __STM32F0xx_HAL_GPIO_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+