Skip to content

Commit 39e7182

Browse files
bcostmbcostm
committed
STM32F3xx - Add one more bit for the channel number. Declare ADC internal channels "pins".
1 parent 213b44d commit 39e7182

File tree

7 files changed

+110
-42
lines changed

7 files changed

+110
-42
lines changed

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_DISCO_F303VC/PinNames.h

Lines changed: 17 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)
@@ -179,6 +179,18 @@ typedef enum {
179179
PF_14 = 0x5E,
180180
PF_15 = 0x5F,
181181

182+
// ADC internal channels
183+
ADC_TEMP = 0xF0,
184+
ADC_VREF1 = 0xF1,
185+
ADC_VREF2 = 0xF2,
186+
ADC_VREF3 = 0xF3,
187+
ADC_VREF4 = 0xF4,
188+
ADC_VBAT = 0xF5,
189+
ADC_VOPAMP1 = 0xF6,
190+
ADC_VOPAMP2 = 0xF7,
191+
ADC_VOPAMP3 = 0xF8,
192+
ADC_VOPAMP4 = 0xF9,
193+
182194
// Arduino connector namings
183195
A0 = PA_0,
184196
A1 = PA_1,

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_DISCO_F334C8/PinNames.h

Lines changed: 12 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)
@@ -118,6 +118,13 @@ typedef enum {
118118
PF_0 = 0x50,
119119
PF_1 = 0x51,
120120

121+
// ADC internal channels
122+
ADC_TEMP = 0xF0,
123+
ADC_VREF1 = 0xF1,
124+
ADC_VREF2 = 0xF2,
125+
ADC_VBAT = 0xF3,
126+
ADC_VOPAMP2 = 0xF4,
127+
121128
// Arduino connector namings
122129
// Note: The Arduino connector is not present on this board.
123130
// We keep these definitions for compatibility with Nucleo code examples.

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/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)
@@ -133,6 +133,11 @@ typedef enum {
133133
PF_0 = 0x50,
134134
PF_1 = 0x51,
135135

136+
// ADC internal channels
137+
ADC_TEMP = 0xF0,
138+
ADC_VREF = 0xF1,
139+
ADC_VBAT = 0xF2,
140+
136141
// Arduino connector namings
137142
A0 = PA_0,
138143
A1 = PA_1,

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303K8/PinNames.h

Lines changed: 12 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)
@@ -105,6 +105,13 @@ typedef enum {
105105
PF_0 = 0x50,
106106
PF_1 = 0x51,
107107

108+
// ADC internal channels
109+
ADC_TEMP = 0xF0,
110+
ADC_VREF1 = 0xF1,
111+
ADC_VREF2 = 0xF2,
112+
ADC_VBAT = 0xF3,
113+
ADC_VOPAMP2 = 0xF4,
114+
108115
// Arduino connector namings
109116
A0 = PA_0,
110117
A1 = PA_1,

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303RE/PinNames.h

Lines changed: 17 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)
@@ -133,6 +133,18 @@ typedef enum {
133133
PF_0 = 0x50,
134134
PF_1 = 0x51,
135135

136+
// ADC internal channels
137+
ADC_TEMP = 0xF0,
138+
ADC_VREF1 = 0xF1,
139+
ADC_VREF2 = 0xF2,
140+
ADC_VREF3 = 0xF3,
141+
ADC_VREF4 = 0xF4,
142+
ADC_VBAT = 0xF5,
143+
ADC_VOPAMP1 = 0xF6,
144+
ADC_VOPAMP2 = 0xF7,
145+
ADC_VOPAMP3 = 0xF8,
146+
ADC_VOPAMP4 = 0xF9,
147+
136148
// Arduino connector namings
137149
A0 = PA_0,
138150
A1 = PA_1,

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303ZE/PinNames.h

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* mbed Microcontroller Library
22
*******************************************************************************
3-
* Copyright (c) 2014, STMicroelectronics
3+
* Copyright (c) 2016, STMicroelectronics
44
* All rights reserved.
55
*
66
* Redistribution and use in source and binary forms, with or without
@@ -36,14 +36,22 @@
3636
extern "C" {
3737
#endif
3838

39-
// See stm32f4xx_hal_gpio.h and stm32f4xx_hal_gpio_ex.h for values of MODE, PUPD and AFNUM
40-
#define STM_PIN_DATA(MODE, PUPD, AFNUM) ((int)(((AFNUM) << 7) | ((PUPD) << 4) | ((MODE) << 0)))
41-
#define STM_PIN_DATA_EXT(MODE, PUPD, AFNUM, CHANNEL, INVERTED) ((int)(((INVERTED & 0x01) << 15) | ((CHANNEL & 0x0F) << 11) | ((AFNUM & 0x0F) << 7) | ((PUPD & 0x07) << 4) | ((MODE & 0x0F) << 0)))
42-
#define STM_PIN_MODE(X) (((X) >> 0) & 0x0F)
43-
#define STM_PIN_PUPD(X) (((X) >> 4) & 0x07)
44-
#define STM_PIN_AFNUM(X) (((X) >> 7) & 0x0F)
45-
#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x0F)
46-
#define STM_PIN_INVERTED(X) (((X) >> 15) & 0x01)
39+
#define STM_PIN_DATA(MODE, PUPD, AFNUM) ((int)(((MODE & 0x0F) << 0) |\
40+
((PUPD & 0x07) << 4) |\
41+
((AFNUM & 0x0F) << 7)))
42+
43+
#define STM_PIN_DATA_EXT(MODE, PUPD, AFNUM, CHANNEL, INVERTED) ((int)(((MODE & 0x0F) << 0) |\
44+
((PUPD & 0x07) << 4) |\
45+
((AFNUM & 0x0F) << 7) |\
46+
((CHANNEL & 0x1F) << 11) |\
47+
((INVERTED & 0x01) << 16)))
48+
49+
#define STM_PIN_MODE(X) (((X) >> 0) & 0x0F)
50+
#define STM_PIN_PUPD(X) (((X) >> 4) & 0x07)
51+
#define STM_PIN_AFNUM(X) (((X) >> 7) & 0x0F)
52+
#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x1F)
53+
#define STM_PIN_INVERTED(X) (((X) >> 16) & 0x01)
54+
4755
#define STM_MODE_INPUT (0)
4856
#define STM_MODE_OUTPUT_PP (1)
4957
#define STM_MODE_OUTPUT_OD (2)
@@ -192,13 +200,25 @@ typedef enum {
192200
PH_1 = 0x71,
193201
PH_2 = 0x72,
194202

203+
// ADC internal channels
204+
ADC_TEMP = 0xF0,
205+
ADC_VREF1 = 0xF1,
206+
ADC_VREF2 = 0xF2,
207+
ADC_VREF3 = 0xF3,
208+
ADC_VREF4 = 0xF4,
209+
ADC_VBAT = 0xF5,
210+
ADC_VOPAMP1 = 0xF6,
211+
ADC_VOPAMP2 = 0xF7,
212+
ADC_VOPAMP3 = 0xF8,
213+
ADC_VOPAMP4 = 0xF9,
214+
195215
// Arduino connector namings
196216
A0 = PA_3,
197217
A1 = PC_0,
198218
A2 = PC_3,
199219
A3 = PC_1,
200220
A4 = PC_4,
201-
A5 = PC_5,
221+
A5 = PC_5,
202222
D0 = PG_9,
203223
D1 = PG_14,
204224
D2 = PF_15,
@@ -246,8 +266,6 @@ typedef enum {
246266
PullDefault = PullNone
247267
} PinMode;
248268

249-
250-
251269
#ifdef __cplusplus
252270
}
253271
#endif

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F334R8/PinNames.h

Lines changed: 12 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)
@@ -133,6 +133,13 @@ typedef enum {
133133
PF_0 = 0x50,
134134
PF_1 = 0x51,
135135

136+
// ADC internal channels
137+
ADC_TEMP = 0xF0,
138+
ADC_VREF1 = 0xF1,
139+
ADC_VREF2 = 0xF2,
140+
ADC_VBAT = 0xF3,
141+
ADC_VOPAMP2 = 0xF4,
142+
136143
// Arduino connector namings
137144
A0 = PA_0,
138145
A1 = PA_1,

0 commit comments

Comments
 (0)