Skip to content

Commit 19dcdbc

Browse files
chrissbarrchrissbarr
committed
Tidy Pin Defines
Make format consistent with that recommended in board_template when not using NUM_ANALOG_FIRST. Groundwork for enabling further ADC pins in future commit.
1 parent 10bd598 commit 19dcdbc

File tree

2 files changed

+94
-94
lines changed

2 files changed

+94
-94
lines changed

‎variants/RUMBA32_F446VE/variant.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ const PinName digitalPin[] = {
2727
PA_0, //D0
2828
PA_1, //D1
2929
PA_2, //D2
30-
PA_3, //D3
31-
PA_4, //D4
30+
PA_3, //D3 //A0
31+
PA_4, //D4 //A1
3232
PA_5, //D5
3333
PA_6, //D6
3434
PA_7, //D7
@@ -56,11 +56,11 @@ const PinName digitalPin[] = {
5656
PB_13, //D29
5757
PB_14, //D30
5858
PB_15, //D31
59-
PC_0, //D32
60-
PC_1, //D33
61-
PC_2, //D34
62-
PC_3, //D35
63-
PC_4, //D36
59+
PC_0, //D32 //A2
60+
PC_1, //D33 //A3
61+
PC_2, //D34 //A4
62+
PC_3, //D35 //A5
63+
PC_4, //D36 //A6
6464
PC_5, //D37
6565
PC_6, //D38
6666
PC_7, //D39
@@ -108,13 +108,13 @@ const PinName digitalPin[] = {
108108

109109
// Analog (Ax) pin number array
110110
const uint32_t analogInputPin[] = {
111-
3, //A0
112-
4, //A1
113-
32, //A2
114-
33, //A3
115-
34, //A4
116-
35, //A5
117-
36 //A6
111+
3, //D3 //A0
112+
4, //D4 //A1
113+
32, //D32 //A2
114+
33, //D33 //A3
115+
34, //D34 //A4
116+
35, //D35 //A5
117+
36 //D36 //A6
118118
};
119119

120120
#ifdef __cplusplus

‎variants/RUMBA32_F446VE/variant.h

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

30-
#define PA0 0 //D0
31-
#define PA1 1 //D1
32-
#define PA2 2 //D2
33-
#define PA3 A0 //D3
34-
#define PA4 A1 //D4
35-
#define PA5 5 //D5
36-
#define PA6 6 //D6
37-
#define PA7 7 //D7
38-
#define PA8 8 //D8
39-
#define PA9 9 //D9
40-
#define PA10 10 //D10
41-
#define PA11 11 //D11
42-
#define PA12 12 //D12
43-
#define PA13 13 //D13
44-
#define PA14 14 //D14
45-
#define PA15 15 //D15
46-
#define PB0 16 //D16
47-
#define PB1 17 //D17
48-
#define PB2 18 //D18
49-
#define PB3 19 //D19
50-
#define PB4 20 //D20
51-
#define PB5 21 //D21
52-
#define PB6 22 //D22
53-
#define PB7 23 //D23
54-
#define PB8 24 //D24
55-
#define PB9 25 //D25
56-
#define PB10 26 //D26
57-
#define PB11 27 //D27
58-
#define PB12 28 //D28
59-
#define PB13 29 //D29
60-
#define PB14 30 //D30
61-
#define PB15 31 //D31
62-
#define PC0 A2 //D32
63-
#define PC1 A3 //D33
64-
#define PC2 A4 //D34
65-
#define PC3 A5 //D35
66-
#define PC4 A6 //D36
67-
#define PC5 37 //D37
68-
#define PC6 38 //D38
69-
#define PC7 39 //D39
70-
#define PC8 40 //D40
71-
#define PC9 41 //D41
72-
#define PC10 42 //D42
73-
#define PC11 43 //D43
74-
#define PC12 44 //D44
75-
#define PC13 45 //D45
76-
#define PC14 46 //D46
77-
#define PC15 47 //D47
78-
#define PD0 48 //D48
79-
#define PD1 49 //D49
80-
#define PD2 50 //D50
81-
#define PD3 51 //D51
82-
#define PD4 52 //D52
83-
#define PD5 53 //D53
84-
#define PD6 54 //D54
85-
#define PD7 55 //D55
86-
#define PD8 56 //D56
87-
#define PD9 57 //D57
88-
#define PD10 58 //D58
89-
#define PD11 59 //D59
90-
#define PD12 60 //D60
91-
#define PD13 61 //D61
92-
#define PD14 62 //D62
93-
#define PD15 63 //D63
94-
#define PE0 64 //D64
95-
#define PE1 65 //D65
96-
#define PE2 66 //D66
97-
#define PE3 67 //D67
98-
#define PE4 68 //D68
99-
#define PE5 69 //D69
100-
#define PE6 70 //D70
101-
#define PE7 71 //D71
102-
#define PE8 72 //D72
103-
#define PE9 73 //D73
104-
#define PE10 74 //D74
105-
#define PE11 75 //D75
106-
#define PE12 76 //D76
107-
#define PE13 77 //D77
108-
#define PE14 78 //D78
109-
#define PE15 79 //D79
30+
#define PA0 0 //D0
31+
#define PA1 1 //D1
32+
#define PA2 2 //D2
33+
#define PA3 A0 //D3
34+
#define PA4 A1 //D4
35+
#define PA5 5 //D5
36+
#define PA6 6 //D6
37+
#define PA7 7 //D7
38+
#define PA8 8 //D8
39+
#define PA9 9 //D9
40+
#define PA10 10 //D10
41+
#define PA11 11 //D11
42+
#define PA12 12 //D12
43+
#define PA13 13 //D13
44+
#define PA14 14 //D14
45+
#define PA15 15 //D15
46+
#define PB0 16 //D16
47+
#define PB1 17 //D17
48+
#define PB2 18 //D18
49+
#define PB3 19 //D19
50+
#define PB4 20 //D20
51+
#define PB5 21 //D21
52+
#define PB6 22 //D22
53+
#define PB7 23 //D23
54+
#define PB8 24 //D24
55+
#define PB9 25 //D25
56+
#define PB10 26 //D26
57+
#define PB11 27 //D27
58+
#define PB12 28 //D28
59+
#define PB13 29 //D29
60+
#define PB14 30 //D30
61+
#define PB15 31 //D31
62+
#define PC0 A2 //D32
63+
#define PC1 A3 //D33
64+
#define PC2 A4 //D34
65+
#define PC3 A5 //D35
66+
#define PC4 A6 //D36
67+
#define PC5 37 //D37
68+
#define PC6 38 //D38
69+
#define PC7 39 //D39
70+
#define PC8 40 //D40
71+
#define PC9 41 //D41
72+
#define PC10 42 //D42
73+
#define PC11 43 //D43
74+
#define PC12 44 //D44
75+
#define PC13 45 //D45
76+
#define PC14 46 //D46
77+
#define PC15 47 //D47
78+
#define PD0 48 //D48
79+
#define PD1 49 //D49
80+
#define PD2 50 //D50
81+
#define PD3 51 //D51
82+
#define PD4 52 //D52
83+
#define PD5 53 //D53
84+
#define PD6 54 //D54
85+
#define PD7 55 //D55
86+
#define PD8 56 //D56
87+
#define PD9 57 //D57
88+
#define PD10 58 //D58
89+
#define PD11 59 //D59
90+
#define PD12 60 //D60
91+
#define PD13 61 //D61
92+
#define PD14 62 //D62
93+
#define PD15 63 //D63
94+
#define PE0 64 //D64
95+
#define PE1 65 //D65
96+
#define PE2 66 //D66
97+
#define PE3 67 //D67
98+
#define PE4 68 //D68
99+
#define PE5 69 //D69
100+
#define PE6 70 //D70
101+
#define PE7 71 //D71
102+
#define PE8 72 //D72
103+
#define PE9 73 //D73
104+
#define PE10 74 //D74
105+
#define PE11 75 //D75
106+
#define PE12 76 //D76
107+
#define PE13 77 //D77
108+
#define PE14 78 //D78
109+
#define PE15 79 //D79
110110

111111
// This must be a literal
112112
#define NUM_DIGITAL_PINS 80

0 commit comments

Comments
 (0)