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 #809 from bcostm/master 

NUCLEO_F334R8 - Fix issue with multiple ADC initialization
pull/837/head
Martin Kojtal 2015-01-08 11:57:52 +00:00
parent bef46907fc f2a6eeca8d
commit 2acefb66eb
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/analogin_api.c
View File

@ -37,10 +37,11 @@
ADC_HandleTypeDef AdcHandle;
int adc_inited = 0;
void analogin_init(analogin_t *obj, PinName pin)
{
static int adc1_inited = 0;
static int adc2_inited = 0;
// Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT(obj->adc != (ADCName)NC);
@ -51,13 +52,14 @@ void analogin_init(analogin_t *obj, PinName pin)
// Save pin number for the read function
obj->pin = pin;
// The ADC initialization is done once
if (adc_inited == 0) {
adc_inited = 1;
// Check if ADC is already initialized
if ((obj->adc == ADC_1) && adc1_inited) return;
if ((obj->adc == ADC_2) && adc2_inited) return;
if (obj->adc == ADC_1) adc1_inited = 1;
if (obj->adc == ADC_2) adc2_inited = 1;
// Enable ADC clock
if (obj->adc == ADC_1) __ADC1_CLK_ENABLE();
if (obj->adc == ADC_2) __ADC2_CLK_ENABLE();
__ADC12_CLK_ENABLE();
// Configure ADC
AdcHandle.Instance = (ADC_TypeDef *)(obj->adc);
@ -75,7 +77,6 @@ void analogin_init(analogin_t *obj, PinName pin)
AdcHandle.Init.EOCSelection = DISABLE;
HAL_ADC_Init(&AdcHandle);
}
}
static inline uint16_t adc_read(analogin_t *obj)
{