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

[NUCLEO_F334R8] Correct the code used during initialization

pull/809/head
bcostm 2015-01-05 14:47:38 +01:00
parent ad9b6a7119
commit f2a6eeca8d
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,11 +37,11 @@
ADC_HandleTypeDef AdcHandle;
int adc1_inited = 0;
int adc2_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);
@ -52,16 +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 only once for each ADC
if ((adc1_inited == 0) || (adc2_inited == 0)) {
if (obj->adc == ADC_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
__ADC12_CLK_ENABLE();
adc1_inited = 1;
}
if (obj->adc == ADC_2) {
__ADC12_CLK_ENABLE();
adc2_inited = 1;
}
// Configure ADC
AdcHandle.Instance = (ADC_TypeDef *)(obj->adc);
@ -79,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)
{