Update USB implementation, fix 64 bytes bug

.gitignore

@@ -1,3 +1,3 @@
-*.bz2
-
 bootloaders/*/build/
+extras/*
+!extras/package_Fab_SAM_index.json

CHANGELOG

@@ -1,3 +1,6 @@
+1.6.18 (August 26, 2021):
+* Fix a critical bug with the USB CDC where a packet of exactly 64 bytes gets stuck in a buffer.
+
 Up next:
 * **Add MicroPython support.** Add Demo sketch with Arduino shell and Python interpreter.
 * Add QSPI driver with XIP (DDR support only when the MCU runs at 48MHz) for the D51.
@@ -187,7 +190,7 @@ Up next:
   * Bootloader: 32Khz external oscillator is now used, improves USB clock. Thanks @aethaniel
   * Bootloader: Clean up of makefiles and file organization. Thanks @aethaniel
   * Small fix to USBHost example "USB_desc.ino". Thanks @bbx10
-  * USBHost: USB-Keyboard right shift key was ignored. Thanks @bbx10 
+  * USBHost: USB-Keyboard right shift key was ignored. Thanks @bbx10
   * Wire library now support multiple instances in variant. Thanks @spiderkeys
   * Ported some SerialUSB API (readBreak(), baud(), stopbits(), paritytype(), numbits(), dtr(), rts())
 * Merged in changes from upstream SAMD CORE 1.6.4 2016.02.19:

README.md

@@ -1,4 +1,28 @@
-# MattairTech SAM D|L|C Core for Arduino
+# Fab SAM D|L|C Core for Arduino
+
+## Quitck installation guide
+
+You can find a guide here:
+https://gitlab.cba.mit.edu/quentinbolsee/Arduino-SAM-tutorial/
+
+## Summary
+
+This repository is a Fab community fork of the original [MattairTech SAM D|L|C Core](https://github.com/mattairtech/ArduinoCore-samd).
+
+It offers support for:
+- D11C14A / D11C14AM / D11C14AS
+- x21E
+- x21G
+- x21J
+- D51G
+- D51J
+
+To install, simply add the following URL to "Additional Boards Manager URLs" in the Arduino IDE:
+
+https://raw.githubusercontent.com/qbolsee/ArduinoCore-fab-sam/master/json/package_Fab_SAM_index.json
+
+
+# Description
 
 The MattairTech SAM D|L|C Core for Arduino is a fork from arduino/ArduinoCore-samd
 on GitHub, which will be used to maintain Arduino support for MattairTech boards

bootloaders/zero/Makefile

@@ -28,7 +28,7 @@ SDCARD?=SDCARD_DISABLED
 # Xeno, Xeno_Mini, MT_D21E_rev_A, MT_D21E_rev_B, MT_D11
 # arduino_zero, arduino_mkrzero, arduino_mkr1000, arduino_mkrfox1200, genuino_mkr1000, genuino_zero, arduino_m0, arduino_m0_pro
 # Generic_x21E, Generic_x21G, Generic_x21J, Generic_D11D14AM, Generic_D11D14AS, Generic_D11C14A
-BOARD_ID?=Xeno_Mini
+BOARD_ID?=Generic_x21E
 
 # -----------------------------------------------------------------------------
 # MCU definitions:
@@ -46,17 +46,17 @@ BOARD_ID?=Xeno_Mini
 # SAMD51J: SAMD51J18A, SAMD51J19A, SAMD51J20A
 # SAMD51N: SAMD51N19A, SAMD51N20A
 # SAMD51P: SAMD51P19A, SAMD51P20A
-MCU?=SAMD51G19A
+MCU?=SAMD21E17A
 
 # Note that the makefile can be invoked with values that override the above settings.
 # For example: BOARD_ID=Generic_D11C14A MCU=SAMD11C14A SDCARD=SDCARD_DISABLED make
 
 # End Config ###############################
 
 ifeq ($(findstring ENABLED,$(SDCARD)),ENABLED)
-NAME=sam_ba_sdcard_$(BOARD_ID)_$(MCU)
+NAME=sam_ba_sdcard_$(MCU)
 else
-NAME=sam_ba_$(BOARD_ID)_$(MCU)
+NAME=sam_ba_$(MCU)
 endif
 
 ifeq ($(findstring 20,$(MCU)),20)
@@ -90,7 +90,7 @@ MCPU=cortex-m0plus
 endif
 
 # CORE_VENDOR?=arduino
-CORE_VENDOR?=MattairTech_Arduino
+CORE_VENDOR?=Fab_SAM_Arduino
 
 # -----------------------------------------------------------------------------
 # Paths

bootloaders/zero/board_definitions.h

@@ -2,6 +2,7 @@
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
   Copyright (c) 2017 MattairTech LLC. All right reserved.
+  Copyright (c) 2020 Fab Foundation All right reserved.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -20,44 +21,26 @@
 
 #include <sam.h>
 
-#if defined(BOARD_ID_arduino_zero)
-  #include "board_definitions/board_definitions_arduino_zero.h"
-#elif defined(BOARD_ID_genuino_zero)
-  #include "board_definitions/board_definitions_genuino_zero.h"
-#elif defined(BOARD_ID_arduino_mkr1000)
-  #include "board_definitions/board_definitions_arduino_mkr1000.h"
-#elif defined(BOARD_ID_genuino_mkr1000)
-  #include "board_definitions/board_definitions_genuino_mkr1000.h"
-#elif defined(BOARD_ID_arduino_mkrzero)
-  #include "board_definitions/board_definitions_arduino_mkrzero.h"
-#elif defined(BOARD_ID_arduino_mkrfox1200)
-  #include "board_definitions/board_definitions_arduino_mkrfox1200.h"
-#elif defined(BOARD_ID_Xeno)
-  #include "board_definitions/board_definitions_Xeno.h"
-#elif defined(BOARD_ID_Xeno_Mini)
-  #include "board_definitions/board_definitions_Xeno_Mini.h"
-#elif defined(BOARD_ID_MT_D21E_rev_A)
-  #include "board_definitions/board_definitions_MT_D21E_rev_A.h"
-#elif defined(BOARD_ID_MT_D21E_rev_B)
-  #include "board_definitions/board_definitions_MT_D21E_rev_B.h"
-#elif defined(BOARD_ID_MT_D11)
-  #include "board_definitions/board_definitions_MT_D11.h"
-#elif defined(BOARD_ID_Generic_x21E)
+#if defined(BOARD_ID_Generic_x21E)
   #include "board_definitions/board_definitions_Generic_x21E.h"
 #elif defined(BOARD_ID_Generic_x21G)
   #include "board_definitions/board_definitions_Generic_x21G.h"
 #elif defined(BOARD_ID_Generic_x21J)
   #include "board_definitions/board_definitions_Generic_x21J.h"
+#elif defined(BOARD_ID_Generic_D51G)
+  #include "board_definitions/board_definitions_Generic_D51G.h"
+#elif defined(BOARD_ID_Generic_D51J)
+  #include "board_definitions/board_definitions_Generic_D51J.h"
+#elif defined(BOARD_ID_Generic_D51N)
+  #include "board_definitions/board_definitions_Generic_D51N.h"
+#elif defined(BOARD_ID_Generic_D51P)
+  #include "board_definitions/board_definitions_Generic_D51P.h"
 #elif defined(BOARD_ID_Generic_D11D14AM)
   #include "board_definitions/board_definitions_Generic_D11D14AM.h"
 #elif defined(BOARD_ID_Generic_D11D14AS)
   #include "board_definitions/board_definitions_Generic_D11D14AS.h"
 #elif defined(BOARD_ID_Generic_D11C14A)
   #include "board_definitions/board_definitions_Generic_D11C14A.h"
-#elif defined(BOARD_ID_arduino_m0)
-  #include "board_definitions/board_definitions_arduino_m0.h"
-#elif defined(BOARD_ID_arduino_m0_pro)
-  #include "board_definitions/board_definitions_arduino_m0_pro.h"
 #else
   #error You must define a BOARD_ID and add the corresponding definitions in board_definitions.h
 #endif
@@ -125,7 +108,7 @@
 #elif (SAML21 || SAMC21 || SAMD51)
   #define BOOT_DOUBLE_TAP_ADDRESS           (HSRAM_ADDR + HSRAM_SIZE - 4)
 #else
-  #error "board_definitions.h: Missing dependency or unsupported chip. Please install CMSIS-Atmel from MattairTech (see Prerequisites for Building in README.md)."
+  #error "board_definitions.h: Missing dependency or unsupported chip. Please install CMSIS-Atmel (see Prerequisites for Building in README.md)."
 #endif
 
 #define BOOT_DOUBLE_TAP_DATA              (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))

bootloaders/zero/board_definitions/board_definitions_Generic_D11C14A.h

@@ -197,13 +197,13 @@
  * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
-#define STRING_MANUFACTURER "MattairTech LLC"
+#define STRING_MANUFACTURER "Fab Foundation"
 #define STRING_PRODUCT "Generic SAMD11C14A"
 
 /* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
-#define USB_PID_HIGH   0x05
+#define USB_PID_HIGH   0x15
 #define USB_PID_LOW    0x57
 
 /* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.

bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AM.h

@@ -197,13 +197,13 @@
  * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
-#define STRING_MANUFACTURER "MattairTech LLC"
+#define STRING_MANUFACTURER "Fab Foundation"
 #define STRING_PRODUCT "Generic SAMD11D14AM"
 
 /* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
-#define USB_PID_HIGH   0x05
+#define USB_PID_HIGH   0x35
 #define USB_PID_LOW    0x57
 
 /* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.

bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AS.h

@@ -197,13 +197,13 @@
  * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
-#define STRING_MANUFACTURER "MattairTech LLC"
+#define STRING_MANUFACTURER "Fab Foundation"
 #define STRING_PRODUCT "Generic SAMD11D14AS"
 
 /* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
-#define USB_PID_HIGH   0x05
+#define USB_PID_HIGH   0x25
 #define USB_PID_LOW    0x57
 
 /* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.

bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h → bootloaders/zero/board_definitions/board_definitions_Generic_D51G.h

@@ -50,12 +50,13 @@
  * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
  * associated pins are only initialized if either pin is active.
  */
