Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 843ec70

Browse files
authored
Merge pull request #4814 from sandeepmistry/avr-pin_
Add PIN_* defines to AVR variants
2 parents 3d92deb + faf5913 commit 843ec70

File tree

7 files changed

+251
-112
lines changed

7 files changed

+251
-112
lines changed

‎hardware/arduino/avr/variants/ethernet/pins_arduino.h‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,41 @@
3535
#define digitalPinHasPWM(p) ((p) == 3 || (p) == 5 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 11)
3636
#endif
3737

38-
static const uint8_t SS = 10;
39-
static const uint8_t MOSI = 11;
40-
static const uint8_t MISO = 12;
41-
static const uint8_t SCK = 13;
38+
#define PIN_SPI_SS (10)
39+
#define PIN_SPI_MOSI (11)
40+
#define PIN_SPI_MISO (12)
41+
#define PIN_SPI_SCK (13)
42+
43+
static const uint8_t SS = PIN_SPI_SS;
44+
static const uint8_t MOSI = PIN_SPI_MOSI;
45+
static const uint8_t MISO = PIN_SPI_MISO;
46+
static const uint8_t SCK = PIN_SPI_SCK;
47+
48+
#define PIN_WIRE_SDA (18)
49+
#define PIN_WIRE_SCL (19)
50+
51+
static const uint8_t SDA = PIN_WIRE_SDA;
52+
static const uint8_t SCL = PIN_WIRE_SCL;
4253

43-
static const uint8_t SDA = 18;
44-
static const uint8_t SCL = 19;
4554
#define LED_BUILTIN 9
4655

47-
static const uint8_t A0 = 14;
48-
static const uint8_t A1 = 15;
49-
static const uint8_t A2 = 16;
50-
static const uint8_t A3 = 17;
51-
static const uint8_t A4 = 18;
52-
static const uint8_t A5 = 19;
53-
static const uint8_t A6 = 20;
54-
static const uint8_t A7 = 21;
56+
#define PIN_A0 (14)
57+
#define PIN_A1 (15)
58+
#define PIN_A2 (16)
59+
#define PIN_A3 (17)
60+
#define PIN_A4 (18)
61+
#define PIN_A5 (19)
62+
#define PIN_A6 (20)
63+
#define PIN_A7 (21)
64+
65+
static const uint8_t A0 = PIN_A0;
66+
static const uint8_t A1 = PIN_A1;
67+
static const uint8_t A2 = PIN_A2;
68+
static const uint8_t A3 = PIN_A3;
69+
static const uint8_t A4 = PIN_A4;
70+
static const uint8_t A5 = PIN_A5;
71+
static const uint8_t A6 = PIN_A6;
72+
static const uint8_t A7 = PIN_A7;
5573

5674
#define digitalPinToPCICR(p) (((p) >= 0 && (p) <= 21) ? (&PCICR) : ((uint8_t *)0))
5775
#define digitalPinToPCICRbit(p) (((p) <= 7) ? 2 : (((p) <= 13) ? 0 : 1))

‎hardware/arduino/avr/variants/gemma/pins_arduino.h‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,15 @@
4646
#define NUM_ANALOG_INPUTS 1
4747
#define LED_BUILTIN 1
4848

49-
static const uint8_t A0 = 6;
50-
static const uint8_t A1 = 7;
51-
static const uint8_t A2 = 8;
52-
static const uint8_t A3 = 9;
49+
#define PIN_A0 (6)
50+
#define PIN_A1 (7)
51+
#define PIN_A2 (8)
52+
#define PIN_A3 (9)
53+
54+
static const uint8_t A0 = PIN_A0;
55+
static const uint8_t A1 = PIN_A1;
56+
static const uint8_t A2 = PIN_A2;
57+
static const uint8_t A3 = PIN_A3;
5358

5459
#define digitalPinToPCICR(p) ( ((p) >= 0 && (p) <= 4) ? (&GIMSK) : ((uint8_t *)0) )
5560
#define digitalPinToPCICRbit(p) ( PCIE )

‎hardware/arduino/avr/variants/leonardo/pins_arduino.h‎

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,32 +97,54 @@
9797
#define RXLED0 PORTB |= (1<<0)
9898
#define RXLED1 PORTB &= ~(1<<0)
9999

100-
static const uint8_t SDA = 2;
101-
static const uint8_t SCL = 3;
100+
#define PIN_WIRE_SDA (2)
101+
#define PIN_WIRE_SCL (3)
102+
103+
static const uint8_t SDA = PIN_WIRE_SDA;
104+
static const uint8_t SCL = PIN_WIRE_SCL;
105+
102106
#define LED_BUILTIN 13
103107
#define LED_BUILTIN_RX 17
104108
#define LED_BUILTIN_TX 30
105109

