Tomo Yamanaka / mbed-dev

mbed library sources. Supersedes mbed-src. GR-PEACH runs on RAM.

Fork of mbed-dev by mbed official

Files at this revision

API Documentation at this revision

Revision 86:5334467ce342, committed 2016-03-09

Comitter:
mbed_official
Date:
Wed Mar 09 08:45:10 2016 +0000
Parent:
85:4b017b08d507
Child:
87:444eeba2d452
Commit message:
Synchronized with git revision 2c6c9395640e09a1a1f2893a5372bfe9f82fcc46

Full URL: https://github.com/mbedmicro/mbed/commit/2c6c9395640e09a1a1f2893a5372bfe9f82fcc46/

[STM32F3xx] bug fix multiple ADC channels using multiple ADC blocks

Changed in this revision

targets/hal/TARGET_STM/TARGET_STM32F3/analogin_api.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/hal/TARGET_STM/TARGET_STM32F3/analogin_api.c	Tue Mar 08 22:45:14 2016 +0000
+++ b/targets/hal/TARGET_STM/TARGET_STM32F3/analogin_api.c	Wed Mar 09 08:45:10 2016 +0000
@@ -73,6 +73,7 @@
 #if defined(ADC1)
     if ((obj->adc == ADC_1) && adc1_inited) return;
     if (obj->adc == ADC_1) {
+        AdcHandle.State = HAL_ADC_STATE_RESET;
         __ADC1_CLK_ENABLE();
         adc1_inited = 1;
     }
@@ -80,6 +81,7 @@
 #if defined(ADC2)
     if ((obj->adc == ADC_2) && adc2_inited) return;
     if (obj->adc == ADC_2) {
+        AdcHandle.State = HAL_ADC_STATE_RESET;
         __ADC2_CLK_ENABLE();
         adc2_inited = 1;
     }
@@ -87,6 +89,7 @@
 #if defined(ADC3)
     if ((obj->adc == ADC_3) && adc3_inited) return;
     if (obj->adc == ADC_3) {
+        AdcHandle.State = HAL_ADC_STATE_RESET;
         __ADC34_CLK_ENABLE();
         adc3_inited = 1;
     }
@@ -94,6 +97,7 @@
 #if defined(ADC4)
     if ((obj->adc == ADC_4) && adc4_inited) return;
     if (obj->adc == ADC_4) {
+        AdcHandle.State = HAL_ADC_STATE_RESET;
         __ADC34_CLK_ENABLE();
         adc4_inited = 1;
     }