-#define SDCARD_SPI_SERCOM_INSTANCE      3
+#define SDCARD_SPI_SERCOM_INSTANCE      1
 #define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
-#define SDCARD_SPI_PAD0                 PINMUX_PA22C_SERCOM3_PAD0
+#define SDCARD_SPI_PAD0                 PINMUX_PA16C_SERCOM1_PAD0
 #define SDCARD_SPI_PAD1                 PINMUX_UNUSED
-#define SDCARD_SPI_PAD2                 PINMUX_PA18D_SERCOM3_PAD2
-#define SDCARD_SPI_PAD3                 PINMUX_PA19D_SERCOM3_PAD3
+#define SDCARD_SPI_PAD2                 PINMUX_PA18C_SERCOM1_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PA19C_SERCOM1_PAD3
+
 
 /* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
  * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
@@ -115,11 +116,7 @@
  * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
  * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
  */
-#if (SAMC21)
-  #define SAM_BA_INTERFACE		SAM_BA_UART_ONLY
-#else
-  #define SAM_BA_INTERFACE		SAM_BA_USBCDC_ONLY
-#endif
+#define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
 
 /* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
  * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
@@ -150,7 +147,7 @@
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
  * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	1
+#define ARDUINO_EXTENDED_CAPABILITIES   1
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -165,11 +162,7 @@
  * not suspended), where it will calibrate against the USB SOF signal.
  */
 #ifndef CLOCKCONFIG_CLOCK_SOURCE
