Skip to content

Commit e508525

Browse files
authored
Merge pull request #2000 from egostm/STM32F4xx_ADC2_support
[STM32F4] Add ADC2 support to F4 family
2 parents aa5bfcd + 0f49396 commit e508525

File tree

6 files changed

+15
-0
lines changed

6 files changed

+15
-0
lines changed

hal/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_ARCH_MAX/PeripheralNames.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ extern "C" {
3838

3939
typedef enum {
4040
ADC_1 = (int)ADC1_BASE,
41+
ADC_2 = (int)ADC2_BASE,
4142
ADC_3 = (int)ADC3_BASE
4243
} ADCName;
4344

hal/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_B96B_F446VE/PeripheralNames.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ extern "C" {
3838

3939
typedef enum {
4040
ADC_1 = (int)ADC1_BASE,
41+
ADC_2 = (int)ADC2_BASE,
4142
ADC_3 = (int)ADC3_BASE
4243
} ADCName;
4344

hal/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_DISCO_F407VG/PeripheralNames.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ extern "C" {
3838

3939
typedef enum {
4040
ADC_1 = (int)ADC1_BASE,
41+
ADC_2 = (int)ADC2_BASE,
4142
ADC_3 = (int)ADC3_BASE
4243
} ADCName;
4344

hal/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_DISCO_F429ZI/PeripheralNames.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ extern "C" {
3838

3939
typedef enum {
4040
ADC_1 = (int)ADC1_BASE,
41+
ADC_2 = (int)ADC2_BASE,
4142
ADC_3 = (int)ADC3_BASE
4243
} ADCName;
4344

hal/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F446RE/PeripheralNames.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ extern "C" {
3838

3939
typedef enum {
4040
ADC_1 = (int)ADC1_BASE,
41+
ADC_2 = (int)ADC2_BASE,
4142
ADC_3 = (int)ADC3_BASE
4243
} ADCName;
4344

hal/targets/hal/TARGET_STM/TARGET_STM32F4/analogin_api.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ void analogin_init(analogin_t *obj, PinName pin)
4343
#if defined(ADC1)
4444
static int adc1_inited = 0;
4545
#endif
46+
#if defined(ADC2)
47+
static int adc2_inited = 0;
48+
#endif
4649
#if defined(ADC3)
4750
static int adc3_inited = 0;
4851
#endif
@@ -70,6 +73,13 @@ void analogin_init(analogin_t *obj, PinName pin)
7073
adc1_inited = 1;
7174
}
7275
#endif
76+
#if defined(ADC2)
77+
if ((obj->adc == ADC_2) && adc2_inited) return;
78+
if (obj->adc == ADC_2) {
79+
__ADC2_CLK_ENABLE();
80+
adc2_inited = 1;
81+
}
82+
#endif
7383
#if defined(ADC3)
7484
if ((obj->adc == ADC_3) && adc3_inited) return;
7585
if (obj->adc == ADC_3) {

0 commit comments

Comments
 (0)