106110
// Map SPI port to 'new' pins D14..D17
107-
static const uint8_t SS = 17;
108-
static const uint8_t MOSI = 16;
109-
static const uint8_t MISO = 14;
110-
static const uint8_t SCK = 15;
111+
#define PIN_SPI_SS (17)
112+
#define PIN_SPI_MOSI (16)
113+
#define PIN_SPI_MISO (14)
114+
#define PIN_SPI_SCK (15)
115+
116+
static const uint8_t SS = PIN_SPI_SS;
117+
static const uint8_t MOSI = PIN_SPI_MOSI;
118+
static const uint8_t MISO = PIN_SPI_MISO;
119+
static const uint8_t SCK = PIN_SPI_SCK;
111120

112121
// Mapping of analog pins as digital I/O
113122
// A6-A11 share with digital pins
114-
static const uint8_t A0 = 18;
115-
static const uint8_t A1 = 19;
116-
static const uint8_t A2 = 20;
117-
static const uint8_t A3 = 21;
118-
static const uint8_t A4 = 22;
119-
static const uint8_t A5 = 23;
120-
static const uint8_t A6 = 24; // D4
121-
static const uint8_t A7 = 25; // D6
122-
static const uint8_t A8 = 26; // D8
123-
static const uint8_t A9 = 27; // D9
124-
static const uint8_t A10 = 28; // D10
125-
static const uint8_t A11 = 29; // D12
123+
#define PIN_A0 (18)
124+
#define PIN_A1 (19)
125+
#define PIN_A2 (20)
126+
#define PIN_A3 (21)
127+
#define PIN_A4 (22)
128+
#define PIN_A5 (23)
129+
#define PIN_A6 (24)
130+
#define PIN_A7 (25)
131+
#define PIN_A8 (26)
132+
#define PIN_A9 (27)
133+
#define PIN_A10 (28)
134+
#define PIN_A11 (29)
135+
136+
static const uint8_t A0 = PIN_A0;
137+
static const uint8_t A1 = PIN_A1;
138+
static const uint8_t A2 = PIN_A2;
139+
static const uint8_t A3 = PIN_A3;
140+
static const uint8_t A4 = PIN_A4;
141+
static const uint8_t A5 = PIN_A5;
142+
static const uint8_t A6 = PIN_A6; // D4
143+
static const uint8_t A7 = PIN_A7; // D6
144+
static const uint8_t A8 = PIN_A8; // D8
145+
static const uint8_t A9 = PIN_A9; // D9
146+
static const uint8_t A10 = PIN_A10; // D10
147+
static const uint8_t A11 = PIN_A11; // D12
126148

127149
#define digitalPinToPCICR(p) ((((p) >= 8 && (p) <= 11) || ((p) >= 14 && (p) <= 17) || ((p) >= A8 && (p) <= A10)) ? (&PCICR) : ((uint8_t *)0))
128150
#define digitalPinToPCICRbit(p) 0

‎hardware/arduino/avr/variants/mega/pins_arduino.h‎

Lines changed: 48 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,57 @@
3030
#define analogInputToDigitalPin(p) ((p < 16) ? (p) + 54 : -1)
3131
#define digitalPinHasPWM(p) (((p) >= 2 && (p) <= 13) || ((p) >= 44 && (p)<= 46))
3232

33-
static const uint8_t SS = 53;
34-
static const uint8_t MOSI = 51;
35-
static const uint8_t MISO = 50;
36-
static const uint8_t SCK = 52;
33+
#define PIN_SPI_SS (53)
34+
#define PIN_SPI_MOSI (51)
35+
#define PIN_SPI_MISO (50)
36+
#define PIN_SPI_SCK (52)
37+
38+
static const uint8_t SS = PIN_SPI_SS;
39+
static const uint8_t MOSI = PIN_SPI_MOSI;
40+
static const uint8_t MISO = PIN_SPI_MISO;
41+
static const uint8_t SCK = PIN_SPI_SCK;
42+
43+
#define PIN_WIRE_SDA (20)
44+
#define PIN_WIRE_SCL (21)
45+
46+
static const uint8_t SDA = PIN_WIRE_SDA;
47+
static const uint8_t SCL = PIN_WIRE_SCL;
3748

38-
static const uint8_t SDA = 20;
39-
static const uint8_t SCL = 21;
4049
#define LED_BUILTIN 13
4150

