Added support for up to 6 SERCOM on the L21E (32-pin). Added two additional timers to the C21E.

mattairtech · mattairtech · commit 36654c5ba011 · 2017-07-06T02:16:27.000Z
diff --git a/boards.txt b/boards.txt
@@ -175,10 +175,26 @@ mattairtech_mt_d21e_revb.menu.serial.four_uart=FOUR_UART_NO_WIRE_NO_SPI
 mattairtech_mt_d21e_revb.menu.serial.four_uart.build.serialcom_uart=FOUR_UART
 mattairtech_mt_d21e_revb.menu.serial.four_uart.build.serialcom_wire=NO_WIRE
 mattairtech_mt_d21e_revb.menu.serial.four_uart.build.serialcom_spi=NO_SPI
-mattairtech_mt_d21e_revb.menu.serial.no_uart=NO_UART_ONE_WIRE_TWO_SPI
-mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_uart=NO_UART
-mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
-mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_spi=TWO_SPI
+mattairtech_mt_d21e_revb.menu.serial.no_uart_one_wire_two_spi=NO_UART_ONE_WIRE_TWO_SPI
+mattairtech_mt_d21e_revb.menu.serial.no_uart_one_wire_two_spi.build.serialcom_uart=NO_UART
+mattairtech_mt_d21e_revb.menu.serial.no_uart_one_wire_two_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e_revb.menu.serial.no_uart_one_wire_two_spi.build.serialcom_spi=TWO_SPI
+mattairtech_mt_d21e_revb.menu.serial.four_uart_one_wire_one_spi=FOUR_UART_ONE_WIRE_ONE_SPI (L21 only)
+mattairtech_mt_d21e_revb.menu.serial.four_uart_one_wire_one_spi.build.serialcom_uart=FOUR_UART
+mattairtech_mt_d21e_revb.menu.serial.four_uart_one_wire_one_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e_revb.menu.serial.four_uart_one_wire_one_spi.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.five_uart_no_wire_one_spi=FIVE_UART_NO_WIRE_ONE_SPI (L21 only)
+mattairtech_mt_d21e_revb.menu.serial.five_uart_no_wire_one_spi.build.serialcom_uart=FIVE_UART
+mattairtech_mt_d21e_revb.menu.serial.five_uart_no_wire_one_spi.build.serialcom_wire=NO_WIRE
+mattairtech_mt_d21e_revb.menu.serial.five_uart_no_wire_one_spi.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.five_uart_one_wire_no_spi=FIVE_UART_ONE_WIRE_NO_SPI (L21 only)
+mattairtech_mt_d21e_revb.menu.serial.five_uart_one_wire_no_spi.build.serialcom_uart=FIVE_UART
+mattairtech_mt_d21e_revb.menu.serial.five_uart_one_wire_no_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e_revb.menu.serial.five_uart_one_wire_no_spi.build.serialcom_spi=NO_SPI
+mattairtech_mt_d21e_revb.menu.serial.six_uart=SIX_UART_NO_WIRE_NO_SPI (L21 only)
+mattairtech_mt_d21e_revb.menu.serial.six_uart.build.serialcom_uart=SIX_UART
+mattairtech_mt_d21e_revb.menu.serial.six_uart.build.serialcom_wire=NO_WIRE
+mattairtech_mt_d21e_revb.menu.serial.six_uart.build.serialcom_spi=NO_SPI
 mattairtech_mt_d21e_revb.menu.usb.cdc=CDC_ONLY
 mattairtech_mt_d21e_revb.menu.usb.cdc.build.usbcom=CDC_ONLY
 mattairtech_mt_d21e_revb.menu.usb.cdc.build.pid=0x0557
@@ -305,10 +321,10 @@ mattairtech_mt_d21e.menu.serial.four_uart=FOUR_UART_NO_WIRE_NO_SPI
 mattairtech_mt_d21e.menu.serial.four_uart.build.serialcom_uart=FOUR_UART
 mattairtech_mt_d21e.menu.serial.four_uart.build.serialcom_wire=NO_WIRE
 mattairtech_mt_d21e.menu.serial.four_uart.build.serialcom_spi=NO_SPI
