Skip to content

Commit ad59be6

Browse files
sg-sg-
authored
Merge pull request #2928 from bcostm/adcintch_F7
STM32F7xx - Add support of ADC internal channels
2 parents eee4db1 + 7f14131 commit ad59be6

File tree

9 files changed

+57
-28
lines changed

9 files changed

+57
-28
lines changed

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F746NG/PeripheralPins.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ const PinMap PinMap_ADC[] = {
4747
{PF_8, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6 - ARDUINO A3
4848
{PF_9, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7 - ARDUINO A2
4949
{PF_10, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8 - ARDUINO A1
50+
{ADC_TEMP, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // See in analogin_api.c the correct ADC channel used
51+
{ADC_VREF, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // See in analogin_api.c the correct ADC channel used
52+
{ADC_VBAT, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // See in analogin_api.c the correct ADC channel used
5053
{NC, NC, 0}
5154
};
5255

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F746NG/PinNames.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* mbed Microcontroller Library
22
*******************************************************************************
3-
* Copyright (c) 2015, STMicroelectronics
3+
* Copyright (c) 2016, STMicroelectronics
44
* All rights reserved.
55
*
66
* Redistribution and use in source and binary forms, with or without
@@ -43,14 +43,14 @@ extern "C" {
4343
#define STM_PIN_DATA_EXT(MODE, PUPD, AFNUM, CHANNEL, INVERTED) ((int)(((MODE & 0x0F) << 0) |\
4444
((PUPD & 0x07) << 4) |\
4545
((AFNUM & 0x0F) << 7) |\
46-
((CHANNEL & 0x0F) << 11) |\
47-
((INVERTED & 0x01) << 15)))
46+
((CHANNEL & 0x1F) << 11) |\
47+
((INVERTED & 0x01) << 16)))
4848

4949
#define STM_PIN_MODE(X) (((X) >> 0) & 0x0F)
5050
#define STM_PIN_PUPD(X) (((X) >> 4) & 0x07)
5151
#define STM_PIN_AFNUM(X) (((X) >> 7) & 0x0F)
52-
#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x0F)
53-
#define STM_PIN_INVERTED(X) (((X) >> 15) & 0x01)
52+
#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x1F)
53+
#define STM_PIN_INVERTED(X) (((X) >> 16) & 0x01)
5454

5555
#define STM_MODE_INPUT (0)
5656
#define STM_MODE_OUTPUT_PP (1)
@@ -256,6 +256,11 @@ typedef enum {
256256
PK_6 = 0xA6,
257257
PK_7 = 0xA7,
258258

259+
// ADC internal channels
260+
ADC_TEMP = 0xF0,
261+
ADC_VREF = 0xF1,
262+
ADC_VBAT = 0xF2,
263+
259264
// Arduino connector namings
260265
A0 = PA_0,
261266
A1 = PF_10,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F769NI/PeripheralPins.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ const PinMap PinMap_ADC[] = {
5252
{PF_8, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6 - ARDUINO A4
5353
{PF_9, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7 - ARDUINO A5
5454
{PF_10, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8 - ARDUINO A3
55-
55+
{ADC_TEMP, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // See in analogin_api.c the correct ADC channel used
56+
{ADC_VREF, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // See in analogin_api.c the correct ADC channel used
57+
{ADC_VBAT, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // See in analogin_api.c the correct ADC channel used
5658
{NC, NC, 0}
5759
};
5860

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F769NI/PinNames.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* mbed Microcontroller Library
22
*******************************************************************************
3-
* Copyright (c) 2015, STMicroelectronics
3+
* Copyright (c) 2016, STMicroelectronics
44
* All rights reserved.
55
*
66
* Redistribution and use in source and binary forms, with or without
@@ -43,14 +43,14 @@ extern "C" {
4343
#define STM_PIN_DATA_EXT(MODE, PUPD, AFNUM, CHANNEL, INVERTED) ((int)(((MODE & 0x0F) << 0) |\
4444
((PUPD & 0x07) << 4) |\
4545
((AFNUM & 0x0F) << 7) |\
46-
((CHANNEL & 0x0F) << 11) |\
47-
((INVERTED & 0x01) << 15)))
46+
((CHANNEL & 0x1F) << 11) |\
47+
((INVERTED & 0x01) << 16)))
4848

4949
#define STM_PIN_MODE(X) (((X) >> 0) & 0x0F)
5050
#define STM_PIN_PUPD(X) (((X) >> 4) & 0x07)
5151
#define STM_PIN_AFNUM(X) (((X) >> 7) & 0x0F)
52-
#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x0F)
53-
#define STM_PIN_INVERTED(X) (((X) >> 15) & 0x01)
52+
#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x1F)
53+
#define STM_PIN_INVERTED(X) (((X) >> 16) & 0x01)
5454

5555
#define STM_MODE_INPUT (0)
5656
#define STM_MODE_OUTPUT_PP (1)
@@ -256,6 +256,11 @@ typedef enum {
256256
PK_6 = 0xA6,
257257
PK_7 = 0xA7,
258258

259+
// ADC internal channels
260+
ADC_TEMP = 0xF0,
261+
ADC_VREF = 0xF1,
262+
ADC_VBAT = 0xF2,
263+
259264
// Arduino connector namings
260265
A0 = PA_6,
261266
A1 = PA_4,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F746ZG/PeripheralPins.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ const PinMap PinMap_ADC[] = {
5757
{PC_3, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0,13, 0)}, // ADC1_IN13 - ARDUINO A2
5858
// {PC_4, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0,14, 0)}, // ADC1_IN14 (used by ethernet)
5959
// {PC_5, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0,15, 0)}, // ADC1_IN15 (used by ethernet)
60-
6160
{PF_3, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9 - ARDUINO A3
6261
{PF_4, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0,14, 0)}, // ADC3_IN14
6362
{PF_5, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0,15, 0)}, // ADC3_IN15 - ARDUINO A4
@@ -66,7 +65,9 @@ const PinMap PinMap_ADC[] = {
6665
{PF_8, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6
6766
{PF_9, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7
6867
{PF_10, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8 - ARDUINO A5
69-
68+
{ADC_TEMP, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // See in analogin_api.c the correct ADC channel used
69+
{ADC_VREF, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // See in analogin_api.c the correct ADC channel used
70+
{ADC_VBAT, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // See in analogin_api.c the correct ADC channel used
7071
{NC, NC, 0}
7172
};
7273

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F746ZG/PinNames.h

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ extern "C" {
4343
#define STM_PIN_DATA_EXT(MODE, PUPD, AFNUM, CHANNEL, INVERTED) ((int)(((MODE & 0x0F) << 0) |\
4444
((PUPD & 0x07) << 4) |\
4545
((AFNUM & 0x0F) << 7) |\
46-
((CHANNEL & 0x0F) << 11) |\
47-
((INVERTED & 0x01) << 15)))
46+
((CHANNEL & 0x1F) << 11) |\
47+
((INVERTED & 0x01) << 16)))
4848

4949
#define STM_PIN_MODE(X) (((X) >> 0) & 0x0F)
5050
#define STM_PIN_PUPD(X) (((X) >> 4) & 0x07)
5151
#define STM_PIN_AFNUM(X) (((X) >> 7) & 0x0F)
52-
#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x0F)
53-
#define STM_PIN_INVERTED(X) (((X) >> 15) & 0x01)
52+
#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x1F)
53+
#define STM_PIN_INVERTED(X) (((X) >> 16) & 0x01)
5454

5555
#define STM_MODE_INPUT (0)
5656
#define STM_MODE_OUTPUT_PP (1)
@@ -199,6 +199,11 @@ typedef enum {
199199
PH_0 = 0x70,
200200
PH_1 = 0x71,
201201

202+
// ADC internal channels
203+
ADC_TEMP = 0xF0,
204+
ADC_VREF = 0xF1,
205+
ADC_VBAT = 0xF2,
206+
202207
// Arduino connector namings
203208
A0 = PA_3,
204209
A1 = PC_0,

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F767ZI/PeripheralPins.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ const PinMap PinMap_ADC[] = {
5757
{PC_3, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0,13, 0)}, // ADC1_IN13 - ARDUINO A2
5858
// {PC_4, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0,14, 0)}, // ADC1_IN14 (used by ethernet)
5959
// {PC_5, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0,15, 0)}, // ADC1_IN15 (used by ethernet)
60-
6160
{PF_3, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9 - ARDUINO A3
6261
{PF_4, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0,14, 0)}, // ADC3_IN14
6362
{PF_5, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0,15, 0)}, // ADC3_IN15 - ARDUINO A4
@@ -66,7 +65,9 @@ const PinMap PinMap_ADC[] = {
6665
{PF_8, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6
6766
{PF_9, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7
6867
{PF_10, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8 - ARDUINO A5
69-
68+
{ADC_TEMP, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // See in analogin_api.c the correct ADC channel used
69+
{ADC_VREF, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)}, // See in analogin_api.c the correct ADC channel used
70+
{ADC_VBAT, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)}, // See in analogin_api.c the correct ADC channel used
7071
{NC, NC, 0}
7172
};
7273

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F767ZI/PinNames.h

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ extern "C" {
4343
#define STM_PIN_DATA_EXT(MODE, PUPD, AFNUM, CHANNEL, INVERTED) ((int)(((MODE & 0x0F) << 0) |\
4444
((PUPD & 0x07) << 4) |\
4545
((AFNUM & 0x0F) << 7) |\
46-
((CHANNEL & 0x0F) << 11) |\
47-
((INVERTED & 0x01) << 15)))
46+
((CHANNEL & 0x1F) << 11) |\
47+
((INVERTED & 0x01) << 16)))
4848

4949
#define STM_PIN_MODE(X) (((X) >> 0) & 0x0F)
5050
#define STM_PIN_PUPD(X) (((X) >> 4) & 0x07)
5151
#define STM_PIN_AFNUM(X) (((X) >> 7) & 0x0F)
52-
#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x0F)
53-
#define STM_PIN_INVERTED(X) (((X) >> 15) & 0x01)
52+
#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x1F)
53+
#define STM_PIN_INVERTED(X) (((X) >> 16) & 0x01)
5454

5555
#define STM_MODE_INPUT (0)
5656
#define STM_MODE_OUTPUT_PP (1)
@@ -199,6 +199,11 @@ typedef enum {
199199
PH_0 = 0x70,
200200
PH_1 = 0x71,
201201

202+
// ADC internal channels
203+
ADC_TEMP = 0xF0,
204+
ADC_VREF = 0xF1,
205+
ADC_VBAT = 0xF2,
206+
202207
// Arduino connector namings
203208
A0 = PA_3,
204209
A1 = PC_0,

‎targets/TARGET_STM/TARGET_STM32F7/analogin_api.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ void analogin_init(analogin_t *obj, PinName pin)
5959
MBED_ASSERT(function != (uint32_t)NC);
6060
obj->channel = STM_PIN_CHANNEL(function);
6161

62-
// Configure GPIO
63-
pinmap_pinout(pin, PinMap_ADC);
62+
// Configure GPIO excepted for internal channels (Temperature, Vref, Vbat)
63+
if ((obj->channel != 16) && (obj->channel != 17) && (obj->channel != 18)) {
64+
pinmap_pinout(pin, PinMap_ADC);
65+
}
6466

6567
// Save pin number for the read function
6668
obj->pin = pin;
@@ -170,13 +172,13 @@ static inline uint16_t adc_read(analogin_t *obj)
170172
sConfig.Channel = ADC_CHANNEL_15;
171173
break;
172174
case 16:
173-
sConfig.Channel = ADC_CHANNEL_16;
175+
sConfig.Channel = ADC_CHANNEL_TEMPSENSOR;
174176
break;
175177
case 17:
176-
sConfig.Channel = ADC_CHANNEL_17;
178+
sConfig.Channel = ADC_CHANNEL_VREFINT;
177179
break;
178180
case 18:
179-
sConfig.Channel = ADC_CHANNEL_18;
181+
sConfig.Channel = ADC_CHANNEL_VBAT;
180182
break;
181183
default:
182184
return 0;

0 commit comments

Comments
 (0)