-  #if (SAMC21)
-    #define CLOCKCONFIG_CLOCK_SOURCE	CLOCKCONFIG_INTERNAL
-  #else
-    #define CLOCKCONFIG_CLOCK_SOURCE	CLOCKCONFIG_INTERNAL_USB
-  #endif
+  #define CLOCKCONFIG_CLOCK_SOURCE	CLOCKCONFIG_INTERNAL_USB
 #endif
 
 /* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
@@ -195,7 +188,8 @@
 /* Master clock frequency (also Fcpu frequency). With the D51,
  * this can be either 120000000ul or 48000000ul. See README.md.
  */
-#define VARIANT_MCK                       (48000000ul)
+#define VARIANT_MCK                       (120000000ul)
+//#define VARIANT_MCK                       (48000000ul)
 
 /* The fine calibration value for DFLL open-loop mode is defined here.
  * The coarse calibration value is loaded from NVM OTP (factory calibration values).
@@ -207,19 +201,13 @@
  * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
-#define STRING_MANUFACTURER "MattairTech LLC"
-#if (SAMD21)
-  #define STRING_PRODUCT "MT-D21E Rev B D21"
-#elif (SAML21)
-  #define STRING_PRODUCT "MT-D21E Rev B L21"
-#elif (SAMC21)
-  #define STRING_PRODUCT "MT-D21E Rev B C21"
-#endif
+#define STRING_MANUFACTURER "Fab Foundation"
+#define STRING_PRODUCT "Generic SAMD51G"
 
 /* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
-#define USB_PID_HIGH   0x05
+#define USB_PID_HIGH   0x75
 #define USB_PID_LOW    0x57
 
 /* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
@@ -270,9 +258,15 @@
  * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
  * By default, only BOARD_LED is enabled.
  */
-#define BOARD_LED_PORT                    (0)
-#define BOARD_LED_PIN                     (6)
-#define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
+#if defined(SDCARD_ENABLED)
+  #define BOARD_LED_PORT                    (0)
+  #define BOARD_LED_PIN                     (6)
+  #define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#else
+  //#define BOARD_LED_PORT                    (0)
+  //#define BOARD_LED_PIN                     (6)
+  //#define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#endif
 
 //#define BOARD_LEDRX_PORT                  (0)
 //#define BOARD_LEDRX_PIN                   (6)