-mattairtech_mt_d21e.menu.serial.no_uart=NO_UART_ONE_WIRE_TWO_SPI
-mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_uart=NO_UART
-mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
-mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_spi=TWO_SPI
+mattairtech_mt_d21e.menu.serial.no_uart_one_wire_two_spi=NO_UART_ONE_WIRE_TWO_SPI
+mattairtech_mt_d21e.menu.serial.no_uart_one_wire_two_spi.build.serialcom_uart=NO_UART
+mattairtech_mt_d21e.menu.serial.no_uart_one_wire_two_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e.menu.serial.no_uart_one_wire_two_spi.build.serialcom_spi=TWO_SPI
 mattairtech_mt_d21e.menu.usb.cdc=CDC_ONLY
 mattairtech_mt_d21e.menu.usb.cdc.build.usbcom=CDC_ONLY
 mattairtech_mt_d21e.menu.usb.cdc.build.pid=0x0557
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
@@ -16,6 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include "sam.h"
 
 #if (SAMD21 || SAML21)
 #include <stdio.h>
@@ -27,7 +28,6 @@
 #include "WVariant.h"
 #include "USB_host.h"
 #include "samd21_host.h"
-#include "sam.h"
 #include "wiring_digital.h"
 #include "wiring_private.h"
 
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
@@ -134,25 +134,30 @@ void init( void )
   regAPBCMASK |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 | MCLK_APBCMASK_SERCOM4 | MCLK_APBCMASK_SERCOM5 ;
   regAPBCMASK |= MCLK_APBCMASK_TCC0 | MCLK_APBCMASK_TCC1 | MCLK_APBCMASK_TCC2 | MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1 | MCLK_APBCMASK_TC2 | MCLK_APBCMASK_TC3 | MCLK_APBCMASK_TC4 ;
   #endif
-  
+
   #if (SAML)
   regAPBCMASK |= MCLK_APBCMASK_DAC ;
   MCLK->APBDMASK.reg |= MCLK_APBDMASK_ADC;	// On the SAML, ADC is on the low power bridge
   #elif (SAMC)
   regAPBCMASK |= MCLK_APBCMASK_ADC0 | MCLK_APBCMASK_ADC1 | MCLK_APBCMASK_DAC ;
   #endif
-  
+
   MCLK->APBCMASK.reg |= regAPBCMASK ;
 #else
   #error "wiring.c: Unsupported chip"
 #endif
 
-  //Setup all pins (digital and analog) in STARTUP mode (enable INEN and set default pull direction to pullup (pullup will not be enabled))
+  // Setup all pins (digital and analog) in STARTUP mode (enable INEN and set default pull direction to pullup (pullup will not be enabled))
   for (uint32_t ul = 0 ; ul < NUM_DIGITAL_PINS ; ul++ )
   {
     pinMode( ul, PIO_STARTUP ) ;
   }
 
+  // At least on the L21, pin A31 must be set as an input. It is possible that debugger probe detection is being falsely
+  // detected (even with a pullup on A31 (SWCLK)), which would change the peripheral mux of A31 to COM.
+  // This might not normally be a problem, but one strange effect is that Serial2 loses characters if pin A31 is not set as INPUT.
+  pinMode(31, INPUT);
+
 // I/O mux table footnote for D21 and D11: enable pullups on PA24 and PA24 when using as GPIO to avoid excessive current
 //  Errata: disable pull resistors on PA24 or PA25 manually before switching to peripheral
 //  Errata: do not use continuous sampling (not enabled by default) on PA24 or PA25
diff --git a/variants/Generic_D11C14A/README.md b/variants/Generic_D11C14A/README.md
@@ -20,8 +20,8 @@ SWDCLK  TX1/MISO*              30 | A30           A31 | 31   *            RX1/SS
   using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the top
   left pin (A2). PIN_MAP_COMPACT uses less RAM.
 * When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
-* When using NO_UART_ONE_WIRE_ONE_SPI, use SPI on pins 4, 5, 14, and 15.
-  When using ONE_UART_NO_WIRE_ONE_SPI, use SPI on pins 8, 9, 30, and 31.
+* When using ONE_UART_NO_WIRE_ONE_SPI, use SPI on pins 4, 5, 14, and 15.
+  When using NO_UART_ONE_WIRE_ONE_SPI, use SPI on pins 8, 9, 30, and 31.
 * Tone available on TC2. TC2 is not routed to pins in the D11C14A.
 * Leave pin A30 floating (or use external pullup) during reset.
 * DO NOT connect voltages higher than 3.3V!
