Merge branch 'micropython:master' into samd_i2c

Author: ricksorensen

ports/esp32/Makefile

@@ -29,8 +29,12 @@ BUILD ?= build-$(BOARD)
 endif
 
 # Device serial settings.
-PORT ?= /dev/ttyUSB0
-BAUD ?= 460800
+ifneq ($(PORT),)
+PORT_ARG := -p $(PORT)
+endif
+ifneq ($(BAUD),)
+BAUD_ARG := -b $(BAUD)
+endif
 
 PYTHON ?= python3
 
@@ -59,7 +63,7 @@ endif
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
 define RUN_IDF_PY
-	idf.py $(IDFPY_FLAGS) -B $(BUILD) -p $(PORT) -b $(BAUD) $(1)
+	idf.py $(IDFPY_FLAGS) -B $(BUILD) $(PORT_ARG) $(BAUD_ARG) $(1)
 endef
 
 all:

ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c

@@ -35,9 +35,6 @@
 #include "double_tap.h"
 #include "usb.h"
 
-#include "tinyusb.h"
-#include "tusb_cdc_acm.h"
-
 #define LED_RED     GPIO_NUM_46
 #define LED_GREEN   GPIO_NUM_0
 #define LED_BLUE    GPIO_NUM_45
@@ -87,11 +84,6 @@ void NANO_ESP32_enter_bootloader(void) {
     esp_restart();
 }
 
-void NANO_ESP32_usb_callback_line_state_changed(int itf, void *event_in) {
-    cdcacm_event_t *event = event_in;
-    mp_usbd_line_state_cb(itf, event->line_state_changed_data.dtr, event->line_state_changed_data.rts);
-}
-
 void NANO_ESP32_board_startup(void) {
     boardctrl_startup();
 

ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h

@@ -19,14 +19,9 @@
 #define MICROPY_HW_SPI2_SCK                 (18)
 
 #define MICROPY_HW_ENABLE_USBDEV            (1)
-#define MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC (1)
-#define MICROPY_HW_USB_EXTERNAL_TINYUSB     (1)
 #define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
 #define MICROPY_SCHEDULER_STATIC_NODES      (1)
 
-#define MICROPY_HW_USB_CUSTOM_LINE_STATE_CB             NANO_ESP32_usb_callback_line_state_changed
-void NANO_ESP32_usb_callback_line_state_changed(int itf, void *event);
-
 #define MICROPY_BOARD_STARTUP                           NANO_ESP32_board_startup
 void NANO_ESP32_board_startup(void);
 

ports/esp32/boards/ESP32_GENERIC_S3/sdkconfig.board

@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y

ports/esp32/boards/UM_FEATHERS2/sdkconfig.board

@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
 

ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board

@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 # LWIP
 CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS2Neo"

ports/esp32/boards/UM_FEATHERS3/sdkconfig.board

@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=

ports/esp32/boards/UM_NANOS3/sdkconfig.board

@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y

ports/esp32/boards/UM_PROS3/sdkconfig.board

@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=

ports/esp32/boards/UM_TINYS2/sdkconfig.board

@@ -1,6 +1,5 @@
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 # LWIP
 CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyS2"