From 7a721ddf3c6a271066659731ee81b726d5913e30 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 21 Feb 2025 23:28:26 +0000 Subject: [PATCH 01/12] Replaced repositories links --- tools/config.sh | 2 +- tools/docker/Dockerfile | 2 +- tools/update-components.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/config.sh b/tools/config.sh index 79d4feef5..e5cf87f42 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -25,7 +25,7 @@ if [ -z $IDF_TARGET ]; then fi # Owner of the target ESP32 Arduino repository -AR_USER="${GITHUB_REPOSITORY_OWNER:-espressif}" +AR_USER="${GITHUB_REPOSITORY_OWNER:-reykada}" # The full name of the repository AR_REPO="$AR_USER/arduino-esp32" diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 699f0bd8e..958227241 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -46,7 +46,7 @@ RUN : \ # Use LIBBUILDER_CLONE_SHALLOW=1 to peform shallow clone (i.e. --depth=1 --shallow-submodules) # Use LIBBUILDER_CLONE_SHALLOW_DEPTH=X to define the depth if LIBBUILDER_CLONE_SHALLOW is used (i.e. --depth=X) -ARG LIBBUILDER_CLONE_URL=https://github.com/espressif/esp32-arduino-lib-builder +ARG LIBBUILDER_CLONE_URL=https://github.com/reykada/esp32-arduino-lib-builder ARG LIBBUILDER_CLONE_BRANCH_OR_TAG=master ARG LIBBUILDER_CHECKOUT_REF= ARG LIBBUILDER_CLONE_SHALLOW= diff --git a/tools/update-components.sh b/tools/update-components.sh index 298783c74..3eeac16e4 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -6,7 +6,7 @@ source ./tools/config.sh # CLONE/UPDATE TINYUSB # echo "Updating TinyUSB..." -TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git" +TINYUSB_REPO_URL="https://github.com/reykada/tinyusb.git" TINYUSB_REPO_DIR="$AR_COMPS/arduino_tinyusb/tinyusb" if [ ! -d "$TINYUSB_REPO_DIR" ]; then git clone "$TINYUSB_REPO_URL" "$TINYUSB_REPO_DIR" From bb3ee3bcf583e40e214e71448259557bbd545ed0 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 22 Feb 2025 12:10:42 +0000 Subject: [PATCH 02/12] gitattributes --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..081b5c786 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +* text=auto +*.sh eol=lf +*.cpp eol=lf +*.h eol=lf \ No newline at end of file From bbd8bda514948808718a471231dd58c57c09fd40 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 22 Feb 2025 13:53:40 +0000 Subject: [PATCH 03/12] IDF repo username --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index e5cf87f42..a0df42e81 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -29,7 +29,7 @@ AR_USER="${GITHUB_REPOSITORY_OWNER:-reykada}" # The full name of the repository AR_REPO="$AR_USER/arduino-esp32" -IDF_REPO="$AR_USER/esp-idf" +IDF_REPO="espressif/esp-idf" AR_LIBS_REPO="$AR_USER/esp32-arduino-lib-builder" AR_REPO_URL="https://github.com/$AR_REPO.git" From b1767a83cc8a857b6b4d014db61afeb827fbefbf Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 22 Feb 2025 14:00:19 +0000 Subject: [PATCH 04/12] Default build variants in the menu --- configs/builds.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/builds.json b/configs/builds.json index ddfb8e4f8..c7003a33d 100644 --- a/configs/builds.json +++ b/configs/builds.json @@ -46,6 +46,7 @@ "targets":[ { "target": "esp32p4", + "skip": 1, "features":["qio_ram"], "idf_libs":["qio","80m"], "bootloaders":[ @@ -75,6 +76,7 @@ }, { "target": "esp32h2", + "skip": 1, "features":[], "idf_libs":["qio","64m"], "bootloaders":[ @@ -89,6 +91,7 @@ }, { "target": "esp32c6", + "skip": 1, "features":[], "idf_libs":["qio","80m"], "bootloaders":[ @@ -103,6 +106,7 @@ }, { "target": "esp32c3", + "skip": 1, "features":[], "idf_libs":["qio","80m"], "bootloaders":[ @@ -117,6 +121,7 @@ }, { "target": "esp32", + "skip": 1, "features":["qio_ram"], "idf_libs":["qio","80m"], "bootloaders":[ @@ -131,6 +136,7 @@ }, { "target": "esp32s2", + "skip": 1, "features":["qio_ram"], "idf_libs":["qio","80m"], "bootloaders":[ From 43ba86d710b5f6d38bacea90799f8ed59ba4332c Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 22 Feb 2025 14:25:08 +0000 Subject: [PATCH 05/12] Changed IDF branch from v5.4 to v5.1 --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index a0df42e81..4745e7088 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -6,7 +6,7 @@ if [ -z $IDF_PATH ]; then fi if [ -z $IDF_BRANCH ]; then - IDF_BRANCH="release/v5.4" + IDF_BRANCH="release/v5.1" fi if [ -z $AR_PR_TARGET_BRANCH ]; then From f724d897a5bc1200fe2732db0bee6e2d3ea00488 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 22 Feb 2025 14:36:25 +0000 Subject: [PATCH 06/12] Revert back to v5.4 due to the incompatibility --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index 4745e7088..a0df42e81 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -6,7 +6,7 @@ if [ -z $IDF_PATH ]; then fi if [ -z $IDF_BRANCH ]; then - IDF_BRANCH="release/v5.1" + IDF_BRANCH="release/v5.4" fi if [ -z $AR_PR_TARGET_BRANCH ]; then From b8b7864ee020aa5f0c8baec82c91a70d90fdd1b7 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 22 Feb 2025 14:36:25 +0000 Subject: [PATCH 07/12] Switch IDF to v5.3 --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index 4745e7088..a356aa4b9 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -6,7 +6,7 @@ if [ -z $IDF_PATH ]; then fi if [ -z $IDF_BRANCH ]; then - IDF_BRANCH="release/v5.1" + IDF_BRANCH="release/v5.3" fi if [ -z $AR_PR_TARGET_BRANCH ]; then From e4e02069f0d29d1208dbff29f9f6028dcc87286b Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 6 Mar 2025 23:45:46 +0000 Subject: [PATCH 08/12] CONFIG_SPIRAM_XIP_FROM_PSRAM=y --- configs/defconfig.esp32s3 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index ce53e7747..45124b243 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -21,3 +21,4 @@ CONFIG_ULP_COPROC_RESERVE_MEM=512 # RGB Display Optimizations CONFIG_LCD_RGB_ISR_IRAM_SAFE=y CONFIG_LCD_RGB_RESTART_IN_VSYNC=y +CONFIG_SPIRAM_XIP_FROM_PSRAM=y \ No newline at end of file From 8ace5ad06edfdf533596e4378e0f9f873a7df761 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 12 Mar 2025 22:41:36 +0000 Subject: [PATCH 09/12] Fixed repo link --- tools/current_commit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/current_commit.sh b/tools/current_commit.sh index 8d890dc5c..981e566a6 100755 --- a/tools/current_commit.sh +++ b/tools/current_commit.sh @@ -1,2 +1,2 @@ -IDF_COMMIT=$(wget -q -O- "https://github.com/espressif/arduino-esp32/search?q=update+idf&type=Commits" | grep -i "update idf" | grep -e "to [0-9a-f]*" | sed "s/^.*to \([0-9a-f]*\).*/\1/" | head -1) +IDF_COMMIT=$(wget -q -O- "https://github.com/reykada/arduino-esp32/search?q=update+idf&type=Commits" | grep -i "update idf" | grep -e "to [0-9a-f]*" | sed "s/^.*to \([0-9a-f]*\).*/\1/" | head -1) echo Current commit is $IDF_COMMIT From 68da073f9a6887cd348c3da7887a7c46798db766 Mon Sep 17 00:00:00 2001 From: reykada Date: Thu, 13 Mar 2025 19:31:27 +0000 Subject: [PATCH 10/12] Update cron.yml --- .github/workflows/cron.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 8a8f721db..28c9ea9ad 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -21,7 +21,7 @@ defaults: jobs: build-libs: name: Build with IDF ${{ matrix.idf_branch }} - if: github.repository_owner == 'espressif' + if: github.repository_owner == 'reykada' uses: ./.github/workflows/cron_build.yml with: idf_branch: ${{ matrix.idf_branch }} From 35eea0abeb8cf1e265bdf2f47c7a0a0abe4bc46b Mon Sep 17 00:00:00 2001 From: reykada Date: Thu, 13 Mar 2025 19:52:01 +0000 Subject: [PATCH 11/12] Update cron.yml --- .github/workflows/cron.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 28c9ea9ad..0ef8c75cb 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -35,12 +35,12 @@ jobs: # - idf_branch: "release/v5.1" # lib_builder_branch: "release/v5.1" # targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2" - # - idf_branch: "release/v5.3" - # lib_builder_branch: "master" - # targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4" - - idf_branch: "release/v5.4" + - idf_branch: "release/v5.3" lib_builder_branch: "master" targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4" - - idf_branch: "master" - lib_builder_branch: "release/v5.5" - targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4,esp32c5" + # - idf_branch: "release/v5.4" + # lib_builder_branch: "master" + # targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4" + # - idf_branch: "master" + # lib_builder_branch: "release/v5.5" + # targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4,esp32c5" From 200d29d209571c080a830e3ed0e5869eb21b94b9 Mon Sep 17 00:00:00 2001 From: reykada Date: Thu, 13 Mar 2025 20:35:46 +0000 Subject: [PATCH 12/12] Update cron.yml --- .github/workflows/cron.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 0ef8c75cb..2df2d522d 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -37,7 +37,7 @@ jobs: # targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2" - idf_branch: "release/v5.3" lib_builder_branch: "master" - targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4" + targets: "esp32s3" # - idf_branch: "release/v5.4" # lib_builder_branch: "master" # targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"