Skip to content

Commit cda972e

Browse files
mjs513mjs513
authored
Define digital pins via static const instead of #define (arduino#54)
1 parent e5ab698 commit cda972e

File tree

3 files changed

+91
-40
lines changed

3 files changed

+91
-40
lines changed

‎variants/MINIMA/pins_arduino.h

+33-16
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,23 @@ static const uint8_t A5 = PIN_A5;
3737

3838
// Digital pins
3939
// -----------
40+
#define PIN_D0 (0u)
41+
#define PIN_D1 (1u)
42+
#define PIN_D2 (2u)
43+
#define PIN_D3 (3u)
44+
#define PIN_D4 (4u)
45+
#define PIN_D5 (5u)
46+
#define PIN_D6 (6u)
47+
#define PIN_D7 (7u)
48+
#define PIN_D8 (8u)
49+
#define PIN_D9 (9u)
50+
#define PIN_D10 (10u)
51+
#define PIN_D11 (11u)
52+
#define PIN_D12 (12u)
53+
#define PIN_D13 (13u)
54+
#define PIN_D14 (14u)
55+
#define PIN_D15 (15u)
56+
4057
#undef D0
4158
#undef D1
4259
#undef D2
@@ -53,22 +70,22 @@ static const uint8_t A5 = PIN_A5;
5370
#undef D13
5471
#undef D14
5572
#undef D15
56-
#define D0 (0u)
57-
#define D1 (1u)
58-
#define D2 (2u)
59-
#define D3 (3u)
60-
#define D4 (4u)
61-
#define D5 (5u)
62-
#define D6 (6u)
63-
#define D7 (7u)
64-
#define D8 (8u)
65-
#define D9 (9u)
66-
#define D10 (10u)
67-
#define D11 (11u)
68-
#define D12 (12u)
69-
#define D13 (13u)
70-
#define D14 (14u)
71-
#define D15 (15u)
73+
static const uint8_t D0 = PIN_D0;
74+
static const uint8_t D1 = PIN_D1;
75+
static const uint8_t D2 = PIN_D2;
76+
static const uint8_t D3 = PIN_D3;
77+
static const uint8_t D4 = PIN_D4;
78+
static const uint8_t D5 = PIN_D5;
79+
static const uint8_t D6 = PIN_D6;
80+
static const uint8_t D7 = PIN_D7;
81+
static const uint8_t D8 = PIN_D8;
82+
static const uint8_t D9 = PIN_D9;
83+
static const uint8_t D10 = PIN_D10;
84+
static const uint8_t D11 = PIN_D11;
85+
static const uint8_t D12 = PIN_D12;
86+
static const uint8_t D13 = PIN_D13;
87+
static const uint8_t D14 = PIN_D14;
88+
static const uint8_t D15 = PIN_D15;
7289

7390
// LEDs
7491
// ----

‎variants/PORTENTA_C33/pins_arduino.h

+25-8
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,31 @@ static const uint8_t A7 = PIN_A7;
4646

4747
// Digital pins
4848
// -----------
49-
#define D0 (0u)
50-
#define D1 (1u)
51-
#define D2 (2u)
52-
#define D3 (3u)
53-
#define D4 (4u)
54-
#define D5 (5u)
55-
#define D6 (6u)
56-
#define D7 (7u)
49+
#define PIN_D0 (0u)
50+
#define PIN_D1 (1u)
51+
#define PIN_D2 (2u)
52+
#define PIN_D3 (3u)
53+
#define PIN_D4 (4u)
54+
#define PIN_D5 (5u)
55+
#define PIN_D6 (6u)
56+
#define PIN_D7 (7u)
57+
58+
#undef D0
59+
#undef D1
60+
#undef D2
61+
#undef D3
62+
#undef D4
63+
#undef D5
64+
#undef D6
65+
#undef D7
66+
static const uint8_t D0 = PIN_D0;
67+
static const uint8_t D1 = PIN_D1;
68+
static const uint8_t D2 = PIN_D2;
69+
static const uint8_t D3 = PIN_D3;
70+
static const uint8_t D4 = PIN_D4;
71+
static const uint8_t D5 = PIN_D5;
72+
static const uint8_t D6 = PIN_D6;
73+
static const uint8_t D7 = PIN_D7;
5774

5875
// LEDs
5976
// ----

‎variants/UNOWIFIR4/pins_arduino.h

+33-16
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,23 @@ static const uint8_t A5 = PIN_A5;
3737

3838
// Digital pins
3939
// -----------
40+
#define PIN_D0 (0u)
41+
#define PIN_D1 (1u)
42+
#define PIN_D2 (2u)
43+
#define PIN_D3 (3u)
44+
#define PIN_D4 (4u)
45+
#define PIN_D5 (5u)
46+
#define PIN_D6 (6u)
47+
#define PIN_D7 (7u)
48+
#define PIN_D8 (8u)
49+
#define PIN_D9 (9u)
50+
#define PIN_D10 (10u)
51+
#define PIN_D11 (11u)
52+
#define PIN_D12 (12u)
53+
#define PIN_D13 (13u)
54+
#define PIN_D14 (14u)
55+
#define PIN_D15 (15u)
56+
4057
#undef D0
4158
#undef D1
4259
#undef D2
@@ -53,22 +70,22 @@ static const uint8_t A5 = PIN_A5;
5370
#undef D13
5471
#undef D14
5572
#undef D15
56-
#define D0 (0u)
57-
#define D1 (1u)
58-
#define D2 (2u)
59-
#define D3 (3u)
60-
#define D4 (4u)
61-
#define D5 (5u)
62-
#define D6 (6u)
63-
#define D7 (7u)
64-
#define D8 (8u)
65-
#define D9 (9u)
66-
#define D10 (10u)
67-
#define D11 (11u)
68-
#define D12 (12u)
69-
#define D13 (13u)
70-
#define D14 (14u)
71-
#define D15 (15u)
73+
static const uint8_t D0 = PIN_D0;
74+
static const uint8_t D1 = PIN_D1;
75+
static const uint8_t D2 = PIN_D2;
76+
static const uint8_t D3 = PIN_D3;
77+
static const uint8_t D4 = PIN_D4;
78+
static const uint8_t D5 = PIN_D5;
79+
static const uint8_t D6 = PIN_D6;
80+
static const uint8_t D7 = PIN_D7;
81+
static const uint8_t D8 = PIN_D8;
82+
static const uint8_t D9 = PIN_D9;
83+
static const uint8_t D10 = PIN_D10;
84+
static const uint8_t D11 = PIN_D11;
85+
static const uint8_t D12 = PIN_D12;
86+
static const uint8_t D13 = PIN_D13;
87+
static const uint8_t D14 = PIN_D14;
88+
static const uint8_t D15 = PIN_D15;
7289

7390
// LEDs
7491
// ----

0 commit comments

Comments
 (0)