Merge remote-tracking branch 'adafruit/main' into renode

Author: tannewt

.gitmodules

@@ -383,3 +383,6 @@
 [submodule "frozen/Adafruit_CircuitPython_SHT4x"]
 	path = frozen/Adafruit_CircuitPython_SHT4x
 	url = https://github.com/adafruit/Adafruit_CircuitPython_SHT4x
+[submodule "frozen/Adafruit_CircuitPython_Bitmap_Font"]
+	path = frozen/Adafruit_CircuitPython_Bitmap_Font
+	url = https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font

frozen/Adafruit_CircuitPython_Bitmap_Font

@@ -114,11 +114,11 @@
 #include "supervisor/shared/status_bar.h"
 #endif
 
-#if CIRCUITPY_USB && CIRCUITPY_USB_HID
+#if CIRCUITPY_USB_DEVICE && CIRCUITPY_USB_HID
 #include "shared-module/usb_hid/__init__.h"
 #endif
 
-#if CIRCUITPY_USB
+#if CIRCUITPY_USB_DEVICE
 #include "supervisor/usb.h"
 #endif
 
@@ -239,7 +239,7 @@ STATIC void stop_mp(void) {
 
     background_callback_reset();
 
-    #if CIRCUITPY_USB
+    #if CIRCUITPY_TINYUSB
     usb_background();
     #endif
 
@@ -469,7 +469,7 @@ STATIC bool __attribute__((noinline)) run_code_py(safe_mode_t safe_mode, bool *s
 
         start_mp(safe_mode);
 
-        #if CIRCUITPY_USB
+        #if CIRCUITPY_USB_DEVICE
         usb_setup_with_vm();
         #endif
 
@@ -848,7 +848,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
 
     start_mp(safe_mode);
 
-    #if CIRCUITPY_USB
+    #if CIRCUITPY_USB_DEVICE
     // Set up default USB values after boot.py VM starts but before running boot.py.
     usb_set_defaults();
     #endif
@@ -933,7 +933,7 @@ STATIC int run_repl(safe_mode_t safe_mode) {
 
     start_mp(safe_mode);
 
-    #if CIRCUITPY_USB
+    #if CIRCUITPY_USB_DEVICE
     usb_setup_with_vm();
     #endif
 
@@ -1081,7 +1081,7 @@ int __attribute__((used)) main(void) {
     // By default our internal flash is readonly to local python code and
     // writable over USB. Set it here so that safemode.py or boot.py can change it.
     filesystem_set_internal_concurrent_write_protection(true);
-    filesystem_set_internal_writable_by_usb(CIRCUITPY_USB == 1);
+    filesystem_set_internal_writable_by_usb(CIRCUITPY_USB_DEVICE == 1);
 
     #if CIRCUITPY_SAFEMODE_PY
     // Run safemode.py if we ARE in safe mode.
@@ -1163,7 +1163,7 @@ void gc_collect(void) {
     common_hal_bleio_gc_collect();
     #endif
 
-    #if CIRCUITPY_USB && CIRCUITPY_USB_HID
+    #if CIRCUITPY_USB_DEVICE && CIRCUITPY_USB_HID
     usb_hid_gc_collect();
     #endif
 

lib/tinyusb

@@ -52,7 +52,7 @@ void reset_all_pins(void) {
     uint32_t pin_mask[PORT_COUNT] = PORT_OUT_IMPLEMENTED;
 
     // Do not full reset USB lines.
-    #if CIRCUITPY_USB
+    #if CIRCUITPY_USB_DEVICE
     pin_mask[0] &= ~(PORT_PA24 | PORT_PA25);
     #endif
 

main.c

@@ -260,22 +260,34 @@ LIBS += -lm
 endif
 
 # TinyUSB defines
-ifeq ($(CIRCUITPY_USB),1)
-ifeq ($(IDF_TARGET),esp32s2)
+# Always add these because we might be doing host.
+ifeq ($(IDF_TARGET),esp32)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32
+else ifeq ($(IDF_TARGET),esp32c3)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32C3
+else ifeq ($(IDF_TARGET),esp32c6)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32C6
+else ifeq ($(IDF_TARGET),esp32h2)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32H2
+else ifeq ($(IDF_TARGET),esp32s2)
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32S2
 else ifeq ($(IDF_TARGET),esp32s3)
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32S3
 endif
+ifeq ($(CIRCUITPY_TINYUSB),1)
 CFLAGS += \
 	-DCFG_TUSB_OS=OPT_OS_FREERTOS \
+	-DCFG_TUD_TASK_QUEUE_SZ=32
+endif
+ifeq ($(CIRCUITPY_USB_DEVICE),1)
+CFLAGS += \
 	-DCFG_TUD_CDC_RX_BUFSIZE=1024 \
 	-DCFG_TUD_CDC_TX_BUFSIZE=1024 \
 	-DCFG_TUD_MSC_BUFSIZE=4096 \
 	-DCFG_TUD_MIDI_RX_BUFSIZE=128 \
 	-DCFG_TUD_MIDI_TX_BUFSIZE=128 \
 	-DCFG_TUD_VENDOR_RX_BUFSIZE=128 \
-	-DCFG_TUD_VENDOR_TX_BUFSIZE=128 \
-	-DCFG_TUD_TASK_QUEUE_SZ=32
+	-DCFG_TUD_VENDOR_TX_BUFSIZE=128
 endif
 
 ######################################
@@ -303,7 +315,7 @@ ifneq ($(CIRCUITPY_TOUCHIO_USE_NATIVE),0)
 SRC_C += peripherals/touch.c
 endif
 
-ifneq ($(CIRCUITPY_USB),0)
+ifneq ($(CIRCUITPY_USB_DEVICE),0)
 SRC_C += lib/tinyusb/src/portable/espressif/esp32sx/dcd_esp32sx.c
 endif
 
@@ -390,7 +402,7 @@ TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults
 ifeq ($(CIRCUITPY_ESP_FLASH_SIZE), 2MB)
 	FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE)-no-ota-no-uf2.defaults
 else
-UF2_BOOTLOADER ?= $(CIRCUITPY_USB)
+UF2_BOOTLOADER ?= $(CIRCUITPY_USB_DEVICE)
 ifeq ($(UF2_BOOTLOADER), 1)
 	FLASH_SIZE_SDKCONFIG ?= esp-idf-config/sdkconfig-flash-$(CIRCUITPY_ESP_FLASH_SIZE).defaults
 else
@@ -503,7 +515,7 @@ endif
 ifneq ($(CIRCUITPY_PARALLELDISPLAYBUS),0)
 	ESP_IDF_COMPONENTS_LINK += esp_lcd
 endif
-ifneq ($(CIRCUITPY_USB),0)
+ifneq ($(CIRCUITPY_USB_DEVICE),0)
 	ESP_IDF_COMPONENTS_LINK += usb
 endif
 

ports/atmel-samd/common-hal/microcontroller/Pin.c

@@ -26,5 +26,3 @@ CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_ROTARYIO = 0
-
-OPTIMIZATION_FLAGS = -Os

ports/espressif/Makefile

@@ -16,5 +16,3 @@ CIRCUITPY_ESP_PSRAM_FREQ = 80m
 
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
-
-OPTIMIZATION_FLAGS = -Os

ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk

@@ -10,7 +10,6 @@ CIRCUITPY_ESP_FLASH_MODE = qio
 CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
-OPTIMIZATION_FLAGS = -Os
 CIRCUITPY_ESPCAMERA = 0
 CIRCUITPY_PARALLELDISPLAYBUS = 0
 

ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk

@@ -13,7 +13,6 @@ CIRCUITPY_ESP_PSRAM_SIZE = 2MB
 CIRCUITPY_ESP_PSRAM_MODE = qio
 CIRCUITPY_ESP_PSRAM_FREQ = 80m
 
-OPTIMIZATION_FLAGS = -Os
 CIRCUITPY_ESPCAMERA = 0
 # Not enough pins.
 CIRCUITPY_PARALLELDISPLAYBUS = 0