summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Leech <andrew.leech@planetinnovation.com.au>2024-09-24 11:35:53 +1000
committerDamien George <damien@micropython.org>2024-10-07 11:06:57 +1100
commit11bc7d0fc1074b01aaddc325209a281ee9acbba4 (patch)
tree9c0423f95c3ca92a72834430d210aa5485dcee6c
parent386771e052cd0396031705f22bd2ecab5cc30ea5 (diff)
esp32/boards: Update ARDUINO_NANO_ESP32 USB configuration.
The custom line state handling is no longer needed as MicroPython runs it directly now. Signed-off-by: Andrew Leech <andrew@alelec.net>
-rw-r--r--ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c8
-rw-r--r--ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h5
2 files changed, 0 insertions, 13 deletions
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c b/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c
index 69a414cd5..3394bb1e2 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/board_init.c
+++ b/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();
diff --git a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h b/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
index 8c2aa88e9..31b2a49bf 100644
--- a/ports/esp32/boards/ARDUINO_NANO_ESP32/mpconfigboard.h
+++ b/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);