diff --git a/variants/MT_D11/README.md b/variants/MT_D11/README.md
@@ -24,7 +24,8 @@ BTN   SS              *      *     | A15           RST |
   left pin (A2). PIN_MAP_COMPACT uses less RAM.
 * When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
 * Leave pin A30 floating (or use external pullup) during reset.
-* Tone available on TC2. DO NOT connect voltages higher than 3.3V!
+* DO NOT connect voltages higher than 3.3V!
+* Tone available on TC2.
 ```
 
 
diff --git a/variants/MT_D11/variant.h b/variants/MT_D11/variant.h
@@ -388,4 +388,4 @@ extern Uart Serial2;
 #define Serial                      Serial1
 #endif
 
-#endif /* _VARIANT_ARDUINO_ZERO_ */
+#endif /* _VARIANT_MATTAIRTECH_MT_D11_ */
diff --git a/variants/MT_D21E/README.md b/variants/MT_D21E/README.md
@@ -32,7 +32,8 @@ USB D+       TC51                    | A25+ |     |  Vin |
   functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
 * When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
 * Leave pin A30 floating (or use external pullup) during reset.
-* Tone available on TC5. DO NOT connect voltages higher than 3.3V!
+* DO NOT connect voltages higher than 3.3V!
+* Tone available on TC5.
 ```
 
 ## Pins descriptions for the MattairTech MT-D21E
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
@@ -294,9 +294,9 @@ static const uint8_t SCL1 = PIN_WIRE1_SCL;
 
 #define I2S_DEVICE          0
 #define I2S_CLOCK_GENERATOR 3
-#define PIN_I2S_SD          (9u)
-#define PIN_I2S_SCK         (1u)
-#define PIN_I2S_FS          (0u)
+#define PIN_I2S_SD          (7u)
+#define PIN_I2S_SCK         (10u)
+#define PIN_I2S_FS          (11u)
 
 #ifdef __cplusplus
 }
@@ -320,6 +320,8 @@ extern SERCOM sercom3;
 
 extern Uart Serial1;
 extern Uart Serial2;
+extern Uart Serial3;
+extern Uart Serial4;
 
 #endif
 
@@ -362,4 +364,4 @@ extern Uart Serial2;
 #define Serial                      Serial1
 #endif
 
-#endif /* _VARIANT_ARDUINO_ZERO_ */
+#endif /* _VARIANT_MATTAIRTECH_MT_D21E_ */
diff --git a/variants/MT_D21E_revB/README.md b/variants/MT_D21E_revB/README.md
@@ -33,7 +33,7 @@ USB D+ (D/L)(+), CAN RX (C)  TC51 25 | A25  |     |  Vin |   L21 installed. 5V i
   functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
 * When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
 * Leave pin A30 floating (or use external pullup) during reset.
-* Tone available on TC5. DO NOT connect voltages higher than 3.3V!
+* Tone available on TC5.
 
 + This alternate function is enabled by default (+M functions enabled only when a memory
   device is installed). Thus, the associated header pin cannot be used. Solder jumpers
