Skip to content

Commit c08f564

Browse files
ladyadaladyada
authored
Merge pull request arduino#152 from GMagician/Fix-missin-unsigned-pin
Fix missing unsigned pin and indetation
2 parents 3cd1d9e + 2bf7821 commit c08f564

File tree

1 file changed

+112
-112
lines changed

1 file changed

+112
-112
lines changed

‎variants/grand_central_m4/variant.h‎

Lines changed: 112 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -81,50 +81,50 @@ extern "C"
8181
// #define digitalPinToTimer(P)
8282

8383
// LEDs
84-
#define PIN_LED_13 (13)
85-
#define PIN_LED_RXL (75)
86-
#define PIN_LED_TXL (76)
87-
#define PIN_LED PIN_LED_13
88-
#define PIN_LED2 PIN_LED_RXL
89-
#define PIN_LED3 PIN_LED_TXL
90-
#define LED_BUILTIN PIN_LED_13
91-
#define PIN_NEOPIXEL (88u)
84+
#define PIN_LED_13 (13)
85+
#define PIN_LED_RXL (75)
86+
#define PIN_LED_TXL (76)
87+
#define PIN_LED PIN_LED_13
88+
#define PIN_LED2 PIN_LED_RXL
89+
#define PIN_LED3 PIN_LED_TXL
90+
#define LED_BUILTIN PIN_LED_13
91+
#define PIN_NEOPIXEL (88)
9292

9393
/*
9494
* Analog pins
9595
*/
96-
#define PIN_A0 (67)
97-
#define PIN_A1 (PIN_A0 + 1)
98-
#define PIN_A2 (PIN_A0 + 2)
99-
#define PIN_A3 (PIN_A0 + 3)
100-
#define PIN_A4 (PIN_A0 + 4)
101-
#define PIN_A5 (PIN_A0 + 5)
102-
#define PIN_A6 (PIN_A0 + 6)
103-
#define PIN_A7 (PIN_A0 + 7)
104-
105-
#define PIN_A8 (54)
106-
#define PIN_A9 (PIN_A8 + 1)
107-
#define PIN_A10 (PIN_A8 + 2)
108-
#define PIN_A11 (PIN_A8 + 3)
109-
#define PIN_A12 (PIN_A8 + 4)
110-
#define PIN_A13 (PIN_A8 + 5)
111-
#define PIN_A14 (PIN_A8 + 6)
112-
#define PIN_A15 (PIN_A8 + 7)
113-
114-
#define PIN_DAC0 PIN_A0
115-
#define PIN_DAC1 PIN_A1
116-
117-
static const uint8_t A0 = PIN_A0;
118-
static const uint8_t A1 = PIN_A1;
119-
static const uint8_t A2 = PIN_A2;
120-
static const uint8_t A3 = PIN_A3;
121-
static const uint8_t A4 = PIN_A4;
122-
static const uint8_t A5 = PIN_A5;
123-
static const uint8_t A6 = PIN_A6;
124-
static const uint8_t A7 = PIN_A7;
125-
126-
static const uint8_t A8 = PIN_A8;
127-
static const uint8_t A9 = PIN_A9;
96+
#define PIN_A0 (67)
97+
#define PIN_A1 (PIN_A0 + 1)
98+
#define PIN_A2 (PIN_A0 + 2)
99+
#define PIN_A3 (PIN_A0 + 3)
100+
#define PIN_A4 (PIN_A0 + 4)
101+
#define PIN_A5 (PIN_A0 + 5)
102+
#define PIN_A6 (PIN_A0 + 6)
103+
#define PIN_A7 (PIN_A0 + 7)
104+
105+
#define PIN_A8 (54)
106+
#define PIN_A9 (PIN_A8 + 1)
107+
#define PIN_A10 (PIN_A8 + 2)
108+
#define PIN_A11 (PIN_A8 + 3)
109+
#define PIN_A12 (PIN_A8 + 4)
110+
#define PIN_A13 (PIN_A8 + 5)
111+
#define PIN_A14 (PIN_A8 + 6)
112+
#define PIN_A15 (PIN_A8 + 7)
113+
114+
#define PIN_DAC0 PIN_A0
115+
#define PIN_DAC1 PIN_A1
116+
117+
static const uint8_t A0 = PIN_A0;
118+
static const uint8_t A1 = PIN_A1;
119+
static const uint8_t A2 = PIN_A2;
120+
static const uint8_t A3 = PIN_A3;
121+
static const uint8_t A4 = PIN_A4;
122+
static const uint8_t A5 = PIN_A5;
123+
static const uint8_t A6 = PIN_A6;
124+
static const uint8_t A7 = PIN_A7;
125+
126+
static const uint8_t A8 = PIN_A8;
127+
static const uint8_t A9 = PIN_A9;
128128
static const uint8_t A10 = PIN_A10;
129129
static const uint8_t A11 = PIN_A11;
130130
static const uint8_t A12 = PIN_A12;
@@ -135,96 +135,96 @@ static const uint8_t A15 = PIN_A15;
135135
static const uint8_t DAC0 = PIN_DAC0;
136136
static const uint8_t DAC1 = PIN_DAC1;
137137

