From 7e4514ee39ccf54da43fbeef491c3885f3892c71 Mon Sep 17 00:00:00 2001 From: Linar Yusupov Date: Tue, 21 May 2024 05:30:15 +0300 Subject: [PATCH] [ESP32-C6/H2] build with Core 3.0-RC3 --- .github/workflows/main.yml | 8 ++++---- software/firmware/source/README.md | 2 +- software/firmware/source/SoftRF/src/platform/ESP32.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf279c6fa..fb4e85c1e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -205,7 +205,7 @@ jobs: #fi if [[ "$BOARD" =~ "esp32:esp32:esp32c6" ]]; then arduino --pref "boardsmanager.additional.urls=https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json" --save-prefs ; - arduino --install-boards esp32:esp32:3.0.0-rc1 ; + arduino --install-boards esp32:esp32:3.0.0-rc3 ; arduino --board $BOARD --save-prefs ; arduino --pref "custom_CPUFreq=esp32c6_80" --save-prefs ; arduino --pref "custom_DebugLevel=esp32c6_none" --save-prefs ; @@ -215,7 +215,7 @@ jobs: arduino --pref "custom_PSRAM=esp32c6_enabled" --save-prefs ; arduino --pref "custom_PartitionScheme=esp32c6_huge_app" --save-prefs ; arduino --pref "custom_UploadSpeed=esp32c6_921600" --save-prefs ; - # cd $HOME/.arduino15/packages/esp32/hardware/esp32/3.0.0-rc1 ; + # cd $HOME/.arduino15/packages/esp32/hardware/esp32/3.0.0-rc3 ; # sed -i "s\echo '-DARDUINO_CORE_BUILD'\echo -DARDUINO_CORE_BUILD\g" platform.txt ; wget https://github.com/h2zero/NimBLE-Arduino/archive/refs/tags/${NIM_BLE_VERSION}.tar.gz ; # wget https://github.com/h2zero/NimBLE-Arduino/archive/refs/heads/${NIM_BLE_VERSION}.tar.gz ; @@ -234,7 +234,7 @@ jobs: #fi if [[ "$BOARD" =~ "esp32:esp32:esp32h2" ]]; then arduino --pref "boardsmanager.additional.urls=https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json" --save-prefs ; - arduino --install-boards esp32:esp32:3.0.0-rc1 ; + arduino --install-boards esp32:esp32:3.0.0-rc3 ; arduino --board $BOARD --save-prefs ; arduino --pref "custom_CPUFreq=esp32h2_80" --save-prefs ; arduino --pref "custom_DebugLevel=esp32h2_none" --save-prefs ; @@ -244,7 +244,7 @@ jobs: arduino --pref "custom_PSRAM=esp32h2_enabled" --save-prefs ; arduino --pref "custom_PartitionScheme=esp32h2_huge_app" --save-prefs ; arduino --pref "custom_UploadSpeed=esp32h2_921600" --save-prefs ; - # cd $HOME/.arduino15/packages/esp32/hardware/esp32/3.0.0-rc1 ; + # cd $HOME/.arduino15/packages/esp32/hardware/esp32/3.0.0-rc3 ; # sed -i "s\echo '-DARDUINO_CORE_BUILD'\echo -DARDUINO_CORE_BUILD\g" platform.txt ; cd $GITHUB_WORKSPACE ; fi diff --git a/software/firmware/source/README.md b/software/firmware/source/README.md index 72fc65fb0..647bc5eb8 100644 --- a/software/firmware/source/README.md +++ b/software/firmware/source/README.md @@ -48,7 +48,7 @@ For **ESP32**:                 [**1.0.5**](https://github.com/espressif/arduino-esp32/releases/tag/1.0.5)
For **ESP32-S3**:           [**2.0.9**](https://github.com/espressif/arduino-esp32/releases/tag/2.0.9)
For **ESP32-C3**:           [**2.0.9**](https://github.com/espressif/arduino-esp32/releases/tag/2.0.9)
- For **ESP32-C6**:           [**3.0.0-alpha3**](https://github.com/espressif/arduino-esp32/releases/tag/3.0.0-alpha3)
+ For **ESP32-C6**:           [**3.0.0-rc3**](https://github.com/espressif/arduino-esp32/releases/tag/3.0.0-rc3)
2. Become familiar with IDE and **DoIt ESP32 DevKit** by building and uploading of a basic **Blink** sketch:
``` int ledPin = 2; // use pin 14 for TTGO T-Beam rev.05 or higher diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.cpp b/software/firmware/source/SoftRF/src/platform/ESP32.cpp index 41231b686..79e1aea85 100644 --- a/software/firmware/source/SoftRF/src/platform/ESP32.cpp +++ b/software/firmware/source/SoftRF/src/platform/ESP32.cpp @@ -2375,7 +2375,7 @@ static void* ESP32_getResetInfoPtr() case TG1WDT_SYS_RESET : reset_info.reason = REASON_WDT_RST; break; #endif /* CONFIG_IDF_TARGET_ESP32C2 */ case RTCWDT_SYS_RESET : reset_info.reason = REASON_WDT_RST; break; -#if !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2) case INTRUSION_RESET : reset_info.reason = REASON_EXCEPTION_RST; break; #endif /* CONFIG_IDF_TARGET_ESP32C6 */ case RTCWDT_CPU_RESET : reset_info.reason = REASON_WDT_RST; break; @@ -2412,7 +2412,7 @@ static String ESP32_getResetInfo() case TG1WDT_SYS_RESET : return F("Timer Group1 Watch dog reset digital core"); #endif /* CONFIG_IDF_TARGET_ESP32C2 */ case RTCWDT_SYS_RESET : return F("RTC Watch dog Reset digital core"); -#if !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2) case INTRUSION_RESET : return F("Instrusion tested to reset CPU"); #endif /* CONFIG_IDF_TARGET_ESP32C6 */ case RTCWDT_CPU_RESET : return F("RTC Watch dog Reset CPU"); @@ -2442,7 +2442,7 @@ static String ESP32_getResetReason() case TG1WDT_SYS_RESET : return F("TG1WDT_SYS_RESET"); #endif /* CONFIG_IDF_TARGET_ESP32C2 */ case RTCWDT_SYS_RESET : return F("RTCWDT_SYS_RESET"); -#if !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2) case INTRUSION_RESET : return F("INTRUSION_RESET"); #endif /* CONFIG_IDF_TARGET_ESP32C6 */ case RTCWDT_CPU_RESET : return F("RTCWDT_CPU_RESET");