@@ -46,6 +46,60 @@ Silkscreen Legend:
   Bottom: A circled pin means analog function
 ```
 
+## COM Arrangement When Using "L21 Only" Options
+
+The following applies only to the L21 and only when using menu options with (L21 only).
+If using the L21 with the other options, use the above ASCII diagram.
+
+The additional options are:
+
+* FOUR_UART_ONE_WIRE_ONE_SPI
+* FIVE_UART_NO_WIRE_ONE_SPI
+* FIVE_UART_ONE_WIRE_NO_SPI
+* SIX_UART_NO_WIRE_NO_SPI
+
+```
+         -------------------
+        | A0            RST |
+        | A1            Gnd |
+        | A2           Vbat |
+        | A3            A31 |
+        | A4            A30 |
+        | A5            NC  |
+        | A6            NC  |
+        | A7            A27 | CS (MEM)
+TX3     | A8            A23 | SS/RX5
+RX3     | A9            A22 | MISO/TX5
+TX1     | A10           A19 | SCK
+RX1     | A11           A18 | MOSI
+TX2     | A14           A17 | SCL/RX5/RX6
+RX2     | A15           A16 | SDA/TX5/TX6
+        | NC            NC  |
+        | NC            NC  |
+        | Vbus          3.3V|
+USB/TX4 | A24   _____   Vcc |
+USB/RX4 | A25  |     |  Vin |
+        | Gnd  | USB |  Gnd |
+         -------------------
+
+* If the memory device is installed, it is connected to SPI (A18, A19, and A22).
+  If selecting an option without SPI, then A22 will become TX5. Be sure to keep the
+  memory device CS pin high. You can disconnect A27 from CS by desoldering J13.
+* Serial4 is shared with the USB pins. Thus, USB cannot be used is using Serial4. Be
+  sure to disconnect the USB connector D- and D+ pins by desoldering J4 and J7.
+* It is not necessary to use all serial instances, and they can be skipped. For
+  example, with the FIVE_UART_NO_WIRE_ONE_SPI option, USB can still be used by NOT
+  calling Serial4.begin(), thus not enabling the Serial4 peripheral. However, Serial5
+  can still be used.
+* Serial5 can be located either on pins A16/A17 or A22/A23. If SPI is enabled, then
+  Serial5 is on pins A16/A17, otherwise it is on pins A22/A23.
+* SERCOM5 has low-power capabilities and can run in power domain PD0, at the expense
+  of DMA support and a few other features (see core README.md). It is available in two
+  locations only, A24/A25 and A22/A23. If SPI is enabled, then SERCOM5 is connected to
+  Serial4 on A24/A25 (must disable USB), otherwise, it uses Serial5 on A22/A23.
+* When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+```
+
 
 ## Pins descriptions for the MattairTech MT-D21E (rev B)
 ```
@@ -70,7 +124,7 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 15	| A15	| PA15	| Xout, RX2/SCK1	| !EIC/EXTINT[15] SERCOM2/PAD[3] TC3/WO[1] !TCC0/WO[5] Xout
 16	| A16	| PA16	| SDA/TX4 w/pullup	| EIC/EXTINT[0] PTC/X[4] SERCOM1/PAD[0] SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
 17	| A17	| PA17	| SCL/RX4 w/pullup	| EIC/EXTINT[1] PTC/X[5] SERCOM1/PAD[1] SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
-18	| A18	| PA18	| SPI			| EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
+18	| A18	| PA18	| MOSI			| EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
 19	| A19	| PA19	| SCK			| EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
 20	| ---	| ----	| NOT A PIN		| NOT A PIN
 21	| ---	| ----	| NOT A PIN		| NOT A PIN
@@ -95,6 +149,7 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 * TC5(D21) is available on these pins otherwise. The tone library uses TC5.
 * A0 and A1 are by default connected to the 32.768KHz crystal.
 * Leave pin A30 floating (or use external pullup) during reset.
+* This table does not list "L21 Only" COM configurations.
 ```
 
 
@@ -146,10 +201,10 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
   * 14 pins can be configured with external interrupts.
 
 * **SERCOM**
-  * 4 SERCOM are available.
-  * Up to 4 UART instances
-  * Up to 2 SPI instances
-  * Up to 2 WIRE (I2C) instances
+  * 4 SERCOM are available (6 on the L21E).
+  * Up to 4 UART instances (6 on the L21E).
+  * Up to 2 SPI instances.
+  * Up to 2 WIRE (I2C) instances.
   * The WIRE pullup resistors are enabled by default.
 
 
@@ -211,7 +266,7 @@ now calls pinPeripheral() with the desired mode. Note that this field is not use
 select between the two peripherals possible with each of the SERCOM and TIMER functions.
 PeripheralAttribute is now used for this.
 
-### PeripheralAttribute:
+### PeripheralAttribute
 This is an 8-bit bitfield used for various peripheral configuration. It is primarily
 used to select between the two peripherals possible with each of the SERCOM and TIMER
 functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
diff --git a/variants/MT_D21E_revB/variant.cpp b/variants/MT_D21E_revB/variant.cpp
diff --git a/variants/MT_D21E_revB/variant.h b/variants/MT_D21E_revB/variant.h