138-
#define ADC_RESOLUTION 12
138+
#define ADC_RESOLUTION 12
139139

140140
// Other pins
141-
#define PIN_ATN (39)
141+
#define PIN_ATN (39)
142142
static const uint8_t ATN = PIN_ATN;
143143

144144
/*
145145
* Serial interfaces
146146
*/
147147

148148
// Serial1
149-
#define PIN_SERIAL1_RX (0)
150-
#define PIN_SERIAL1_TX (1)
151-
#define PAD_SERIAL1_TX (UART_TX_PAD_0)
152-
#define PAD_SERIAL1_RX (SERCOM_RX_PAD_1)
149+
#define PIN_SERIAL1_RX (0)
150+
#define PIN_SERIAL1_TX (1)
151+
#define PAD_SERIAL1_TX (UART_TX_PAD_0)
152+
#define PAD_SERIAL1_RX (SERCOM_RX_PAD_1)
153153

154154
// Serial2
155-
#define PIN_SERIAL2_RX (19)
156-
#define PIN_SERIAL2_TX (18)
157-
#define PAD_SERIAL2_TX (UART_TX_PAD_0)
158-
#define PAD_SERIAL2_RX (SERCOM_RX_PAD_1)
159-
#define SERCOM_SERIAL2 sercom4
155+
#define PIN_SERIAL2_RX (19)
156+
#define PIN_SERIAL2_TX (18)
157+
#define PAD_SERIAL2_TX (UART_TX_PAD_0)
158+
#define PAD_SERIAL2_RX (SERCOM_RX_PAD_1)
159+
#define SERCOM_SERIAL2 sercom4
160160

161161
// Serial3
162-
#define PIN_SERIAL3_RX (17)
163-
#define PIN_SERIAL3_TX (16)
164-
#define PAD_SERIAL3_TX (UART_TX_PAD_0)
165-
#define PAD_SERIAL3_RX (SERCOM_RX_PAD_1)
166-
#define SERCOM_SERIAL3 sercom1
162+
#define PIN_SERIAL3_RX (17)
163+
#define PIN_SERIAL3_TX (16)
164+
#define PAD_SERIAL3_TX (UART_TX_PAD_0)
165+
#define PAD_SERIAL3_RX (SERCOM_RX_PAD_1)
166+
#define SERCOM_SERIAL3 sercom1
167167

