Skip to content

Commit 133a3ca

Browse files
chrissbarrchrissbarr
committed
Enable all ADC1 Pins
Enable analog input on all pins which map to ADC1. Maintain consistency with previous pin mapping of A0 - A6, so should be no impact to existing code that uses this mapping.
1 parent 19dcdbc commit 133a3ca

File tree

3 files changed

+38
-29
lines changed

3 files changed

+38
-29
lines changed

Diff for: ‎variants/RUMBA32_F446VE/PeripheralPins.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,29 @@
4040

4141
#ifdef HAL_ADC_MODULE_ENABLED
4242
WEAK const PinMap PinMap_ADC[] = {
43-
// {PA_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
43+
{PA_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
4444
// {PA_0, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0
4545
// {PA_0, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0
46-
// {PA_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
46+
{PA_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
4747
// {PA_1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
4848
// {PA_1, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1
49-
// {PA_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
49+
{PA_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
5050
// {PA_2, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
5151
// {PA_2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2
5252
{PA_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
5353
// {PA_3, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
5454
// {PA_3, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3
5555
{PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
5656
// {PA_4, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
57-
// {PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
57+
{PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
5858
// {PA_5, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
59-
// {PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
59+
{PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
6060
// {PA_6, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
61-
// {PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
61+
{PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
6262
// {PA_7, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
63-
// {PB_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
63+
{PB_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
6464
// {PB_0, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
65-
// {PB_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
65+
{PB_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
6666
// {PB_1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
6767
{PC_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
6868
// {PC_0, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
@@ -78,7 +78,7 @@ WEAK const PinMap PinMap_ADC[] = {
7878
// {PC_3, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC3_IN13
7979
{PC_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
8080
// {PC_4, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
81-
// {PC_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
81+
{PC_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
8282
// {PC_5, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
8383
{NC, NP, 0}
8484
};

Diff for: ‎variants/RUMBA32_F446VE/variant.cpp

+19-10
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ extern "C" {
2424

2525
// Pin number
2626
const PinName digitalPin[] = {
27-
PA_0, //D0
28-
PA_1, //D1
29-
PA_2, //D2
27+
PA_0, //D0 //A7
28+
PA_1, //D1 //A8
29+
PA_2, //D2 //A9
3030
PA_3, //D3 //A0
3131
PA_4, //D4 //A1
32-
PA_5, //D5
33-
PA_6, //D6
34-
PA_7, //D7
32+
PA_5, //D5 //A10
33+
PA_6, //D6 //A11
34+
PA_7, //D7 //A12
3535
PA_8, //D8
3636
PA_9, //D9
3737
PA_10, //D10
@@ -40,8 +40,8 @@ const PinName digitalPin[] = {
4040
PA_13, //D13
4141
PA_14, //D14
4242
PA_15, //D15
43-
PB_0, //D16
44-
PB_1, //D17
43+
PB_0, //D16 //A13
44+
PB_1, //D17 //A14
4545
PB_2, //D18
4646
PB_3, //D19
4747
PB_4, //D20
@@ -61,7 +61,7 @@ const PinName digitalPin[] = {
6161
PC_2, //D34 //A4
6262
PC_3, //D35 //A5
6363
PC_4, //D36 //A6
64-
PC_5, //D37
64+
PC_5, //D37 //A15
6565
PC_6, //D38
6666
PC_7, //D39
6767
PC_8, //D40
@@ -114,7 +114,16 @@ const uint32_t analogInputPin[] = {
114114
33, //D33 //A3
115115
34, //D34 //A4
116116
35, //D35 //A5
117-
36 //D36 //A6
117+
36, //D36 //A6
118+
0, //D0 //A7
119+
1, //D1 //A8
120+
2, //D2 //A9
121+
5, //D5 //A10
122+
6, //D6 //A11
123+
7, //D7 //A12
124+
16, //D16 //A13
125+
17, //D17 //A14
126+
37 //D37 //A15
118127
};
119128

120129
#ifdef __cplusplus

Diff for: ‎variants/RUMBA32_F446VE/variant.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ extern "C" {
2727
* Pins
2828
*----------------------------------------------------------------------------*/
2929

30-
#define PA0 0 //D0
31-
#define PA1 1 //D1
32-
#define PA2 2 //D2
30+
#define PA0 A7 //D0
31+
#define PA1 A8 //D1
32+
#define PA2 A9 //D2
3333
#define PA3 A0 //D3
3434
#define PA4 A1 //D4
35-
#define PA5 5 //D5
36-
#define PA6 6 //D6
37-
#define PA7 7 //D7
35+
#define PA5 A10 //D5
36+
#define PA6 A11 //D6
37+
#define PA7 A12 //D7
3838
#define PA8 8 //D8
3939
#define PA9 9 //D9
4040
#define PA10 10 //D10
@@ -43,8 +43,8 @@ extern "C" {
4343
#define PA13 13 //D13
4444
#define PA14 14 //D14
4545
#define PA15 15 //D15
46-
#define PB0 16 //D16
47-
#define PB1 17 //D17
46+
#define PB0 A13 //D16
47+
#define PB1 A14 //D17
4848
#define PB2 18 //D18
4949
#define PB3 19 //D19
5050
#define PB4 20 //D20
@@ -64,7 +64,7 @@ extern "C" {
6464
#define PC2 A4 //D34
6565
#define PC3 A5 //D35
6666
#define PC4 A6 //D36
67-
#define PC5 37 //D37
67+
#define PC5 A15 //D37
6868
#define PC6 38 //D38
6969
#define PC7 39 //D39
7070
#define PC8 40 //D40
@@ -111,7 +111,7 @@ extern "C" {
111111
// This must be a literal
112112
#define NUM_DIGITAL_PINS 80
113113
// This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
114-
#define NUM_ANALOG_INPUTS 7
114+
#define NUM_ANALOG_INPUTS 16
115115

116116
// PWM resolution
117117
#define PWM_FREQUENCY 20000 // >= 20 Khz => inaudible noise for fans

0 commit comments

Comments
 (0)