42-
static const uint8_t A0 = 54;
43-
static const uint8_t A1 = 55;
44-
static const uint8_t A2 = 56;
45-
static const uint8_t A3 = 57;
46-
static const uint8_t A4 = 58;
47-
static const uint8_t A5 = 59;
48-
static const uint8_t A6 = 60;
49-
static const uint8_t A7 = 61;
50-
static const uint8_t A8 = 62;
51-
static const uint8_t A9 = 63;
52-
static const uint8_t A10 = 64;
53-
static const uint8_t A11 = 65;
54-
static const uint8_t A12 = 66;
55-
static const uint8_t A13 = 67;
56-
static const uint8_t A14 = 68;
57-
static const uint8_t A15 = 69;
51+
#define PIN_A0 (54)
52+
#define PIN_A1 (55)
53+
#define PIN_A2 (56)
54+
#define PIN_A3 (57)
55+
#define PIN_A4 (58)
56+
#define PIN_A5 (59)
57+
#define PIN_A6 (60)
58+
#define PIN_A7 (61)
59+
#define PIN_A8 (62)
60+
#define PIN_A9 (63)
61+
#define PIN_A10 (64)
62+
#define PIN_A11 (65)
63+
#define PIN_A12 (66)
64+
#define PIN_A13 (67)
65+
#define PIN_A14 (68)
66+
#define PIN_A15 (69)
67+
68+
static const uint8_t A0 = PIN_A0;
69+
static const uint8_t A1 = PIN_A1;
70+
static const uint8_t A2 = PIN_A2;
71+
static const uint8_t A3 = PIN_A3;
72+
static const uint8_t A4 = PIN_A4;
73+
static const uint8_t A5 = PIN_A5;
74+
static const uint8_t A6 = PIN_A6;
75+
static const uint8_t A7 = PIN_A7;
76+
static const uint8_t A8 = PIN_A8;
77+
static const uint8_t A9 = PIN_A9;
78+
static const uint8_t A10 = PIN_A10;
79+
static const uint8_t A11 = PIN_A11;
80+
static const uint8_t A12 = PIN_A12;
81+
static const uint8_t A13 = PIN_A13;
82+
static const uint8_t A14 = PIN_A14;
83+
static const uint8_t A15 = PIN_A15;
5884

5985
// A majority of the pins are NOT PCINTs, SO BE WARNED (i.e. you cannot use them as receive pins)
6086
// Only pins available for RECEIVE (TRANSMIT can be on any pin):

‎hardware/arduino/avr/variants/robot_control/pins_arduino.h‎

Lines changed: 45 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,31 +41,56 @@
4141
#define D4 TKD4
4242
#define D5 TKD5
4343

44-
static const uint8_t RX = 0;
45-
static const uint8_t TX = 1;
46-
static const uint8_t SDA = 2;
47-
static const uint8_t SCL = 3;
44+
#define PIN_SERIAL_RX (0)
45+
#define PIN_SERIAL_TX (1)
46+
47+
static const uint8_t RX = PIN_SERIAL_RX;
48+
static const uint8_t TX = PIN_SERIAL_TX;
49+
50+
#define PIN_WIRE_SDA (2)
51+
#define PIN_WIRE_SCL (3)
52+
53+
static const uint8_t SDA = PIN_WIRE_SDA;
54+
static const uint8_t SCL = PIN_WIRE_SCL;
4855

4956
// Map SPI port to 'new' pins D14..D17
50-
static const uint8_t SS = 17;
51-
static const uint8_t MOSI = 16;
52-
static const uint8_t MISO = 14;
53-
static const uint8_t SCK = 15;
57+
#define PIN_SPI_SS (17)
58+
#define PIN_SPI_MOSI (16)
59+
#define PIN_SPI_MISO (14)
60+
#define PIN_SPI_SCK (15)
61+
62+
static const uint8_t SS = PIN_SPI_SS;
63+
static const uint8_t MOSI = PIN_SPI_MOSI;
64+
static const uint8_t MISO = PIN_SPI_MISO;
65+
static const uint8_t SCK = PIN_SPI_SCK;
5466