168168
// Serial4
169-
#define PIN_SERIAL4_RX (15)
170-
#define PIN_SERIAL4_TX (14)
171-
#define PAD_SERIAL4_TX (UART_TX_PAD_0)
172-
#define PAD_SERIAL4_RX (SERCOM_RX_PAD_1)
173-
#define SERCOM_SERIAL4 sercom5
169+
#define PIN_SERIAL4_RX (15)
170+
#define PIN_SERIAL4_TX (14)
171+
#define PAD_SERIAL4_TX (UART_TX_PAD_0)
172+
#define PAD_SERIAL4_RX (SERCOM_RX_PAD_1)
173+
#define SERCOM_SERIAL4 sercom5
174174
/*
175175
* SPI Interfaces
176176
*/
177177
#define SPI_INTERFACES_COUNT 2
178178

179-
#define PIN_SPI_MISO (64)
180-
#define PIN_SPI_MOSI (66)
181-
#define PIN_SPI_SCK (65)
182-
#define PERIPH_SPI sercom7
183-
#define PAD_SPI_TX SPI_PAD_0_SCK_1
184-
#define PAD_SPI_RX SERCOM_RX_PAD_3
179+
#define PIN_SPI_MISO (64)
180+
#define PIN_SPI_MOSI (66)
181+
#define PIN_SPI_SCK (65)
182+
#define PERIPH_SPI sercom7
183+
#define PAD_SPI_TX SPI_PAD_0_SCK_1
184+
#define PAD_SPI_RX SERCOM_RX_PAD_3
185185

186186
static const uint8_t SS = (53);
187187
static const uint8_t MOSI = PIN_SPI_MOSI;
188188
static const uint8_t MISO = PIN_SPI_MISO;
189189
static const uint8_t SCK = PIN_SPI_SCK;
190190

191-
#define PIN_SPI1_MISO (80)
192-
#define PIN_SPI1_MOSI (82)
193-
#define PIN_SPI1_SCK (81)
194-
#define PIN_SPI1_SS (83)
195-
#define PERIPH_SPI1 sercom2
196-
#define PAD_SPI1_TX SPI_PAD_0_SCK_1
197-
#define PAD_SPI1_RX SERCOM_RX_PAD_3
191+
#define PIN_SPI1_MISO (80)
192+
#define PIN_SPI1_MOSI (82)
193+
#define PIN_SPI1_SCK (81)
194+
#define PIN_SPI1_SS (83)
195+
#define PERIPH_SPI1 sercom2
196+
#define PAD_SPI1_TX SPI_PAD_0_SCK_1
197+
#define PAD_SPI1_RX SERCOM_RX_PAD_3
198198

199199
static const uint8_t SS1 = PIN_SPI1_SS;
200200
static const uint8_t MOSI1 = PIN_SPI1_MOSI;
201201
static const uint8_t MISO1 = PIN_SPI1_MISO;
202202
static const uint8_t SCK1 = PIN_SPI1_SCK;
203203

204204
// Needed for SD library
205-
#define SDCARD_SPI SPI1
206-
#define SDCARD_MISO_PIN PIN_SPI1_MISO
207-
#define SDCARD_MOSI_PIN PIN_SPI1_MOSI
208-
#define SDCARD_SCK_PIN PIN_SPI1_SCK
209-
#define SDCARD_SS_PIN PIN_SPI1_SS
205+
#define SDCARD_SPI SPI1
206+
#define SDCARD_MISO_PIN PIN_SPI1_MISO
207+
#define SDCARD_MOSI_PIN PIN_SPI1_MOSI
208+
#define SDCARD_SCK_PIN PIN_SPI1_SCK
209+
#define SDCARD_SS_PIN PIN_SPI1_SS
210210

211211
/*
212212
* Wire Interfaces
213213
*/
214214
#define WIRE_INTERFACES_COUNT 2
215215

216-
#define PIN_WIRE_SDA (62)
217-
#define PIN_WIRE_SCL (63)
218-
#define PERIPH_WIRE sercom3
219-
#define WIRE_IT_HANDLER SERCOM3_Handler
216+
#define PIN_WIRE_SDA (62)
217+
#define PIN_WIRE_SCL (63)
218+
#define PERIPH_WIRE sercom3
219+
#define WIRE_IT_HANDLER SERCOM3_Handler
220220

