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

Merge pull request #455 from bcostm/master 

[NUCLEO_L053R8] Fix bug and improvement of AnalogIn
pull/456/head
Martin Kojtal 2014-08-20 16:45:43 +01:00
parent acf895235e 63cf897d5a
commit c73b091a6e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogin_api.c
View File

@ -73,6 +73,8 @@ void analogin_init(analogin_t *obj, PinName pin) {
if (adc_inited == 0) { if (adc_inited == 0) {
adc_inited = 1; adc_inited = 1;
AdcHandle.Instance = (ADC_TypeDef *)(obj->adc);
// Enable ADC clock // Enable ADC clock
__ADC1_CLK_ENABLE(); __ADC1_CLK_ENABLE();
@ -80,7 +82,7 @@ void analogin_init(analogin_t *obj, PinName pin) {
AdcHandle.Init.OversamplingMode = DISABLE; AdcHandle.Init.OversamplingMode = DISABLE;
AdcHandle.Init.ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV2; // ADCCLK = 8 MHz (HSI 16 MHz / 2) AdcHandle.Init.ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV2; // ADCCLK = 8 MHz (HSI 16 MHz / 2)
AdcHandle.Init.Resolution = ADC_RESOLUTION12b; AdcHandle.Init.Resolution = ADC_RESOLUTION12b;
AdcHandle.Init.SamplingTime = ADC_SAMPLETIME_1CYCLE_5; AdcHandle.Init.SamplingTime = ADC_SAMPLETIME_7CYCLES_5;
AdcHandle.Init.ScanDirection = ADC_SCAN_DIRECTION_UPWARD; AdcHandle.Init.ScanDirection = ADC_SCAN_DIRECTION_UPWARD;
AdcHandle.Init.DataAlign = ADC_DATAALIGN_RIGHT; AdcHandle.Init.DataAlign = ADC_DATAALIGN_RIGHT;
AdcHandle.Init.ContinuousConvMode = DISABLE; AdcHandle.Init.ContinuousConvMode = DISABLE;
@ -92,8 +94,13 @@ void analogin_init(analogin_t *obj, PinName pin) {
AdcHandle.Init.Overrun = OVR_DATA_PRESERVED; AdcHandle.Init.Overrun = OVR_DATA_PRESERVED;
AdcHandle.Init.LowPowerAutoWait = ENABLE; AdcHandle.Init.LowPowerAutoWait = ENABLE;
AdcHandle.Init.LowPowerFrequencyMode = DISABLE; // To be enabled only if ADC clock < 2.8 MHz AdcHandle.Init.LowPowerFrequencyMode = DISABLE; // To be enabled only if ADC clock < 2.8 MHz
AdcHandle.Init.LowPowerAutoOff = ENABLE; AdcHandle.Init.LowPowerAutoOff = DISABLE;
HAL_ADC_Init(&AdcHandle); HAL_ADC_Init(&AdcHandle);
// Calibration
HAL_ADCEx_Calibration_Start(&AdcHandle, ADC_SINGLE_ENDED);
__HAL_ADC_ENABLE(&AdcHandle);
} }
} }