Skip to content

Commit c7c7695

Browse files
authored
Merge pull request #2 from espressif/esp32s2
update 6 de julio Esp32s2
2 parents 2d7ec30 + ea04207 commit c7c7695

File tree

308 files changed

+3945
-950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+3945
-950
lines changed

CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ set(CORE_SRCS
1515
cores/esp32/esp32-hal-spi.c
1616
cores/esp32/esp32-hal-time.c
1717
cores/esp32/esp32-hal-timer.c
18+
cores/esp32/esp32-hal-tinyusb.c
1819
cores/esp32/esp32-hal-touch.c
1920
cores/esp32/esp32-hal-uart.c
2021
cores/esp32/esp32-hal-rmt.c
@@ -60,6 +61,8 @@ set(LIBRARY_SRCS
6061
libraries/SPI/src/SPI.cpp
6162
libraries/Ticker/src/Ticker.cpp
6263
libraries/Update/src/Updater.cpp
64+
libraries/USB/src/USB.cpp
65+
libraries/USB/src/USBCDC.cpp
6366
libraries/WebServer/src/WebServer.cpp
6467
libraries/WebServer/src/Parsing.cpp
6568
libraries/WebServer/src/detail/mimetable.cpp
@@ -149,3 +152,9 @@ set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support openssl b
149152

150153
idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})
151154

155+
if(IDF_TARGET STREQUAL "esp32")
156+
target_compile_options(${COMPONENT_TARGET} PUBLIC -DARDUINO=10812 -DARDUINO_ESP32_DEV -DARDUINO_ARCH_ESP32 -DARDUINO_BOARD="ESP32_DEV" -DARDUINO_VARIANT="esp32" -DESP32)
157+
endif()
158+
if(IDF_TARGET STREQUAL "esp32s2")
159+
target_compile_options(${COMPONENT_TARGET} PUBLIC -DARDUINO=10812 -DARDUINO_ESP32S2_DEV -DARDUINO_ARCH_ESP32 -DARDUINO_BOARD="ESP32S2_DEV" -DARDUINO_VARIANT="esp32s2" -DESP32)
160+
endif()

boards.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,18 @@ esp32s2.build.defines=
3939
esp32s2.menu.UploadMode.default=Default Uart
4040
esp32s2.menu.UploadMode.default.upload.flags=
4141
esp32s2.menu.UploadMode.default.upload.tool=esptool_py
42+
esp32s2.menu.UploadMode.default.serial.disableDTR=true
43+
esp32s2.menu.UploadMode.default.serial.disableRTS=true
4244
esp32s2.menu.UploadMode.cdc=USB CDC
4345
esp32s2.menu.UploadMode.cdc.upload.flags=--no-stub
4446
esp32s2.menu.UploadMode.cdc.upload.tool=esptool_py
47+
esp32s2.menu.UploadMode.cdc.serial.disableDTR=false
48+
esp32s2.menu.UploadMode.cdc.serial.disableRTS=false
4549
#esp32s2.menu.UploadMode.dfu=USB DFU
4650
#esp32s2.menu.UploadMode.dfu.upload.flags=
4751
#esp32s2.menu.UploadMode.dfu.upload.tool=dfu_util
52+
#esp32s2.menu.UploadMode.dfu.serial.disableDTR=false
53+
#esp32s2.menu.UploadMode.dfu.serial.disableRTS=false
4854

4955
esp32s2.menu.PSRAM.disabled=Disabled
5056
esp32s2.menu.PSRAM.disabled.build.defines=

cores/esp32/esp32-hal-gpio.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,11 +344,15 @@ extern void __attachInterruptFunctionalArg(uint8_t pin, voidFuncPtrArg userFunc,
344344
__pinInterruptHandlers[pin].functional = functional;
345345

346346
esp_intr_disable(gpio_intr_handle);
347+
#if CONFIG_IDF_TARGET_ESP32
347348
if(esp_intr_get_cpu(gpio_intr_handle)) { //APP_CPU
349+
#endif
348350
GPIO.pin[pin].int_ena = 1;
351+
#if CONFIG_IDF_TARGET_ESP32
349352
} else { //PRO_CPU
350353
GPIO.pin[pin].int_ena = 4;
351354
}
355+
#endif
352356
GPIO.pin[pin].int_type = intr_type;
353357
esp_intr_enable(gpio_intr_handle);
354358
}

0 commit comments

Comments
 (0)