221221
static const uint8_t SDA = PIN_WIRE_SDA;
222222
static const uint8_t SCL = PIN_WIRE_SCL;
223223

224-
#define PIN_WIRE1_SDA (25)
225-
#define PIN_WIRE1_SCL (24)
226-
#define PERIPH_WIRE1 sercom6
227-
#define WIRE1_IT_HANDLER SERCOM6_Handler
224+
#define PIN_WIRE1_SDA (25)
225+
#define PIN_WIRE1_SCL (24)
226+
#define PERIPH_WIRE1 sercom6
227+
#define WIRE1_IT_HANDLER SERCOM6_Handler
228228

229229
static const uint8_t SDA1 = PIN_WIRE1_SDA;
230230
static const uint8_t SCL1 = PIN_WIRE1_SCL;
@@ -248,35 +248,35 @@ static const uint8_t SCL1 = PIN_WIRE1_SCL;
248248
#define PIN_I2S_SDI (31)
249249
#define PIN_I2S_SCK PIN_SERIAL4_TX
250250
#define PIN_I2S_FS (33)
251-
#define PIN_I2S_MCK PIN_SERIAL4_RX
251+
#define PIN_I2S_MCK PIN_SERIAL4_RX
252252

253253
//QSPI Pins
254-
#define PIN_QSPI_SCK (89)
255-
#define PIN_QSPI_CS (90)
256-
#define PIN_QSPI_IO0 (91)
257-
#define PIN_QSPI_IO1 (92)
258-
#define PIN_QSPI_IO2 (93)
259-
#define PIN_QSPI_IO3 (94)
254+
#define PIN_QSPI_SCK (89)
255+
#define PIN_QSPI_CS (90)
256+
#define PIN_QSPI_IO0 (91)
257+
#define PIN_QSPI_IO1 (92)
258+
#define PIN_QSPI_IO2 (93)
259+
#define PIN_QSPI_IO3 (94)
260260

261261
//PCC Pins
262-
#define PIN_PCC_DEN1 (26)
263-
#define PIN_PCC_DEN2 (27)
264-
#define PIN_PCC_CLK (28)
265-
#define PIN_PCC_XCLK (29)
266-
#define PIN_PCC_D0 (37)
267-
#define PIN_PCC_D1 (36)
268-
#define PIN_PCC_D2 (35)
269-
#define PIN_PCC_D3 (34)
270-
#define PIN_PCC_D4 (33)
271-
#define PIN_PCC_D5 (32)
272-
#define PIN_PCC_D6 (31)
273-
#define PIN_PCC_D7 (30)
274-
#define PIN_PCC_D8 (39)
275-
#define PIN_PCC_D9 (38)
276-
#define PIN_PCC_D10 (41)
277-
#define PIN_PCC_D11 (40)
278-
#define PIN_PCC_D12 (43)
279-
#define PIN_PCC_D13 (42)
262+
#define PIN_PCC_DEN1 (26)
263+
#define PIN_PCC_DEN2 (27)
264+
#define PIN_PCC_CLK (28)
265+
#define PIN_PCC_XCLK (29)
266+
#define PIN_PCC_D0 (37)
267+
#define PIN_PCC_D1 (36)
268+
#define PIN_PCC_D2 (35)
269+
#define PIN_PCC_D3 (34)
270+
#define PIN_PCC_D4 (33)
271+
#define PIN_PCC_D5 (32)
272+
#define PIN_PCC_D6 (31)
273+
#define PIN_PCC_D7 (30)
274+
#define PIN_PCC_D8 (39)
275+
#define PIN_PCC_D9 (38)
276+
#define PIN_PCC_D10 (41)
277+
#define PIN_PCC_D11 (40)
278+
#define PIN_PCC_D12 (43)
279+
#define PIN_PCC_D13 (42)
280280

281281
#if !defined(VARIANT_QSPI_BAUD_DEFAULT)
282282
// TODO: meaningful value for this

0 commit comments

Comments
 (0)