Skip to content

Commit 8e5c09c

Browse files
aentingeraentinger
authored
Merge pull request #714 from henklaak/master
Fix variant docs Issue #507
2 parents eaf7756 + f66c536 commit 8e5c09c

File tree

7 files changed

+34
-34
lines changed

7 files changed

+34
-34
lines changed

‎variants/mkr1000/variant.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ const PinDescription g_APinDescription[] = {
5757
| 10 | MISO | PA19 | | 03 | | | X07 | | *1/03 | 3/03 |* TC3/1 | TCC0/3 | I2S/SD0 | AC/CMP1 |
5858
+------------+------------------+--------+-----------------+--------------------+-----+-----+---------+---------+--------+--------+----------+----------+
5959
| | Wire | | | | | | | | | | | | | |
60-
| 11 | SDA | PA08 | | NMI | *16 | | X00 | | *0/00 | 2/00 | TCC0/0 | TCC1/2 | I2S/SD1 | |
61-
| 12 | SCL | PA09 | | 09 | *17 | | X01 | | *0/01 | 2/01 | TCC0/1 | TCC1/3 | I2S/MCK0 | |
60+
| 11 | SDA | PA08 | | NMI | *16 | | X00 | | 0/00 | *2/00 | TCC0/0 | TCC1/2 | I2S/SD1 | |
61+
| 12 | SCL | PA09 | | 09 | *17 | | X01 | | 0/01 | *2/01 | TCC0/1 | TCC1/3 | I2S/MCK0 | |
6262
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
6363
| | Serial1 | | | | | | | | | | | | | |
6464
| 13 | RX | PB23 | | 07 | | | | | | *5/03 | | | | GCLK_IO1 |
@@ -71,8 +71,8 @@ const PinDescription g_APinDescription[] = {
7171
{ PORTA, 19, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER ), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_NONE }, // MISO: SERCOM1/PAD[3]
7272

7373
// PINOUT=0
74-
{ PORTA, 8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER ), ADC_Channel16, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI }, // SDA: SERCOM4/PAD[0]
75-
{ PORTA, 9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM4/PAD[1]
74+
{ PORTA, 8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER ), ADC_Channel16, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI }, // SDA: SERCOM2/PAD[0]
75+
{ PORTA, 9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM2/PAD[1]
7676

7777
// RXPO=3 TXPO=1
7878
{ PORTB, 23, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // RX: SERCOM5/PAD[3]
@@ -129,10 +129,10 @@ const PinDescription g_APinDescription[] = {
129129
| | | | |(EXTINT)|(AIN)|(AIN)| | | (x/PAD) | (x/PAD) | (x/WO) | (x/WO) | | |
130130
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
131131
| | ATWINC1501B SPI | | | | | | | | | | | | | |
132-
| 26 | | PA12 | WINC MOSI | 12 | | | | | *2/00 | 4/00 | TCC2/0 | TCC0/6 | | AC/CMP0 |
133-
| 27 | | PA13 | WINC SCK | 13 | | | | | *2/01 | 4/01 | TCC2/1 | TCC0/7 | | AC/CMP1 |
132+
| 26 | | PA12 | WINC MOSI | 12 | | | | | 2/00 | *4/00 | TCC2/0 | TCC0/6 | | AC/CMP0 |
133+
| 27 | | PA13 | WINC SCK | 13 | | | | | 2/01 | *4/01 | TCC2/1 | TCC0/7 | | AC/CMP1 |
134134
| 28 | | PA14 | WINC SSN | 14 | | | | | 2/02 | 4/02 | TC3/0 | TCC0/4 | | GCLK_IO0 |
135-
| 29 | | PA15 | WINC MISO | 15 | | | | | *2/03 | 4/03 | TC3/1 | TCC0/5 | | GCLK_IO1 |
135+
| 29 | | PA15 | WINC MISO | 15 | | | | | 2/03 | *4/03 | TC3/1 | TCC0/5 | | GCLK_IO1 |
136136
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
137137
| | ATWINC1501B PINS | | | | | | | | | | | | | |
138138
| 30 | | PA27 | WINC RESETN_WIFI| 15 | | | | | | | | | | GCLK_IO0 |

‎variants/mkrfox1200/variant.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ const PinDescription g_APinDescription[] = {
5757
| 10 | MISO | PA19 | | 03 | | | X07 | | *1/03 | 3/03 |* TC3/1 | TCC0/3 | I2S/SD0 | AC/CMP1 |
5858
+------------+------------------+--------+-----------------+--------------------+-----+-----+---------+---------+--------+--------+----------+----------+
5959
| | Wire | | | | | | | | | | | | | |
60-
| 11 | SDA | PA08 | | NMI | *16 | | X00 | | *0/00 | 2/00 | TCC0/0 | TCC1/2 | I2S/SD1 | |
61-
| 12 | SCL | PA09 | | 09 | *17 | | X01 | | *0/01 | 2/01 | TCC0/1 | TCC1/3 | I2S/MCK0 | |
60+
| 11 | SDA | PA08 | | NMI | *16 | | X00 | | 0/00 | *2/00 | TCC0/0 | TCC1/2 | I2S/SD1 | |
61+
| 12 | SCL | PA09 | | 09 | *17 | | X01 | | 0/01 | *2/01 | TCC0/1 | TCC1/3 | I2S/MCK0 | |
6262
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
6363
| | Serial1 | | | | | | | | | | | | | |
6464
| 13 | RX | PB23 | | 07 | | | | | | *5/03 | | | | GCLK_IO1 |
@@ -129,10 +129,10 @@ const PinDescription g_APinDescription[] = {
129129
| | | | |(EXTINT)|(AIN)|(AIN)| | | (x/PAD) | (x/PAD) | (x/WO) | (x/WO) | | |
130130
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
131131
| | SD SPI | | | | | | | | | | | | | |
132-
| 26 | | PA12 | SIGFOX SCK | 12 | | | | | *2/00 | 4/00 | TCC2/0 | TCC0/6 | | AC/CMP0 |
133-
| 27 | | PA13 | SIGFOX MOSI | 13 | | | | | *2/01 | 4/01 | TCC2/1 | TCC0/7 | | AC/CMP1 |
132+
| 26 | | PA12 | SIGFOX SCK | 12 | | | | | 2/00 | *4/00 | TCC2/0 | TCC0/6 | | AC/CMP0 |
133+
| 27 | | PA13 | SIGFOX MOSI | 13 | | | | | 2/01 | *4/01 | TCC2/1 | TCC0/7 | | AC/CMP1 |
134134
| 28 | | PA14 | SIGFOX SS | 14 | | | | | 2/02 | 4/02 | TC3/0 | TCC0/4 | | GCLK_IO0 |
135-
| 29 | | PA15 | SIGFOX MISO | 15 | | | | | *2/03 | 4/03 | TC3/1 | TCC0/5 | | GCLK_IO1 |
135+
| 29 | | PA15 | SIGFOX MISO | 15 | | | | | 2/03 | *4/03 | TC3/1 | TCC0/5 | | GCLK_IO1 |
136136
| 30 | | PA27 | SIGFOX RES | 15 | | | | | | | | | | GCLK_IO0 |
137137
| 31 | | PA28 | SIGFOX PWRON | 08 | | | | | | | | | | GCLK_IO0 |
138138
| 32 | | PB08 | ADC_BATTERY | 08 | 02 | | Y14 | | | 4/00 | TC4/0 | | | |

‎variants/mkrgsm1400/variant.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ const PinDescription g_APinDescription[] = {
5858
| 10 | MISO | PA19 | | 03 | | | X07 | | *1/03 | 3/03 |* TC3/1 | TCC0/3 | I2S/SD0 | AC/CMP1 |
5959
+------------+------------------+--------+-----------------+--------------------+-----+-----+---------+---------+--------+--------+----------+----------+
6060
| | Wire | | | | | | | | | | | | | |
61-
| 11 | SDA | PA08 | | NMI | *16 | | X00 | | *0/00 | 2/00 | TCC0/0 | TCC1/2 | I2S/SD1 | |
62-
| 12 | SCL | PA09 | | 09 | *17 | | X01 | | *0/01 | 2/01 | TCC0/1 | TCC1/3 | I2S/MCK0 | |
61+
| 11 | SDA | PA08 | | NMI | *16 | | X00 | | 0/00 | *2/00 | TCC0/0 | TCC1/2 | I2S/SD1 | |
62+
| 12 | SCL | PA09 | | 09 | *17 | | X01 | | 0/01 | *2/01 | TCC0/1 | TCC1/3 | I2S/MCK0 | |
6363
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
6464
| | Serial1 | | | | | | | | | | | | | |
6565
| 13 | RX | PB23 | | 07 | | | | | | *5/03 | | | | GCLK_IO1 |
@@ -130,10 +130,10 @@ const PinDescription g_APinDescription[] = {
130130
| | | | |(EXTINT)|(AIN)|(AIN)| | | (x/PAD) | (x/PAD) | (x/WO) | (x/WO) | | |
131131
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
132132
| | SD SPI | | | | | | | | | | | | | |
133-
| 26 | | PA12 | GSM_TX | 12 | | | | | *2/00 | 4/00 | TCC2/0 | TCC0/6 | | AC/CMP0 |
134-
| 27 | | PA13 | GSM_RX | 13 | | | | | *2/01 | 4/01 | TCC2/1 | TCC0/7 | | AC/CMP1 |
133+
| 26 | | PA12 | GSM_TX | 12 | | | | | 2/00 | *4/00 | TCC2/0 | TCC0/6 | | AC/CMP0 |
134+
| 27 | | PA13 | GSM_RX | 13 | | | | | 2/01 | *4/01 | TCC2/1 | TCC0/7 | | AC/CMP1 |
135135
| 28 | | PA14 | GSM_RTS | 14 | | | | | 2/02 | 4/02 | TC3/0 | TCC0/4 | | GCLK_IO0 |
136-
| 29 | | PA15 | GSM_CTS | 15 | | | | | *2/03 | 4/03 | TC3/1 | TCC0/5 | | GCLK_IO1 |
136+
| 29 | | PA15 | GSM_CTS | 15 | | | | | 2/03 | *4/03 | TC3/1 | TCC0/5 | | GCLK_IO1 |
137137
| 30 | | PA27 | PMIC_IRQ | *15 | | | | | | | | | | GCLK_IO0 |
138138
| 31 | | PB08 | GSM_RESETN | 08 | 02 | | Y14 | | | 4/00 | TC4/0 | | | |
139139
| 32 | | PB09 | ADC_VBAT | *09 | 03 | | Y15 | | | 4/01 | TC4/1 | | | |

‎variants/mkrnb1500/variant.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ const PinDescription g_APinDescription[] = {
5858
| 10 | MISO | PA19 | | 03 | | | X07 | | *1/03 | 3/03 |* TC3/1 | TCC0/3 | I2S/SD0 | AC/CMP1 |
5959
+------------+------------------+--------+-----------------+--------------------+-----+-----+---------+---------+--------+--------+----------+----------+
6060
| | Wire | | | | | | | | | | | | | |
61-
| 11 | SDA | PA08 | | NMI | *16 | | X00 | | *0/00 | 2/00 | TCC0/0 | TCC1/2 | I2S/SD1 | |
62-
| 12 | SCL | PA09 | | 09 | *17 | | X01 | | *0/01 | 2/01 | TCC0/1 | TCC1/3 | I2S/MCK0 | |
61+
| 11 | SDA | PA08 | | NMI | *16 | | X00 | | 0/00 | *2/00 | TCC0/0 | TCC1/2 | I2S/SD1 | |
62+
| 12 | SCL | PA09 | | 09 | *17 | | X01 | | 0/01 | *2/01 | TCC0/1 | TCC1/3 | I2S/MCK0 | |
6363
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
6464
| | Serial1 | | | | | | | | | | | | | |
6565
| 13 | RX | PB23 | | 07 | | | | | | *5/03 | | | | GCLK_IO1 |
@@ -130,10 +130,10 @@ const PinDescription g_APinDescription[] = {
130130
| | | | |(EXTINT)|(AIN)|(AIN)| | | (x/PAD) | (x/PAD) | (x/WO) | (x/WO) | | |
131131
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
132132
| | SD SPI | | | | | | | | | | | | | |
133-
| 26 | | PA12 | GSM_TX | 12 | | | | | *2/00 | 4/00 | TCC2/0 | TCC0/6 | | AC/CMP0 |
134-
| 27 | | PA13 | GSM_RX | 13 | | | | | *2/01 | 4/01 | TCC2/1 | TCC0/7 | | AC/CMP1 |
133+
| 26 | | PA12 | GSM_TX | 12 | | | | | 2/00 | *4/00 | TCC2/0 | TCC0/6 | | AC/CMP0 |
134+
| 27 | | PA13 | GSM_RX | 13 | | | | | 2/01 | *4/01 | TCC2/1 | TCC0/7 | | AC/CMP1 |
135135
| 28 | | PA14 | GSM_RTS | 14 | | | | | 2/02 | 4/02 | TC3/0 | TCC0/4 | | GCLK_IO0 |
136-
| 29 | | PA15 | GSM_CTS | 15 | | | | | *2/03 | 4/03 | TC3/1 | TCC0/5 | | GCLK_IO1 |
136+
| 29 | | PA15 | GSM_CTS | 15 | | | | | 2/03 | *4/03 | TC3/1 | TCC0/5 | | GCLK_IO1 |
137137
| 30 | | PA27 | PMIC_IRQ | *15 | | | | | | | | | | GCLK_IO0 |
138138
| 31 | | PB08 | GSM_RESETN | 08 | 02 | | Y14 | | | 4/00 | TC4/0 | | | |
139139
| 32 | | PB09 | ADC_VBAT | *09 | 03 | | Y15 | | | 4/01 | TC4/1 | | | |

‎variants/mkrwan1300/variant.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ const PinDescription g_APinDescription[] = {
5757
| 10 | MISO | PA19 | | 03 | | | X07 | | *1/03 | 3/03 |* TC3/1 | TCC0/3 | I2S/SD0 | AC/CMP1 |
5858
+------------+------------------+--------+-----------------+--------------------+-----+-----+---------+---------+--------+--------+----------+----------+
5959
| | Wire | | | | | | | | | | | | | |
60-
| 11 | SDA | PA08 | | NMI | *16 | | X00 | | *0/00 | 2/00 | TCC0/0 | TCC1/2 | I2S/SD1 | |
61-
| 12 | SCL | PA09 | | 09 | *17 | | X01 | | *0/01 | 2/01 | TCC0/1 | TCC1/3 | I2S/MCK0 | |
60+
| 11 | SDA | PA08 | | NMI | *16 | | X00 | | 0/00 | *2/00 | TCC0/0 | TCC1/2 | I2S/SD1 | |
61+
| 12 | SCL | PA09 | | 09 | *17 | | X01 | | 0/01 | *2/01 | TCC0/1 | TCC1/3 | I2S/MCK0 | |
6262
+------------+------------------+--------+-----------------+--------+-----+-----+-----+-----+---------+---------+--------+--------+----------+----------+
6363
| | Serial1 | | | | | | | | | | | | | |
6464
| 13 | RX | PB23 | | 07 | | | | | | *5/03 | | | | GCLK_IO1 |

0 commit comments

Comments
 (0)