Move atmel-samd to tinyusb and support nRF flash.

.gitmodules

@@ -78,7 +78,7 @@
 	url = https://github.com/adafruit/nrfx.git
 [submodule "lib/tinyusb"]
 	path = lib/tinyusb
-	url = https://github.com/hathach/tinyusb.git
+	url = https://github.com/tannewt/tinyusb.git
 	branch = develop
 [submodule "tools/huffman"]
 	path = tools/huffman

main.c

@@ -51,6 +51,7 @@
 #include "supervisor/shared/autoreload.h"
 #include "supervisor/shared/translate.h"
 #include "supervisor/shared/rgb_led_status.h"
+#include "supervisor/shared/status_leds.h"
 #include "supervisor/shared/stack.h"
 #include "supervisor/serial.h"
 
@@ -388,6 +389,8 @@ int __attribute__((used)) main(void) {
     // initialise the cpu and peripherals
     safe_mode_t safe_mode = port_init();
 
+    // Turn on LEDs
+    init_status_leds();
     rgb_led_status_init();
 
     stack_init();

ports/atmel-samd/Makefile

@@ -45,16 +45,13 @@ INC += -I. \
        -Iasf4/$(CHIP_FAMILY)/hpl/tc \
        -Iasf4/$(CHIP_FAMILY)/include \
        -Iasf4/$(CHIP_FAMILY)/CMSIS/Include \
-       -Iasf4/$(CHIP_FAMILY)/usb \
-       -Iasf4/$(CHIP_FAMILY)/usb/class/cdc \
-       -Iasf4/$(CHIP_FAMILY)/usb/class/hid \
-       -Iasf4/$(CHIP_FAMILY)/usb/class/msc \
-       -Iasf4/$(CHIP_FAMILY)/usb/device \
        -Iasf4_conf/$(CHIP_FAMILY) \
        -Iboards/$(BOARD) \
        -Iboards/ \
        -Iperipherals/ \
        -Ifreetouch \
+       -I../../lib/tinyusb/src \
+       -I../../supervisor/shared/usb \
        -I$(BUILD)
 
 BASE_CFLAGS = \
@@ -90,11 +87,15 @@ BASE_CFLAGS = \
 # NDEBUG disables assert() statements. This reduces code size pretty dramatically, per tannewt.
 
 ifeq ($(CHIP_FAMILY), samd21)
-CFLAGS = -Os -DNDEBUG
+CFLAGS += -Os -DNDEBUG
+# TinyUSB defines
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_SAMD21 -DCFG_TUD_CDC_RX_BUFSIZE=128 -DCFG_TUD_CDC_TX_BUFSIZE=128 -DCFG_TUD_MSC_BUFSIZE=512
 endif
 
 ifeq ($(CHIP_FAMILY), samd51)
-CFLAGS = -Os -DNDEBUG
+CFLAGS += -O0 -DNDEBUG
+# TinyUSB defines
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_SAMD51 -DCFG_TUD_CDC_RX_BUFSIZE=256 -DCFG_TUD_CDC_TX_BUFSIZE=256 -DCFG_TUD_MSC_BUFSIZE=1024
 endif
 
 #Debugging/Optimization
@@ -104,7 +105,7 @@ ifeq ($(DEBUG), 1)
   # You may want to disable -flto if it interferes with debugging.
   CFLAGS += -flto
   # You may want to enable these flags to make setting breakpoints easier.
-##   CFLAGS += -fno-inline -fno-ipa-sra
+  # CFLAGS += -fno-inline -fno-ipa-sra
   ifeq ($(CHIP_FAMILY), samd21)
     CFLAGS += -DENABLE_MICRO_TRACE_BUFFER
   endif
@@ -204,7 +205,6 @@ SRC_ASF := \
 	hal/src/hal_spi_m_sync.c \
 	hal/src/hal_timer.c \
 	hal/src/hal_usart_async.c \
-	hal/src/hal_usb_device.c \
 	hpl/adc/hpl_adc.c \
 	hpl/core/hpl_init.c \
 	hpl/dac/hpl_dac.c \
@@ -214,12 +214,6 @@ SRC_ASF := \
 	hpl/rtc/hpl_rtc.c \
 	hpl/sercom/hpl_sercom.c \
 	hpl/systick/hpl_systick.c \
-	hpl/usb/hpl_usb.c \
-	usb/class/cdc/device/cdcdf_acm.c \
-	usb/class/hid/device/hiddf_generic.c \
-	usb/class/msc/device/mscdf.c \
-	usb/device/usbdc.c \
-	usb/usb_protocol.c \
 	hal/utils/src/utils_list.c \
 	hal/utils/src/utils_ringbuffer.c \
 
@@ -246,7 +240,6 @@ SRC_C = \
 	board_busses.c \
 	background.c \
 	fatfs_port.c \
-	flash_api.c \
 	mphalport.c \
 	reset.c \
 	peripherals/samd/clocks.c \
@@ -265,15 +258,15 @@ SRC_C = \
 	peripherals/samd/$(CHIP_FAMILY)/sercom.c \
 	peripherals/samd/$(CHIP_FAMILY)/timers.c \
 	tick.c \
-	usb.c \
-	usb_mass_storage.c \
 	bindings/samd/__init__.c \
 	bindings/samd/Clock.c \
 	boards/$(BOARD)/board.c \
 	boards/$(BOARD)/pins.c \
 	lib/oofatfs/ff.c \
 	lib/oofatfs/option/ccsbcs.c \
 	lib/timeutils/timeutils.c \
+	lib/tinyusb/src/portable/microchip/$(CHIP_FAMILY)/dcd.c \
+	lib/tinyusb/src/portable/microchip/$(CHIP_FAMILY)/hal.c \
 	lib/utils/buffer_helper.c \
 	lib/utils/context_manager_helpers.c \
 	lib/utils/interrupt_char.c \
@@ -282,7 +275,6 @@ SRC_C = \
 	lib/utils/sys_stdio_mphal.c \
 	lib/libc/string0.c \
 	lib/mp-readline/readline.c \
-	$(BUILD)/autogen_usb_descriptor.c \
 	freetouch/adafruit_ptc.c \
 	supervisor/shared/memory.c
 
@@ -306,19 +298,6 @@ SRC_MOD += $(addprefix $(WIZNET5K_DIR)/,\
 endif # MICROPY_PY_WIZNET5K
 endif # MICROPY_PY_NETWORK
 
-# Choose which flash filesystem impl to use.
-# (Right now INTERNAL_FLASH_FILESYSTEM and SPI_FLASH_FILESYSTEM are mutually exclusive.
-# But that might not be true in the future.)
-ifeq ($(INTERNAL_FLASH_FILESYSTEM),1)
-SRC_C += internal_flash.c
-endif
-ifeq ($(SPI_FLASH_FILESYSTEM),1)
-SRC_C += external_flash/external_flash.c external_flash/spi_flash.c
-endif
-ifeq ($(QSPI_FLASH_FILESYSTEM),1)
-SRC_C += external_flash/external_flash.c external_flash/qspi_flash.c
-endif
-
 SRC_COMMON_HAL = \
 	board/__init__.c \
 	busio/__init__.c \
@@ -339,7 +318,6 @@ SRC_COMMON_HAL = \
 	rotaryio/IncrementalEncoder.c \
 	rtc/__init__.c \
 	rtc/RTC.c \
-	storage/__init__.c \
 	supervisor/__init__.c \
 	supervisor/Runtime.c \
 	time/__init__.c \
@@ -352,10 +330,8 @@ SRC_COMMON_HAL = \
 	pulseio/PulseIn.c \
 	pulseio/PulseOut.c \
 	pulseio/PWMOut.c \
-	usb_hid/__init__.c \
-	usb_hid/Device.c \
 	touchio/__init__.c \
-	touchio/TouchIn.c \
+	touchio/TouchIn.c
 
 ifeq ($(INTERNAL_LIBM),1)
 SRC_LIBM = $(addprefix lib/,\
@@ -412,12 +388,17 @@ SRC_SHARED_MODULE = \
 	_stage/__init__.c \
 	_stage/Layer.c \
 	_stage/Text.c \
+	storage/__init__.c \
 	os/__init__.c \
 	random/__init__.c \
-	storage/__init__.c \
 	struct/__init__.c \
 	uheap/__init__.c \
-	ustack/__init__.c
+	ustack/__init__.c \
+	usb_hid/__init__.c \
+	usb_hid/Device.c
+
+	# usb_midi/__init__.c
+	# usb_midi/Port.c
 
 ifeq ($(MICROPY_PY_NETWORK),1)
 SRC_SHARED_MODULE += socket/__init__.c network/__init__.c
@@ -489,21 +470,6 @@ $(BUILD)/firmware.uf2: $(BUILD)/firmware.bin
 	$(STEPECHO) "Create $@"
 	$(Q)$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -b $(BOOTLOADER_SIZE) -c -o $@ $^
 
-$(BUILD)/autogen_usb_descriptor.c $(BUILD)/genhdr/autogen_usb_descriptor.h: autogen_usb_descriptor.intermediate
-
-.INTERMEDIATE: autogen_usb_descriptor.intermediate
-
-autogen_usb_descriptor.intermediate: tools/gen_usb_descriptor.py Makefile | $(HEADER_BUILD)
-	$(STEPECHO) "GEN $@"
-	$(Q)install -d $(BUILD)/genhdr
-	$(Q)$(PYTHON3) tools/gen_usb_descriptor.py \
-		--manufacturer $(USB_MANUFACTURER)\
-		--product $(USB_PRODUCT)\
-		--vid $(USB_VID)\
-		--pid $(USB_PID)\
-		--output_c_file $(BUILD)/autogen_usb_descriptor.c\
-		--output_h_file $(BUILD)/genhdr/autogen_usb_descriptor.h
-
 deploy: $(BUILD)/firmware.bin
 	$(ECHO) "Writing $< to the board"
 	$(BOSSAC) -u $<

ports/atmel-samd/background.c

@@ -27,8 +27,7 @@
 
 #include "audio_dma.h"
 #include "tick.h"
-#include "usb.h"
-#include "usb_mass_storage.h"
+#include "supervisor/usb.h"
 
 #include "shared-module/displayio/__init__.h"
 #include "shared-module/network/__init__.h"
@@ -45,8 +44,8 @@ void run_background_tasks(void) {
     #if MICROPY_PY_NETWORK
     network_module_background();
     #endif
-    usb_msc_background();
-    usb_cdc_background();
+    usb_background();
+
     last_finished_tick = ticks_ms;
 }
 

ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.h

@@ -1,12 +1,10 @@
 #define MICROPY_HW_BOARD_NAME "Arduino MKR1300"
 #define MICROPY_HW_MCU_NAME "samd21g18"
 
-#define MICROPY_PORT_A        (PORT_PA24 | PORT_PA25)
+#define MICROPY_PORT_A        (0)
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
-#include "internal_flash.h"
-
 #define CIRCUITPY_INTERNAL_NVM_SIZE 0
 
 #define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)

ports/atmel-samd/boards/arduino_zero/board.c

@@ -30,13 +30,6 @@
 
 void board_init(void)
 {
-    gpio_set_pin_function(MICROPY_HW_LED_TX, GPIO_PIN_FUNCTION_OFF);
-    gpio_set_pin_direction(MICROPY_HW_LED_TX, GPIO_DIRECTION_OUT);
-    gpio_set_pin_level(MICROPY_HW_LED_TX, true);
-
-    gpio_set_pin_function(MICROPY_HW_LED_RX, GPIO_PIN_FUNCTION_OFF);
-    gpio_set_pin_direction(MICROPY_HW_LED_RX, GPIO_DIRECTION_OUT);
-    gpio_set_pin_level(MICROPY_HW_LED_RX, true);
 }
 
 bool board_requests_safe_mode(void) {

ports/atmel-samd/boards/arduino_zero/mpconfigboard.h

@@ -1,16 +1,14 @@
 #define MICROPY_HW_BOARD_NAME "Arduino Zero"
 #define MICROPY_HW_MCU_NAME "samd21g18"
 
-// #define MICROPY_HW_LED_MSC  PIN_PA17 // red
-#define MICROPY_HW_LED_TX   PIN_PA27
-#define MICROPY_HW_LED_RX   PIN_PB03
+// #define MICROPY_HW_LED_MSC  &pin_PA17 // red
+#define MICROPY_HW_LED_TX   &pin_PA27
+#define MICROPY_HW_LED_RX   &pin_PB03
 
-#define MICROPY_PORT_A        (PORT_PA24 | PORT_PA25 | PORT_PA27)
+#define MICROPY_PORT_A        (PORT_PA27)
 #define MICROPY_PORT_B        (PORT_PB03)
 #define MICROPY_PORT_C        (0)
 
-#include "internal_flash.h"
-
 #define CIRCUITPY_INTERNAL_NVM_SIZE 0
 
 #define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)

ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h

@@ -8,52 +8,24 @@
 #define SPI_FLASH_BAUDRATE  (8000000)
 
 // On-board flash
-#define SPI_FLASH_MOSI_PIN          PIN_PA20
-#define SPI_FLASH_MISO_PIN          PIN_PA16
-#define SPI_FLASH_SCK_PIN           PIN_PA21
-#define SPI_FLASH_CS_PIN            PIN_PB22
-
-#define SPI_FLASH_MOSI_PIN_FUNCTION PINMUX_PA20D_SERCOM3_PAD2
-#define SPI_FLASH_MISO_PIN_FUNCTION PINMUX_PA16D_SERCOM3_PAD0
-#define SPI_FLASH_SCK_PIN_FUNCTION  PINMUX_PA21D_SERCOM3_PAD3
-#define SPI_FLASH_SERCOM            SERCOM3
-#define SPI_FLASH_SERCOM_INDEX      3
-#define SPI_FLASH_MOSI_PAD          2
-#define SPI_FLASH_MISO_PAD          0
-#define SPI_FLASH_SCK_PAD           3
-
-// <o> Transmit Data Pinout
-// <0x0=>PAD[0,1]_DO_SCK
-// <0x1=>PAD[2,3]_DO_SCK
-// <0x2=>PAD[3,1]_DO_SCK
-// <0x3=>PAD[0,3]_DO_SCK
-#define SPI_FLASH_DOPO              1
-#define SPI_FLASH_DIPO              0    // same as MISO PAD
+#define SPI_FLASH_MOSI_PIN          &pin_PA20
+#define SPI_FLASH_MISO_PIN          &pin_PA16
+#define SPI_FLASH_SCK_PIN           &pin_PA21
+#define SPI_FLASH_CS_PIN            &pin_PB22
 
 // These are pins not to reset.
-// PA24 and PA25 are USB.
-#define MICROPY_PORT_A        (PORT_PA16 | PORT_PA20 | PORT_PA21 | PORT_PA24 | PORT_PA25)
-#define MICROPY_PORT_B        (PORT_PB22)
+#define MICROPY_PORT_A        (0)
+#define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)
 
 #define SPEAKER_ENABLE_PIN    (&pin_PA30)
 
-#include "external_flash/devices.h"
-
 // If you change this, then make sure to update the linker scripts as well to
 // make sure you don't overwrite code.
 #define CIRCUITPY_INTERNAL_NVM_SIZE 256
 
 #define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
 
-#include "external_flash/devices.h"
-
-#define EXTERNAL_FLASH_DEVICE_COUNT 2
-#define EXTERNAL_FLASH_DEVICES S25FL216K, \
-                               GD25Q16C
-
-#include "external_flash/external_flash.h"
-
 #define CALIBRATE_CRYSTALLESS 1
 
 // Explanation of how a user got into safe mode.

ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk

@@ -5,6 +5,8 @@ USB_PRODUCT = "CircuitPlayground Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
 SPI_FLASH_FILESYSTEM = 1
+EXTERNAL_FLASH_DEVICE_COUNT = 2
+EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ
 
 CHIP_VARIANT = SAMD21G18A