ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

STM32L4 ADC correct internal channel management

pull/6412/head
jeromecoutant 2018-03-21 10:13:06 +01:00
parent 53cb6e06f9
commit ef006931f8
1 changed files with 44 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
targets/TARGET_STM/TARGET_STM32L4/device/stm32l4xx_hal_adc.c
View File

@ -2312,7 +2312,6 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef* hadc, ADC_ChannelConf
/* Parameters update conditioned to ADC state: */ /* Parameters update conditioned to ADC state: */
/* Parameters that can be updated only when ADC is disabled: */ /* Parameters that can be updated only when ADC is disabled: */
/* - Single or differential mode */ /* - Single or differential mode */
/* - Internal measurement channels: Vbat/VrefInt/TempSensor */
if (ADC_IS_ENABLE(hadc) == RESET) if (ADC_IS_ENABLE(hadc) == RESET)
{ {
/* Set mode single-ended or differential input of the selected ADC channel */ /* Set mode single-ended or differential input of the selected ADC channel */
@ -2325,71 +2324,56 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef* hadc, ADC_ChannelConf
LL_ADC_SetChannelSamplingTime(hadc->Instance, __LL_ADC_DECIMAL_NB_TO_CHANNEL(__LL_ADC_CHANNEL_TO_DECIMAL_NB(sConfig->Channel) + 1), sConfig->SamplingTime); LL_ADC_SetChannelSamplingTime(hadc->Instance, __LL_ADC_DECIMAL_NB_TO_CHANNEL(__LL_ADC_CHANNEL_TO_DECIMAL_NB(sConfig->Channel) + 1), sConfig->SamplingTime);
} }
/* Management of internal measurement channels: Vbat/VrefInt/TempSensor. */ }
/* If internal channel selected, enable dedicated internal buffers and */
/* paths. */ /* Management of internal measurement channels: Vbat/VrefInt/TempSensor. */
/* Note: these internal measurement paths can be disabled using */ /* If internal channel selected, enable dedicated internal buffers and */
/* HAL_ADC_DeInit(). */ /* paths. */
/* Note: these internal measurement paths can be disabled using */
/* Configuration of common ADC parameters */ /* HAL_ADC_DeInit(). */
/* If the requested internal measurement path has already been enabled, */
/* bypass the configuration processing. */ /* Configuration of common ADC parameters */
if (( (sConfig->Channel == ADC_CHANNEL_TEMPSENSOR) && /* If the requested internal measurement path has already been enabled, */
((LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)) & LL_ADC_PATH_INTERNAL_TEMPSENSOR) == 0U)) || /* bypass the configuration processing. */
( (sConfig->Channel == ADC_CHANNEL_VBAT) && if (( (sConfig->Channel == ADC_CHANNEL_TEMPSENSOR) &&
((LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)) & LL_ADC_PATH_INTERNAL_VBAT) == 0U)) || ((LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)) & LL_ADC_PATH_INTERNAL_TEMPSENSOR) == 0U)) ||
( (sConfig->Channel == ADC_CHANNEL_VREFINT) && ( (sConfig->Channel == ADC_CHANNEL_VBAT) &&
((LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)) & LL_ADC_PATH_INTERNAL_VREFINT) == 0U)) ((LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)) & LL_ADC_PATH_INTERNAL_VBAT) == 0U)) ||
) ( (sConfig->Channel == ADC_CHANNEL_VREFINT) &&
((LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)) & LL_ADC_PATH_INTERNAL_VREFINT) == 0U))
)
{
/* Configuration of common ADC parameters (continuation) */
if (sConfig->Channel == ADC_CHANNEL_TEMPSENSOR)
{ {
/* Configuration of common ADC parameters (continuation) */ if (ADC_TEMPERATURE_SENSOR_INSTANCE(hadc))
/* Software is allowed to change common parameters only when all ADCs */
/* of the common group are disabled. */
if ((ADC_IS_ENABLE(hadc) == RESET) &&
(ADC_ANY_OTHER_ENABLED(hadc) == RESET) )
{ {
if (sConfig->Channel == ADC_CHANNEL_TEMPSENSOR) LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance), LL_ADC_PATH_INTERNAL_TEMPSENSOR | LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)));
/* Delay for temperature sensor stabilization time */
/* Wait loop initialization and execution */
/* Note: Variable divided by 2 to compensate partially */
/* CPU processing cycles. */
wait_loop_index = (LL_ADC_DELAY_TEMPSENSOR_STAB_US * (SystemCoreClock / (1000000 * 2)));
while(wait_loop_index != 0)
{ {
if (ADC_TEMPERATURE_SENSOR_INSTANCE(hadc)) wait_loop_index--;
{
LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance), LL_ADC_PATH_INTERNAL_TEMPSENSOR | LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)));
/* Delay for temperature sensor stabilization time */
/* Wait loop initialization and execution */
/* Note: Variable divided by 2 to compensate partially */
/* CPU processing cycles. */
wait_loop_index = (LL_ADC_DELAY_TEMPSENSOR_STAB_US * (SystemCoreClock / (1000000 * 2)));
while(wait_loop_index != 0)
{
wait_loop_index--;
}
}
}
else if (sConfig->Channel == ADC_CHANNEL_VBAT)
{
if (ADC_BATTERY_VOLTAGE_INSTANCE(hadc))
{
LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance), LL_ADC_PATH_INTERNAL_VBAT | LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)));
}
}
else if (sConfig->Channel == ADC_CHANNEL_VREFINT)
{
if (ADC_VREFINT_INSTANCE(hadc))
{
LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance), LL_ADC_PATH_INTERNAL_VREFINT | LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)));
}
} }
} }
/* If the requested internal measurement path has already been */ }
/* enabled and other ADC of the common group are enabled, internal */ else if (sConfig->Channel == ADC_CHANNEL_VBAT)
/* measurement paths cannot be enabled. */ {
else if (ADC_BATTERY_VOLTAGE_INSTANCE(hadc))
{ {
/* Update ADC state machine to error */ LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance), LL_ADC_PATH_INTERNAL_VBAT | LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)));
SET_BIT(hadc->State, HAL_ADC_STATE_ERROR_CONFIG); }
}
tmp_hal_status = HAL_ERROR; else if (sConfig->Channel == ADC_CHANNEL_VREFINT)
{
if (ADC_VREFINT_INSTANCE(hadc))
{
LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance), LL_ADC_PATH_INTERNAL_VREFINT | LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance)));
} }
} }
} }