Skip to content

Commit 2514e7a

Browse files
fpistmfpistm
committed
Pin name PXn should match Arduino pin numberin Dx
Issue stm32duino#81 Signed-off-by: Frederic.Pillon <[email protected]>
1 parent b11523e commit 2514e7a

File tree

20 files changed

+1065
-157
lines changed

20 files changed

+1065
-157
lines changed

Diff for: ‎cores/arduino/pins_arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern "C" {
3333
#endif
3434

3535
#define NOT_AN_INTERRUPT NC // -1
36-
36+
#define DEND PEND
3737
#define NUM_DIGITAL_PINS DEND
3838
#define NUM_ANALOG_INPUTS (AEND-A0)
3939

Diff for: ‎cores/arduino/wiring_constants.h

+24
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,30 @@ extern "C"{
2525

2626
#include <stdbool.h>
2727

28+
// Arduino digital pin alias
29+
// GPIO port (A to K) * 16 pins: 176
30+
enum {
31+
D0, D1, D2, D3, D4, D5, D6, D7, D8, D9,
32+
D10, D11, D12, D13, D14, D15, D16, D17, D18, D19,
33+
D20, D21, D22, D23, D24, D25, D26, D27, D28, D29,
34+
D30, D31, D32, D33, D34, D35, D36, D37, D38, D39,
35+
D40, D41, D42, D43, D44, D45, D46, D47, D48, D49,
36+
D50, D51, D52, D53, D54, D55, D56, D57, D58, D59,
37+
D60, D61, D62, D63, D64, D65, D66, D67, D68, D69,
38+
D70, D71, D72, D73, D74, D75, D76, D77, D78, D79,
39+
D80, D81, D82, D83, D84, D85, D86, D87, D88, D89,
40+
D90, D91, D92, D93, D94, D95, D96, D97, D98, D99,
41+
D100, D101, D102, D103, D104, D105, D106, D107, D108, D109,
42+
D110, D111, D112, D113, D114, D115, D116, D117, D118, D119,
43+
D120, D121, D122, D123, D124, D125, D126, D127, D128, D129,
44+
D130, D131, D132, D133, D134, D135, D136, D137, D138, D139,
45+
D140, D141, D142, D143, D144, D145, D146, D147, D148, D149,
46+
D150, D151, D152, D153, D154, D155, D156, D157, D158, D159,
47+
D160, D161, D162, D163, D164, D165, D166, D167, D168, D169,
48+
D170, D171, D172, D173, D174, D175,
49+
DEND
50+
};
51+
2852
#define HIGH 0x1
2953
#define LOW 0x0
3054

Diff for: ‎variants/DISCO_F100RB/variant.h

+84-24
Original file line numberDiff line numberDiff line change
@@ -32,36 +32,96 @@ extern "C"{
3232
/*----------------------------------------------------------------------------
3333
* Pins
3434
*----------------------------------------------------------------------------*/
35-
#include "PeripheralPins.h"
36-
37-
extern const PinName digitalPin[];
38-
39-
enum {
40-
D0, D1, D2, D3, D4, D5, D6, D7, D8, D9,
41-
D10, D11, D12, D13, D14, D15, D16, D17, D18, D19,
42-
D20, D21, D22, D23, D24, D25, D26, D27, D28, D29,
43-
D30, D31, D32, D33, D34, D35, D36, D37, D38, D39,
44-
D40, D41, D42, D43, D44, D45, D46, D47, D48, D49,
45-
D50, D51, D52, D53, D54, D55, D56, D57, D58, D59,
46-
D60, D61, D62,
47-
DEND
48-
};
49-
50-
enum {
35+
#include "PeripheralPins.h"
36+
37+
extern const PinName digitalPin[];
38+
39+
enum {
40+
// P1 connector
41+
PC13, //D0
42+
PC0, //D1
43+
PC1, //D2
44+
PC2, //D3
45+
PC3, //D4
46+
PA0, //D5 - User button
47+
PA1, //D6
48+
PA2, //D7
49+
PA3, //D8
50+
PA4, //D9
51+
PA5, //D10
52+
PA6, //D11
53+
PA7, //D12
54+
PC4, //D13
55+
PC5, //D14
56+
PB0, //D15
57+
PB1, //D16
58+
PB2, //D17
59+
// P2 connector
60+
PC6, //D18
61+
PC7, //D19
62+
PC8, //D20 - LED blue
63+
PC9, //D21 - LED green
64+
PA8, //D22
65+
PA9, //D23
66+
PA10, //D24
67+
PA11, //D25
68+
PA12, //D26
69+
PA13, //D27
70+
PA14, //D28
71+
PA15, //D29
72+
PC10, //D30
73+
PC11, //D31
74+
PC12, //D32
75+
PD2, //D33
76+
PB3, //D34
77+
PB4, //D35
78+
PB5, //D36 - I2C SCL
79+
PB6, //D37 - I2C SDA
80+
PB7, //D38
81+
PB8, //D39
82+
PB9, //D40
83+
// P3 connector
84+
PB10, //D41
85+
PB11, //D42
86+
PB12, //D43 - SPI SS
87+
PB13, //D44 - SPI SCLK
88+
PB14, //D45 - SPI MISO
89+
PB15, //D46 - SPI MOSI
90+
// Duplicated pins in order to be aligned with PinMap_ADC
91+
PC0_2,//D47/A0 = D0
92+
PC1_2,//D48/A1 = D1
93+
PC2_2,//D49/A2 = D2
94+
PC3_2,//D50/A3 = D3
95+
PA0_2,//D51/A4 = D4
96+
PA1_2,//D52/A5 = D5
97+
PA2_2,//D53/A6 = D6
98+
PA3_2,//D54/A7 = D7
99+
PA4_2,//D55/A8 = D8
100+
PA5_2,//D56/A9 = D9
101+
PA6_2,//D57/A10 = D10
102+
PA7_2,//D58/A11 = D11
103+
PC4_2,//D59/A12 = D12
104+
PC5_2,//D60/A13 = D13
105+
PB0_2,//D61/A14 = D14
106+
PB1_2,//D62/A15 = D15
107+
PEND
108+
};
109+
110+
enum {
51111
A_START_AFTER = D46,
52112
A0, A1, A2, A3, A4, A5, A6, A7, A8, A9,
53113
A10, A11, A12, A13, A14, A15,
54114
AEND
55-
};
115+
};
56116

57-
//ADC resolution is 12bits
58-
#define ADC_RESOLUTION 12
59-
#define DACC_RESOLUTION 12
117+
//ADC resolution is 12bits
118+
#define ADC_RESOLUTION 12
119+
#define DACC_RESOLUTION 12
60120

61-
//PWR resolution
62-
#define PWM_RESOLUTION 8
63-
#define PWM_FREQUENCY 1000
64-
#define PWM_MAX_DUTY_CYCLE 255
121+
//PWR resolution
122+
#define PWM_RESOLUTION 8
123+
#define PWM_FREQUENCY 1000
124+
#define PWM_MAX_DUTY_CYCLE 255
65125

66126
//On-board LED pin number
67127
#define LED_BUILTIN 21

Diff for: ‎variants/DISCO_F407VG/variant.h

+94-10
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,100 @@ extern "C"{
3737
extern const PinName digitalPin[];
3838

3939
enum {
40-
D0, D1, D2, D3, D4, D5, D6, D7, D8, D9,
41-
D10, D11, D12, D13, D14, D15, D16, D17, D18, D19,
42-
D20, D21, D22, D23, D24, D25, D26, D27, D28, D29,
43-
D30, D31, D32, D33, D34, D35, D36, D37, D38, D39,
44-
D40, D41, D42, D43, D44, D45, D46, D47, D48, D49,
45-
D50, D51, D52, D53, D54, D55, D56, D57, D58, D59,
46-
D60, D61, D62, D63, D64, D65, D66, D67, D68, D69,
47-
D70, D71, D72, D73, D74, D75, D76, D77, D78, D79,
48-
D80, D81, D82, D83, D84, D85, D86,
49-
DEND
40+
//P1 connector Right side
41+
PC0, //D0
42+
PC2, //D1
43+
PA0, //D2
44+
PA2, //D3
45+
PA4, //D4
46+
PA6, //D5
47+
PC4, //D6
48+
PB0, //D7
49+
PB2, //D8
50+
PE8, //D9
51+
PE10, //D10
52+
PE12, //D11
53+
PE14, //D12
54+
PB10, //D13
55+
PB12, //D14
56+
PB14, //D15
57+
PD8, //D16
58+
PD10, //D17
59+
PD12, //D18
60+
PD14, //D19
61+
//P2 connector Left side
62+
PH0, //D20
63+
PC14, //D21
64+
PE6, //D22
65+
PE4, //D23
66+
PE2, //D24
67+
PE0, //D25
68+
PB8, //D26
69+
PB6, //D27
70+
PB4, //D28
71+
PD7, //D29
72+
PD5, //D30
73+
PD3, //D31
74+
PD1, //D32
75+
PC12, //D33
76+
PC10, //D34
77+
PA10, //D35
78+
PA8, //D36
79+
PC8, //D37
80+
PC6, //D38
81+
//P1 Connector Left Side
82+
PC1, //D39
83+
PC3, //D40
84+
PA1, //D41
85+
PA3, //D42
86+
PA5, //D43
87+
PA7, //D44
88+
PC5, //D45
89+
PB1, //D46
90+
PE7, //D47
91+
PE9, //D48
92+
PE11, //D49
93+
PE13, //D50
94+
PE15, //D51
95+
PB11, //D52
96+
PB13, //D53
97+
PB15, //D54
98+
PD9, //D55
99+
PD11, //D56
100+
PD13, //D57
101+
PD15, //D58
102+
//P2 connector Right side
103+
PH1, //D59
104+
PC15, //D60
105+
PC13, //D61
106+
PE5, //D62
107+
PE3, //D63
108+
PE1, //D64
109+
PB9, //D65
110+
PB7, //D66
111+
PB5, //D67
112+
PB3, //D68
113+
PD6, //D69
114+
PD4, //D70
115+
PD2, //D71
116+
PD0, //D72
117+
PC11, //D73
118+
PA15, //D74
119+
PA13, //D75
120+
PA9, //D76
121+
PC9, //D77
122+
PC7, //D78
123+
//Duplicated to have A0-A5 as F407 do not have Uno like connector
124+
// and to be aligned with PinMap_ADC
125+
PC2_2,//D79/A0 = D1
126+
PC4_2,//D80/A1 = D6
127+
PB0_2,//D81/A2 = D7
128+
PC1_2,//D82/A3 = D39
129+
PC3_2,//D83/A4 = D40
130+
PA1_2,//D84/A5 = D41
131+
PC5_2,//D85/A6 = D45
132+
PB1_2,//D86/A7 = D46
133+
PEND
50134
};
51135

52136
enum {

Diff for: ‎variants/DISCO_F746NG/variant.h

+26-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,32 @@ extern "C"{
3737
extern const PinName digitalPin[];
3838

3939
enum {
40-
D0, D1, D2, D3, D4, D5, D6, D7, D8, D9,
41-
D10, D11, D12, D13, D14, D15, D16, D17, D18, D19,
42-
D20, D21, D22, D23, D24,
43-
DEND
40+
PC7, //D0
41+
PC6, //D1
42+
PG6, //D2
43+
PB4, //D3
44+
PG7, //D4
45+
PI0, //D5
46+
PH6, //D6
47+
PI3, //D7
48+
PI2, //D8
49+
PA15, //D9
50+
PA8, //D10
51+
PB15, //D11
52+
PB14, //D12
53+
PI1, //D13
54+
PB9, //D14
55+
PB8, //D15
56+
PA0, //D16/A0
57+
PF10, //D17/A1
58+
PF9, //D18/A2
59+
PF8, //D19/A3
60+
PF7, //D20/A4
61+
PF6, //D21/A5
62+
PI11, //D22 User btn
63+
PB7, //D23 ST-Link Rx
64+
PA9, //D24 ST-Link Tx
65+
PEND
4466
};
4567

4668
enum {

Diff for: ‎variants/NUCLEO_F030R8/variant.h

+68-8
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,74 @@ extern "C"{
3737
extern const PinName digitalPin[];
3838

3939
enum {
40-
D0, D1, D2, D3, D4, D5, D6, D7, D8, D9,
41-
D10, D11, D12, D13, D14, D15, D16, D17, D18, D19,
42-
D20, D21, D22, D23, D24, D25, D26, D27, D28, D29,
43-
D30, D31, D32, D33, D34, D35, D36, D37, D38, D39,
44-
D40, D41, D42, D43, D44, D45, D46, D47, D48, D49,
45-
D50, D51, D52, D53, D54, D55, D56, D57, D58, D59,
46-
D60,
47-
DEND
40+
PA3, //D0
41+
PA2, //D1
42+
PA10, //D2
43+
PB3, //D3 - no PWM
44+
PB5, //D4
45+
PB4, //D5
46+
PB10, //D6 - no PWM
47+
PA8, //D7
48+
PA9, //D8
49+
PC7, //D9
50+
PB6, //D10
51+
PA7, //D11
52+
PA6, //D12
53+
PA5, //D13
54+
PB9, //D14
55+
PB8, //D15
56+
// ST Morpho
57+
// CN7 Left Side
58+
PC10, //D16
59+
PC12, //D17
60+
PF6, //D18
61+
PF7, //D19
62+
PA13, //D20 - SWD
63+
PA14, //D21 - SWD
64+
PA15, //D22
65+
PB7, //D23
66+
PC13, //D24
67+
PC14, //D25
68+
PC15, //D26
69+
PF0, //D27
70+
PF1, //D28
71+
PC2, //D29
72+
PC3, //D30
73+
// CN7 Right Side
74+
PC11, //D31
75+
PD2, //D32
76+
// CN10 Left Side
77+
PC9, //D33
78+
// CN10 Right side
79+
PC8, //D34
80+
PC6, //D35
81+
PC5, //D36
82+
PA12, //D37
83+
PA11, //D38
84+
PB12, //D39
85+
PB11, //D40
86+
PB2, //D41
87+
PB1, //D42
88+
PB15, //D43
89+
PB14, //D44
90+
PB13, //D45
91+
PC4, //D46
92+
PF5, //D47
93+
PF4, //D48
94+
PA0, //D49/A0
95+
PA1, //D50/A1
96+
PA4, //D51/A2
97+
PB0, //D52/A3
98+
PC1, //D53/A4
99+
PC0, //D54/A5
100+
// Duplicated pins in order to be aligned with PinMap_ADC
101+
PA7_2,//D55/A6 = D11
102+
PA6_2,//D56/A7 = D12
103+
PC2_2,//D57/A8 = D29
104+
PC3_2,//D58/A9 = D30
105+
PC5_2,//D59/A10 = D36
106+
PC4_2,//D60/A11 = D46
107+
PEND
48108
};
49109

50110
enum {

0 commit comments

Comments
 (0)