From 4d62e489926385472088be65f988038eb47490e8 Mon Sep 17 00:00:00 2001 From: Linar Yusupov Date: Thu, 8 Dec 2022 21:15:00 +0300 Subject: [PATCH 1/2] apply the same USB descriptor's iSerialNumber logic for ESP32-S2 as the ESP32-S3 already has --- cores/esp32/USB.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/esp32/USB.cpp b/cores/esp32/USB.cpp index 6174f28d738..5b71255026e 100644 --- a/cores/esp32/USB.cpp +++ b/cores/esp32/USB.cpp @@ -34,7 +34,7 @@ #define USB_PRODUCT ARDUINO_BOARD #endif #ifndef USB_SERIAL -#if CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #define USB_SERIAL "__MAC__" #else #define USB_SERIAL "0" @@ -160,7 +160,7 @@ ESPUSB::~ESPUSB(){ bool ESPUSB::begin(){ if(!_started){ -#if CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 if(serial_number == "__MAC__"){ StreamString s; uint8_t m[6]; From 537dc7ce99a6db7e2528cd85f9f7951ec22ea995 Mon Sep 17 00:00:00 2001 From: Linar Yusupov Date: Sun, 11 Dec 2022 12:37:52 +0300 Subject: [PATCH 2/2] response on request from code reviewer --- cores/esp32/USB.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp32/USB.cpp b/cores/esp32/USB.cpp index 5b71255026e..d82659ebbcf 100644 --- a/cores/esp32/USB.cpp +++ b/cores/esp32/USB.cpp @@ -34,7 +34,7 @@ #define USB_PRODUCT ARDUINO_BOARD #endif #ifndef USB_SERIAL -#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32S3 #define USB_SERIAL "__MAC__" #else #define USB_SERIAL "0"