@@ -117,8 +117,8 @@ typedef struct
117117 This feature automatically adapts the frequency of ADC conversions triggers to the speed of the system that reads the data. Moreover, this avoids risk of overrun
118118 for low frequency applications.
119119 This parameter can be set to ENABLE or DISABLE.
120- Note: Do not use with interruption or DMA (HAL_ADC_Start_IT(), HAL_ADC_Start_DMA()) since they clear immediately the EOC flag
121- to free the IRQ vector sequencer .
120+ Note: It is not recommended to use with interruption or DMA (HAL_ADC_Start_IT(), HAL_ADC_Start_DMA()) since these modes have to clear immediately the EOC flag (by CPU to free the IRQ pending event or by DMA).
121+ Auto wait will work but fort a very short time, discarding its intended benefit (except specific case of high load of CPU or DMA transfers which can justify usage of auto wait) .
122122 Do use with polling: 1. Start conversion with HAL_ADC_Start(), 2. Later on, when ADC conversion data is needed:
123123 use HAL_ADC_PollForConversion() to ensure that conversion is completed and HAL_ADC_GetValue() to retrieve conversion result and trig another conversion start.
124124 (in case of usage of ADC group injected, use the equivalent functions HAL_ADCExInjected_Start(), HAL_ADCEx_InjectedGetValue(), ...). */
@@ -152,7 +152,7 @@ typedef struct
152152 If trigger source is set to ADC_SOFTWARE_START, this parameter is discarded.
153153 This parameter can be a value of @ref ADC_regular_external_trigger_edge */
154154
155- uint32_t ConversionDataManagement ; /*!< Specifies whether the Data conversion data is managed: using the DMA (oneshot or circular), or stored in the DR register or transfered to DFSDM register.
155+ uint32_t ConversionDataManagement ; /*!< Specifies whether the Data conversion data is managed: using the DMA (oneshot or circular), or stored in the DR register or transferred to DFSDM register.
156156 Note: In continuous mode, DMA must be configured in circular mode. Otherwise an overrun will be triggered when DMA buffer maximum pointer is reached.
157157 This parameter can be a value of @ref ADC_ConversionDataManagement.
158158 Note: This parameter must be modified when no conversion is on going on both regular and injected groups
@@ -334,7 +334,7 @@ typedef struct
334334 external trigger, low power auto power-on (if feature available), multimode ADC master control (if feature available)) */
335335#define HAL_ADC_STATE_REG_EOC (0x00000200UL) /*!< Conversion data available on group regular */
336336#define HAL_ADC_STATE_REG_OVR (0x00000400UL) /*!< Overrun occurrence */
337- #define HAL_ADC_STATE_REG_EOSMP (0x00000800UL) /*!< Not available on this STM32 serie : End Of Sampling flag raised */
337+ #define HAL_ADC_STATE_REG_EOSMP (0x00000800UL) /*!< Not available on this STM32 series : End Of Sampling flag raised */
338338
339339/* States of ADC group injected */
340340#define HAL_ADC_STATE_INJ_BUSY (0x00001000UL) /*!< A conversion on ADC group injected is ongoing or can occur (either by auto-injection mode,
@@ -361,7 +361,7 @@ typedef struct
361361typedef struct __ADC_HandleTypeDef
362362#else
363363typedef struct
364- #endif
364+ #endif /* USE_HAL_ADC_REGISTER_CALLBACKS */
365365{
366366 ADC_TypeDef * Instance ; /*!< Register base address */
367367 ADC_InitTypeDef Init ; /*!< ADC initialization parameters and regular conversions setting */
@@ -715,7 +715,6 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
715715 * @}
716716 */
717717
718-
719718/** @defgroup ADC_Event_type ADC Event type
720719 * @{
721720 */
@@ -813,10 +812,10 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
813812 * @param __HANDLE__ ADC handle
814813 * @retval SET (ADC enabled) or RESET (ADC disabled)
815814 */
816- #define ADC_IS_ENABLE (__HANDLE__ ) \
817- (( ((((__HANDLE__)->Instance->CR) & (ADC_CR_ADEN | ADC_CR_ADDIS)) == ADC_CR_ADEN) && \
818- ((((__HANDLE__)->Instance->ISR) & ADC_FLAG_RDY) == ADC_FLAG_RDY) \
819- ) ? SET : RESET)
815+ #define ADC_IS_ENABLE (__HANDLE__ ) \
816+ (( ((((__HANDLE__)->Instance->CR) & (ADC_CR_ADEN | ADC_CR_ADDIS)) == ADC_CR_ADEN) && \
817+ ((((__HANDLE__)->Instance->ISR) & ADC_FLAG_RDY) == ADC_FLAG_RDY) \
818+ ) ? SET : RESET)
820819
821820/**
822821 * @brief Check if conversion is on going on regular group.
@@ -1063,7 +1062,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
10631062#else
10641063#define __HAL_ADC_RESET_HANDLE_STATE (__HANDLE__ ) \
10651064 ((__HANDLE__)->State = HAL_ADC_STATE_RESET)
1066- #endif
1065+ #endif /* USE_HAL_ADC_REGISTER_CALLBACKS */
10671066
10681067/**
10691068 * @brief Enable ADC interrupt.
@@ -1214,7 +1213,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
12141213 * @arg @ref ADC_CHANNEL_VBAT (1)
12151214 * @arg @ref ADC_CHANNEL_DAC1CH1_ADC2 (1)
12161215 * @arg @ref ADC_CHANNEL_DAC1CH2_ADC2 (1)
1217- *
1216+ *
12181217 * (1) On STM32MP1, parameter available only on ADC instance: ADC2.\n
12191218 * (3) On STM32MP1, fast channel (0.125 us for 14-bit resolution (ADC conversion rate up to 8 Ms/s)).
12201219 * Other channels are slow channels (conversion rate: refer to reference manual).
@@ -1257,7 +1256,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
12571256 * @arg @ref ADC_CHANNEL_VBAT (1)
12581257 * @arg @ref ADC_CHANNEL_DAC1CH1_ADC2 (1)
12591258 * @arg @ref ADC_CHANNEL_DAC1CH2_ADC2 (1)
1260- *
1259+ *
12611260 * (1) On STM32MP1, parameter available only on ADC instance: ADC2.\n
12621261 * (3) On STM32MP1, fast channel (0.125 us for 14-bit resolution (ADC conversion rate up to 8 Ms/s)).
12631262 * Other channels are slow channels (conversion rate: refer to reference manual).\n
@@ -1312,7 +1311,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
13121311 * @arg @ref ADC_CHANNEL_VBAT (1)
13131312 * @arg @ref ADC_CHANNEL_DAC1CH1_ADC2 (1)
13141313 * @arg @ref ADC_CHANNEL_DAC1CH2_ADC2 (1)
1315- *
1314+ *
13161315 * (1) On STM32MP1, parameter available only on ADC instance: ADC2.\n
13171316 * (3) On STM32MP1, fast channel (0.125 us for 14-bit resolution (ADC conversion rate up to 8 Ms/s)).
13181317 * Other channels are slow channels (conversion rate: refer to reference manual).
@@ -1362,7 +1361,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
13621361 * @arg @ref ADC_CHANNEL_VBAT (1)
13631362 * @arg @ref ADC_CHANNEL_DAC1CH1_ADC2 (1)
13641363 * @arg @ref ADC_CHANNEL_DAC1CH2_ADC2 (1)
1365- *
1364+ *
13661365 * (1) On STM32MP1, parameter available only on ADC instance: ADC2.\n
13671366 * (3) On STM32MP1, fast channel (0.125 us for 14-bit resolution (ADC conversion rate up to 8 Ms/s)).
13681367 * Other channels are slow channels (conversion rate: refer to reference manual).
@@ -1411,7 +1410,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
14111410 * @arg @ref ADC_CHANNEL_VBAT (1)
14121411 * @arg @ref ADC_CHANNEL_DAC1CH1_ADC2 (1)
14131412 * @arg @ref ADC_CHANNEL_DAC1CH2_ADC2 (1)
1414- *
1413+ *
14151414 * (1) On STM32MP1, parameter available only on ADC instance: ADC2.
14161415 * @retval Value "0" if the internal channel selected is not available on the ADC instance selected.
14171416 * Value "1" if the internal channel selected is available on the ADC instance selected.
@@ -1435,7 +1434,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
14351434 */
14361435#define __HAL_ADC_MULTI_CONV_DATA_MASTER_SLAVE (__ADC_MULTI_MASTER_SLAVE__ , __ADC_MULTI_CONV_DATA__ ) \
14371436 __LL_ADC_MULTI_CONV_DATA_MASTER_SLAVE((__ADC_MULTI_MASTER_SLAVE__), (__ADC_MULTI_CONV_DATA__))
1438- #endif
1437+ #endif /* ADC_MULTIMODE_SUPPORT */
14391438
14401439/**
14411440 * @brief Helper macro to select the ADC common instance
@@ -1509,10 +1508,10 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
15091508 */
15101509#define __HAL_ADC_CONVERT_DATA_RESOLUTION (__DATA__ ,\
15111510 __ADC_RESOLUTION_CURRENT__ ,\
1512- __ADC_RESOLUTION_TARGET__ ) \
1513- __LL_ADC_CONVERT_DATA_RESOLUTION((__DATA__), \
1514- (__ADC_RESOLUTION_CURRENT__), \
1515- (__ADC_RESOLUTION_TARGET__))
1511+ __ADC_RESOLUTION_TARGET__ ) \
1512+ __LL_ADC_CONVERT_DATA_RESOLUTION((__DATA__),\
1513+ (__ADC_RESOLUTION_CURRENT__),\
1514+ (__ADC_RESOLUTION_TARGET__))
15161515
15171516/**
15181517 * @brief Helper macro to calculate the voltage (unit: mVolt)
@@ -1533,10 +1532,10 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
15331532 */
15341533#define __HAL_ADC_CALC_DATA_TO_VOLTAGE (__VREFANALOG_VOLTAGE__ ,\
15351534 __ADC_DATA__ ,\
1536- __ADC_RESOLUTION__ ) \
1537- __LL_ADC_CALC_DATA_TO_VOLTAGE((__VREFANALOG_VOLTAGE__), \
1538- (__ADC_DATA__), \
1539- (__ADC_RESOLUTION__))
1535+ __ADC_RESOLUTION__ ) \
1536+ __LL_ADC_CALC_DATA_TO_VOLTAGE((__VREFANALOG_VOLTAGE__),\
1537+ (__ADC_DATA__),\
1538+ (__ADC_RESOLUTION__))
15401539
15411540/**
15421541 * @brief Helper macro to calculate analog reference voltage (Vref+)
@@ -1548,7 +1547,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
15481547 * connected to pin Vref+.
15491548 * On devices with small package, the pin Vref+ is not present
15501549 * and internally bonded to pin Vdda.
1551- * @note On this STM32 serie , calibration data of internal voltage reference
1550+ * @note On this STM32 series , calibration data of internal voltage reference
15521551 * VrefInt corresponds to a resolution of 12 bits,
15531552 * this is the recommended ADC resolution to convert voltage of
15541553 * internal voltage reference VrefInt.
@@ -1565,9 +1564,9 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
15651564 * @retval Analog reference voltage (unit: mV)
15661565 */
15671566#define __HAL_ADC_CALC_VREFANALOG_VOLTAGE (__VREFINT_ADC_DATA__ ,\
1568- __ADC_RESOLUTION__ ) \
1569- __LL_ADC_CALC_VREFANALOG_VOLTAGE((__VREFINT_ADC_DATA__), \
1570- (__ADC_RESOLUTION__))
1567+ __ADC_RESOLUTION__ ) \
1568+ __LL_ADC_CALC_VREFANALOG_VOLTAGE((__VREFINT_ADC_DATA__),\
1569+ (__ADC_RESOLUTION__))
15711570
15721571/**
15731572 * @brief Helper macro to calculate the temperature (unit: degree Celsius)
@@ -1596,7 +1595,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
15961595 * @note Analog reference voltage (Vref+) must be either known from
15971596 * user board environment or can be calculated using ADC measurement
15981597 * and ADC helper macro @ref __LL_ADC_CALC_VREFANALOG_VOLTAGE().
1599- * @note On this STM32 serie , calibration data of temperature sensor
1598+ * @note On this STM32 series , calibration data of temperature sensor
16001599 * corresponds to a resolution of 12 bits,
16011600 * this is the recommended ADC resolution to convert voltage of
16021601 * temperature sensor.
@@ -1617,10 +1616,10 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
16171616 */
16181617#define __HAL_ADC_CALC_TEMPERATURE (__VREFANALOG_VOLTAGE__ ,\
16191618 __TEMPSENSOR_ADC_DATA__ ,\
1620- __ADC_RESOLUTION__ ) \
1621- __LL_ADC_CALC_TEMPERATURE((__VREFANALOG_VOLTAGE__), \
1622- (__TEMPSENSOR_ADC_DATA__), \
1623- (__ADC_RESOLUTION__))
1619+ __ADC_RESOLUTION__ ) \
1620+ __LL_ADC_CALC_TEMPERATURE((__VREFANALOG_VOLTAGE__),\
1621+ (__TEMPSENSOR_ADC_DATA__),\
1622+ (__ADC_RESOLUTION__))
16241623
16251624/**
16261625 * @brief Helper macro to calculate the temperature (unit: degree Celsius)
@@ -1672,13 +1671,13 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
16721671 __TEMPSENSOR_CALX_TEMP__ ,\
16731672 __VREFANALOG_VOLTAGE__ ,\
16741673 __TEMPSENSOR_ADC_DATA__ ,\
1675- __ADC_RESOLUTION__ ) \
1676- __LL_ADC_CALC_TEMPERATURE_TYP_PARAMS((__TEMPSENSOR_TYP_AVGSLOPE__), \
1677- (__TEMPSENSOR_TYP_CALX_V__), \
1678- (__TEMPSENSOR_CALX_TEMP__), \
1679- (__VREFANALOG_VOLTAGE__), \
1680- (__TEMPSENSOR_ADC_DATA__), \
1681- (__ADC_RESOLUTION__))
1674+ __ADC_RESOLUTION__ ) \
1675+ __LL_ADC_CALC_TEMPERATURE_TYP_PARAMS((__TEMPSENSOR_TYP_AVGSLOPE__),\
1676+ (__TEMPSENSOR_TYP_CALX_V__),\
1677+ (__TEMPSENSOR_CALX_TEMP__),\
1678+ (__VREFANALOG_VOLTAGE__),\
1679+ (__TEMPSENSOR_ADC_DATA__),\
1680+ (__ADC_RESOLUTION__))
16821681
16831682/**
16841683 * @}
0 commit comments