Skip to content

Commit 79f5a34

Browse files
committed
Revert "Changed pins definition in variants from constants to #defines."
This reverts commit e2b15c8.
1 parent a96c8ca commit 79f5a34

File tree

1 file changed

+25
-25
lines changed
  • hardware/arduino/sam/variants/arduino_due_x

1 file changed

+25
-25
lines changed

Diff for: hardware/arduino/sam/variants/arduino_due_x/variant.h

+25-25
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ extern "C"{
110110
(x==BOARD_SPI_SS1 ? 1 : \
111111
(x==BOARD_SPI_SS2 ? 2 : 3)))
112112

113-
#define SS BOARD_SPI_SS0
114-
#define SS1 BOARD_SPI_SS1
115-
#define SS2 BOARD_SPI_SS2
116-
#define SS3 BOARD_SPI_SS3
117-
#define MOSI PIN_SPI_MOSI
118-
#define MISO PIN_SPI_MISO
119-
#define SCK PIN_SPI_SCK
113+
static const uint8_t SS = BOARD_SPI_SS0;
114+
static const uint8_t SS1 = BOARD_SPI_SS1;
115+
static const uint8_t SS2 = BOARD_SPI_SS2;
116+
static const uint8_t SS3 = BOARD_SPI_SS3;
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;
120120

121121
/*
122122
* Wire Interfaces
@@ -155,29 +155,29 @@ extern "C"{
155155
/*
156156
* Analog pins
157157
*/
158-
#define A0 54
159-
#define A1 55
160-
#define A2 56
161-
#define A3 57
162-
#define A4 58
163-
#define A5 59
164-
#define A6 60
165-
#define A7 61
166-
#define A8 62
167-
#define A9 63
168-
#define A10 64
169-
#define A11 65
170-
#define DAC0 66
171-
#define DAC1 67
172-
#define CANRX 68
173-
#define CANTX 69
158+
static const uint8_t A0 = 54;
159+
static const uint8_t A1 = 55;
160+
static const uint8_t A2 = 56;
161+
static const uint8_t A3 = 57;
162+
static const uint8_t A4 = 58;
163+
static const uint8_t A5 = 59;
164+
static const uint8_t A6 = 60;
165+
static const uint8_t A7 = 61;
166+
static const uint8_t A8 = 62;
167+
static const uint8_t A9 = 63;
168+
static const uint8_t A10 = 64;
169+
static const uint8_t A11 = 65;
170+
static const uint8_t DAC0 = 66;
171+
static const uint8_t DAC1 = 67;
172+
static const uint8_t CANRX = 68;
173+
static const uint8_t CANTX = 69;
174174
#define ADC_RESOLUTION 12
175175

176176
/*
177177
* Complementary CAN pins
178178
*/
179-
#define CAN1RX 88
180-
#define CAN1TX 89
179+
static const uint8_t CAN1RX = 88;
180+
static const uint8_t CAN1TX = 89;
181181

182182
// CAN0
183183
#define PINS_CAN0 (90u)

0 commit comments

Comments
 (0)