Skip to content

Commit bfce9b2

Browse files
authored
Merge pull request #356 from fpistm/pr-309-review
Use define instead of enum for pins in variant.h
2 parents c6093d7 + 20dc152 commit bfce9b2

File tree

34 files changed

+1994
-2307
lines changed

34 files changed

+1994
-2307
lines changed

cores/arduino/pins_arduino.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
// Avoid PortName issue
2424
_Static_assert(LastPort <= 0x0F, "PortName must be less than 16");
2525

26-
// Avoid pins number misalignment
27-
_Static_assert(NUM_DIGITAL_PINS==PEND, "NUM_DIGITAL_PINS and PEND differ!");
28-
2926
// Arduino digital pins alias
3027
// GPIO port (A to K) * 16 pins: 176
3128
enum {

variants/BLACK_F407VE/variant.h

Lines changed: 79 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -44,80 +44,85 @@ extern "C"{
4444
* Pins
4545
*----------------------------------------------------------------------------*/
4646
extern const PinName digitalPin[];
47-
48-
enum {
49-
// Left Side
50-
//Ext //Int
51-
//5V //5V
52-
//5V //5V
53-
//3V3 //3V3
54-
//3V3 //3V3
55-
//GND //GND
56-
PE2, PE3, // D0, D1
57-
PE4, PE5, // PE_4: BUT K0, PE_5: BUT K1
58-
PE6, PC13,
59-
PC0, PC1,
60-
PC2, PC3,
61-
//VREF- //VREF+
62-
PA0, PA1, // D10, D11 PA_0(WK_UP): BUT K_UP)
63-
PA2, PA3,
64-
PA4, PA5,
65-
PA6, PA7, // PA_6: LED D2, PA_7: LED D3 (active LOW)
66-
PC4, PC5,
67-
PB0, PB1, // D20, D21
68-
PE7, PE8,
69-
PE9, PE10,
70-
PE11, PE12,
71-
PE13, PE14,
72-
PE15, PB10, // D30, D31
73-
PB11, PB12,
74-
PB13, PB14,
75-
// Right Side
76-
//Int //Ext
77-
//3V3 //3V3
78-
//3V3 //3V3
79-
//BOOT0 //BOOT1
80-
//GND //GND
81-
//GND //GND
82-
PE1, PE0,
83-
PB9, PB8,
84-
PB7, PB6, // D40, D41
85-
PB5, PB3,
86-
PD7, PD6,
87-
PD5, PD4,
88-
PD3, PD2,
89-
PD1, PD0, // D50, D51
90-
PC12, PC11,
91-
PC10, PA15,
92-
PA12, PA11, // PA_11: USB_DM, PA_12: USB_DP
93-
PA10, PA9,
94-
PA8, PC9, // D60, D61
95-
PC8, PC7,
96-
PC6, PD15,
97-
PD14, PD13,
98-
PD12, PD11,
99-
PD10, PD9, // D70, D71
100-
PD8, PB15,
101-
PB4,
102-
// Analog pins
103-
PA0_A, // D75
104-
PA1_A,
105-
PA2_A,
106-
PA3_A,
107-
PA4_A,
108-
PA5_A, // D80
109-
PB0_A,
110-
PB1_A,
111-
PC0_A,
112-
PC1_A,
113-
PC2_A,
114-
PC3_A,
115-
PC4_A,
116-
PC5_A,
117-
PEND
118-
};
119-
120-
// This must be a literal with the same value as PEND
47+
// Left Side
48+
#define PE2 0
49+
#define PE3 1
50+
#define PE4 2 // BUT K0
51+
#define PE5 3 // BUT K1
52+
#define PE6 4
53+
#define PC13 5
54+
#define PC0 6 // A8
55+
#define PC1 7 // A9
56+
#define PC2 8 // A10
57+
#define PC3 9 // A11
58+
#define PA0 10 // A0/WK_UP: BUT K_UP
59+
#define PA1 11 // A1
60+
#define PA2 12 // A2
61+
#define PA3 13 // A3
62+
#define PA4 14 // A4
63+
#define PA5 15 // A5
64+
#define PA6 16 // LED D2
65+
#define PA7 17 // LED D3 (active LOW)
66+
#define PC4 18 // A12
67+
#define PC5 19 // A13
68+
#define PB0 20 // A6
69+
#define PB1 21 // A7
70+
#define PE7 22
71+
#define PE8 23
72+
#define PE9 24
73+
#define PE10 25
74+
#define PE11 26
75+
#define PE12 27
76+
#define PE13 28
77+
#define PE14 29
78+
#define PE15 30
79+
#define PB10 31
80+
#define PB11 32
81+
#define PB12 33
82+
#define PB13 34
83+
#define PB14 35
84+
// Right Side
85+
#define PE1 36
86+
#define PE0 37
87+
#define PB9 38
88+
#define PB8 39
89+
#define PB7 40
90+
#define PB6 41
91+
#define PB5 42
92+
#define PB3 43
93+
#define PD7 44
94+
#define PD6 45
95+
#define PD5 46
96+
#define PD4 47
97+
#define PD3 48
98+
#define PD2 49
99+
#define PD1 50
100+
#define PD0 51
101+
#define PC12 52
102+
#define PC11 53
103+
#define PC10 54
104+
#define PA15 55
105+
#define PA12 56 // USB_DP
106+
#define PA11 57 // USB_DM
107+
#define PA10 58
108+
#define PA9 59
109+
#define PA8 60
110+
#define PC9 61
111+
#define PC8 62
112+
#define PC7 63
113+
#define PC6 64
114+
#define PD15 65
115+
#define PD14 66
116+
#define PD13 67
117+
#define PD12 68
118+
#define PD11 69
119+
#define PD10 70
120+
#define PD9 71
121+
#define PD8 72
122+
#define PB15 73
123+
#define PB4 74
124+
125+
// This must be a literal
121126
#define NUM_DIGITAL_PINS 89
122127
// This must be a literal with a value less than or equal to MAX_ANALOG_INPUTS
123128
#define NUM_ANALOG_INPUTS 14

variants/BLUEPILL_F103C8/variant.h

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -44,50 +44,47 @@ extern "C"{
4444
*----------------------------------------------------------------------------*/
4545
extern const PinName digitalPin[];
4646

47-
enum {
4847
// USB connector on the top, MCU side
4948
// Left Side
50-
PB9, //D0
51-
PB8, //D1
52-
PB7, //D2
53-
PB6, //D3
54-
PB5, //D4
55-
PB4, //D5
56-
PB3, //D6
57-
PA15, //D7
58-
PA12, //D8 - USB DP
59-
PA11, //D9 - USB DM
60-
PA10, //D10
61-
PA9, //D11
62-
PA8, //D12
63-
PB15, //D13
64-
PB14, //D14
65-
PB13, //D15
66-
PB12, //D16
49+
#define PB9 0
50+
#define PB8 1
51+
#define PB7 2
52+
#define PB6 3
53+
#define PB5 4
54+
#define PB4 5
55+
#define PB3 6
56+
#define PA15 7
57+
#define PA12 8 // USB DP
58+
#define PA11 9 // USB DM
59+
#define PA10 10
60+
#define PA9 11
61+
#define PA8 12
62+
#define PB15 13
63+
#define PB14 14
64+
#define PB13 15
65+
#define PB12 16
6766
// Right side
68-
PC13, //D17 - LED
69-
PC14, //D18
70-
PC15, //D19
71-
PA0, //D20/A0
72-
PA1, //D21/A1
73-
PA2, //D22/A2
74-
PA3, //D23/A3
75-
PA4, //D24/A4
76-
PA5, //D25/A5
77-
PA6, //D26/A6
78-
PA7, //D27/A7
79-
PB0, //D28/A8
80-
PB1, //D29/A9
81-
PB10, //D30
82-
PB11, //D31
67+
#define PC13 17 // LED
68+
#define PC14 18
69+
#define PC15 19
70+
#define PA0 20 // A0
71+
#define PA1 21 // A1
72+
#define PA2 22 // A2
73+
#define PA3 23 // A3
74+
#define PA4 24 // A4
75+
#define PA5 25 // A5
76+
#define PA6 26 // A6
77+
#define PA7 27 // A7
78+
#define PB0 28 // A8
79+
#define PB1 29 // A9
80+
#define PB10 30
81+
#define PB11 31
8382
// Other
84-
PB2, //D32 - BOOT1
85-
PA13, //D33 - SWDI0
86-
PA14, //D34 - SWCLK
87-
PEND
88-
};
83+
#define PB2 32 // BOOT1
84+
#define PA13 33 // SWDI0
85+
#define PA14 34 // SWCLK
8986

90-
// This must be a literal with the same value as PEND
87+
// This must be a literal
9188
#define NUM_DIGITAL_PINS 35
9289
// This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
9390
#define NUM_ANALOG_INPUTS 10

0 commit comments

Comments
 (0)