Skip to content

Update Esp32s2 - 3 Jul #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jul 6, 2020
Merged

Update Esp32s2 - 3 Jul #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
11cad87
Fixing static IP configuration so it doesn't get overwritten by DHCP …
atanisoft Jun 22, 2020
a1bd429
Fix GPIO Interrupts
me-no-dev Jun 22, 2020
ca7ed86
Update TinyUSB Lib
me-no-dev Jun 28, 2020
bd96f7f
Update IDF Libs
me-no-dev Jun 28, 2020
be074ee
Add TinyUSB HAL and CDC
me-no-dev Jun 29, 2020
7d50114
Add files to cmakelists and disconnect CDC if unplugged
me-no-dev Jun 29, 2020
acadabb
Update CMakeLists.txt
me-no-dev Jun 29, 2020
096af05
Fix DTR/RTS state for ESP32S2 native USB
me-no-dev Jun 29, 2020
f13f84d
Fix compilation issues
me-no-dev Jun 29, 2020
7f61d20
Update libtinyusb.a
me-no-dev Jun 29, 2020
46bde99
Update USBCDC.cpp
me-no-dev Jun 30, 2020
b8fcea9
Update TinyUSB
me-no-dev Jul 1, 2020
2e19d27
Change driver attach api and remove DFU from CDC
me-no-dev Jul 1, 2020
e06f9b7
Handle persistent reboot better in CDC
me-no-dev Jul 2, 2020
ea04207
Add debug output to CDC
me-no-dev Jul 2, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ set(CORE_SRCS
cores/esp32/esp32-hal-spi.c
cores/esp32/esp32-hal-time.c
cores/esp32/esp32-hal-timer.c
cores/esp32/esp32-hal-tinyusb.c
cores/esp32/esp32-hal-touch.c
cores/esp32/esp32-hal-uart.c
cores/esp32/esp32-hal-rmt.c
Expand Down Expand Up @@ -60,6 +61,8 @@ set(LIBRARY_SRCS
libraries/SPI/src/SPI.cpp
libraries/Ticker/src/Ticker.cpp
libraries/Update/src/Updater.cpp
libraries/USB/src/USB.cpp
libraries/USB/src/USBCDC.cpp
libraries/WebServer/src/WebServer.cpp
libraries/WebServer/src/Parsing.cpp
libraries/WebServer/src/detail/mimetable.cpp
Expand Down Expand Up @@ -149,3 +152,9 @@ set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support openssl b

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

if(IDF_TARGET STREQUAL "esp32")
target_compile_options(${COMPONENT_TARGET} PUBLIC -DARDUINO=10812 -DARDUINO_ESP32_DEV -DARDUINO_ARCH_ESP32 -DARDUINO_BOARD="ESP32_DEV" -DARDUINO_VARIANT="esp32" -DESP32)
endif()
if(IDF_TARGET STREQUAL "esp32s2")
target_compile_options(${COMPONENT_TARGET} PUBLIC -DARDUINO=10812 -DARDUINO_ESP32S2_DEV -DARDUINO_ARCH_ESP32 -DARDUINO_BOARD="ESP32S2_DEV" -DARDUINO_VARIANT="esp32s2" -DESP32)
endif()
6 changes: 6 additions & 0 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,18 @@ esp32s2.build.defines=
esp32s2.menu.UploadMode.default=Default Uart
esp32s2.menu.UploadMode.default.upload.flags=
esp32s2.menu.UploadMode.default.upload.tool=esptool_py
esp32s2.menu.UploadMode.default.serial.disableDTR=true
esp32s2.menu.UploadMode.default.serial.disableRTS=true
esp32s2.menu.UploadMode.cdc=USB CDC
esp32s2.menu.UploadMode.cdc.upload.flags=--no-stub
esp32s2.menu.UploadMode.cdc.upload.tool=esptool_py
esp32s2.menu.UploadMode.cdc.serial.disableDTR=false
esp32s2.menu.UploadMode.cdc.serial.disableRTS=false
#esp32s2.menu.UploadMode.dfu=USB DFU
#esp32s2.menu.UploadMode.dfu.upload.flags=
#esp32s2.menu.UploadMode.dfu.upload.tool=dfu_util
#esp32s2.menu.UploadMode.dfu.serial.disableDTR=false
#esp32s2.menu.UploadMode.dfu.serial.disableRTS=false

esp32s2.menu.PSRAM.disabled=Disabled
esp32s2.menu.PSRAM.disabled.build.defines=
Expand Down
4 changes: 4 additions & 0 deletions cores/esp32/esp32-hal-gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,15 @@ extern void __attachInterruptFunctionalArg(uint8_t pin, voidFuncPtrArg userFunc,
__pinInterruptHandlers[pin].functional = functional;

esp_intr_disable(gpio_intr_handle);
#if CONFIG_IDF_TARGET_ESP32
if(esp_intr_get_cpu(gpio_intr_handle)) { //APP_CPU
#endif
GPIO.pin[pin].int_ena = 1;
#if CONFIG_IDF_TARGET_ESP32
} else { //PRO_CPU
GPIO.pin[pin].int_ena = 4;
}
#endif
GPIO.pin[pin].int_type = intr_type;
esp_intr_enable(gpio_intr_handle);
}
Expand Down
Loading