5567
// Mapping of analog pins as digital I/O
5668
// A6-A11 share with digital pins
57-
static const uint8_t A0 = 18;
58-
static const uint8_t A1 = 19;
59-
static const uint8_t A2 = 20;
60-
static const uint8_t A3 = 21;
61-
static const uint8_t A4 = 22;
62-
static const uint8_t A5 = 23;
63-
static const uint8_t A6 = 24; // D4
64-
static const uint8_t A7 = 25; // D6
65-
static const uint8_t A8 = 26; // D8
66-
static const uint8_t A9 = 27; // D9
67-
static const uint8_t A10 = 28; // D10
68-
static const uint8_t A11 = 29; // D12
69+
#define PIN_A0 (18)
70+
#define PIN_A1 (19)
71+
#define PIN_A2 (20)
72+
#define PIN_A3 (21)
73+
#define PIN_A4 (22)
74+
#define PIN_A5 (23)
75+
#define PIN_A6 (24)
76+
#define PIN_A7 (25)
77+
#define PIN_A8 (26)
78+
#define PIN_A9 (27)
79+
#define PIN_A10 (28)
80+
#define PIN_A11 (29)
81+
82+
static const uint8_t A0 = PIN_A0;
83+
static const uint8_t A1 = PIN_A1;
84+
static const uint8_t A2 = PIN_A2;
85+
static const uint8_t A3 = PIN_A3;
86+
static const uint8_t A4 = PIN_A4;
87+
static const uint8_t A5 = PIN_A5;
88+
static const uint8_t A6 = PIN_A6; // D4
89+
static const uint8_t A7 = PIN_A7; // D6
90+
static const uint8_t A8 = PIN_A8; // D8
91+
static const uint8_t A9 = PIN_A9; // D9
92+
static const uint8_t A10 = PIN_A10; // D10
93+
static const uint8_t A11 = PIN_A11; // D12
6994

7095
// Specific Mapping for the Control Board
7196
static const uint8_t KEY = 18; // AD0

‎hardware/arduino/avr/variants/robot_motor/pins_arduino.h‎

Lines changed: 45 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,56 @@
3939
#define D8 TK4
4040
#define D7 TK3
4141

42-
static const uint8_t RX = 0;
43-
static const uint8_t TX = 1;
44-
static const uint8_t SDA = 2;
45-
static const uint8_t SCL = 3;
42+
#define PIN_SERIAL_RX (0)
43+
#define PIN_SERIAL_TX (1)
44+
45+
static const uint8_t RX = PIN_SERIAL_RX;
46+
static const uint8_t TX = PIN_SERIAL_TX;
47+
48+
#define PIN_WIRE_SDA (2)
49+
#define PIN_WIRE_SCL (3)
50+
51+
static const uint8_t SDA = PIN_WIRE_SDA;
52+
static const uint8_t SCL = PIN_WIRE_SCL;
4653

4754
// Map SPI port to 'new' pins D14..D17
48-
static const uint8_t SS = 17;
49-
static const uint8_t MOSI = 16;
50-
static const uint8_t MISO = 14;
51-
static const uint8_t SCK = 15;
55+
#define PIN_SPI_SS (17)
56+
#define PIN_SPI_MOSI (16)
57+
#define PIN_SPI_MISO (14)
58+
#define PIN_SPI_SCK (15)
59+
60+
static const uint8_t SS = PIN_SPI_SS;
61+
static const uint8_t MOSI = PIN_SPI_MOSI;
62+
static const uint8_t MISO = PIN_SPI_MISO;
63+
static const uint8_t SCK = PIN_SPI_SCK;
5264

5365
// Mapping of analog pins as digital I/O
5466
// A6-A11 share with digital pins
55-
static const uint8_t A0 = 18;
56-
static const uint8_t A1 = 19;
57-
static const uint8_t A2 = 20;
58-
static const uint8_t A3 = 21;
59-
static const uint8_t A4 = 22;
60-
static const uint8_t A5 = 23;
61-
static const uint8_t A6 = 24; // D4
62-
static const uint8_t A7 = 25; // D6
63-
static const uint8_t A8 = 26; // D8
64-
static const uint8_t A9 = 27; // D9
65-
static const uint8_t A10 = 28; // D10
66-
static const uint8_t A11 = 29; // D12
67+
#define PIN_A0 (18)
68+
#define PIN_A1 (19)
69+
#define PIN_A2 (20)
70+
#define PIN_A3 (21)
71+
#define PIN_A4 (22)
72+
#define PIN_A5 (23)
73+
#define PIN_A6 (24)
74+
#define PIN_A7 (25)
75+
#define PIN_A8 (26)
76+
#define PIN_A9 (27)
77+
#define PIN_A10 (28)
78+
#define PIN_A11 (29)
79+
80+
static const uint8_t A0 = PIN_A0;
81+
static const uint8_t A1 = PIN_A1;
82+
static const uint8_t A2 = PIN_A2;
83+
static const uint8_t A3 = PIN_A3;
84+
static const uint8_t A4 = PIN_A4;
85+
static const uint8_t A5 = PIN_A5;
86+
static const uint8_t A6 = PIN_A6; // D4
87+
static const uint8_t A7 = PIN_A7; // D6
88+
static const uint8_t A8 = PIN_A8; // D8
89+
static const uint8_t A9 = PIN_A9; // D9
90+
static const uint8_t A10 = PIN_A10; // D10
91+
static const uint8_t A11 = PIN_A11; // D12
6792

6893
// Specific Mapping for the Motor Board
6994
static const uint8_t MUX_IN = 20; // A2

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /