From 8484fc60163a34290d12a45fc0686e5965e3c639 Mon Sep 17 00:00:00 2001 From: OyczE <46287652+OyczE@users.noreply.github.com> Date: Tue, 21 Apr 2026 19:53:51 +0200 Subject: [PATCH 1/6] Update esp32c5-build-release-no-discord.yml --- .github/workflows/esp32c5-build-release-no-discord.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/esp32c5-build-release-no-discord.yml b/.github/workflows/esp32c5-build-release-no-discord.yml index e46cab60..c746507e 100644 --- a/.github/workflows/esp32c5-build-release-no-discord.yml +++ b/.github/workflows/esp32c5-build-release-no-discord.yml @@ -14,7 +14,7 @@ jobs: contents: write runs-on: ubuntu-24.04 container: - image: espressif/idf:v6.0-beta1 + image: espressif/idf:release-v6.0 outputs: fw_version: ${{ steps.version.outputs.version }} steps: From 11f71d9ff70ec4b63e98a3354ae992c82eee1e40 Mon Sep 17 00:00:00 2001 From: Nigdzie <46287652+Nigdzie@users.noreply.github.com> Date: Tue, 21 Apr 2026 20:06:06 +0200 Subject: [PATCH 2/6] fix workflow to idf:release-v6.0 --- .gitattributes | 1 + .github/scripts/container_build.sh | 4 ++-- ESP32C5/tools/build_bin_docker.py | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 3bce6cda..fc1f1d01 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ ESP32C5/sdkconfig* text eol=lf +*.sh text eol=lf diff --git a/.github/scripts/container_build.sh b/.github/scripts/container_build.sh index 426bbff4..75a1853f 100644 --- a/.github/scripts/container_build.sh +++ b/.github/scripts/container_build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -IMAGE="${IDF_DOCKER_IMAGE:-espressif/idf:v6.0-beta1}" +IMAGE="${IDF_DOCKER_IMAGE:-espressif/idf:release-v6.0}" USE_DOCKER="${USE_DOCKER:-1}" SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" @@ -15,7 +15,7 @@ usage() { Usage: container_build.sh [--no-docker] Builds ESP32C5 firmware using esp-idf release/v6.0. -Defaults to running inside Docker (espressif/idf:v6.0-beta1). +Defaults to running inside Docker (espressif/idf:release-v6.0). Options: --no-docker Run idf.py directly (for GitHub Actions container job or host with esp-idf installed) diff --git a/ESP32C5/tools/build_bin_docker.py b/ESP32C5/tools/build_bin_docker.py index 0885c16f..3af4caa5 100644 --- a/ESP32C5/tools/build_bin_docker.py +++ b/ESP32C5/tools/build_bin_docker.py @@ -5,7 +5,7 @@ po czym kopiuje artefakty do ESP32C5/tools/docker_bin_output. Usage: - python ESP32C5/tools/build_bin_docker.py [--image espressif/idf:v6.0-beta1] + python ESP32C5/tools/build_bin_docker.py [--image espressif/idf:release-v6.0] """ import argparse @@ -21,8 +21,8 @@ def parse_args() -> argparse.Namespace: parser = argparse.ArgumentParser(description=__doc__) parser.add_argument( "--image", - default="espressif/idf:v6.0-beta1", - help="Docker image to use (default: espressif/idf:v6.0-beta1)", + default="espressif/idf:release-v6.0", + help="Docker image to use (default: espressif/idf:release-v6.0)", ) return parser.parse_args() @@ -58,6 +58,18 @@ def main() -> int: shutil.rmtree(tmpdir, ignore_errors=True) return 1 + # Windows checkouts can carry CRLF into shell scripts; normalize to LF + # so bash inside Docker parses options like `set -euo pipefail` correctly. + shell_script = workspace / ".github" / "scripts" / "container_build.sh" + if shell_script.is_file(): + try: + content = shell_script.read_bytes() + shell_script.write_bytes(content.replace(b"\r\n", b"\n")) + except OSError as exc: + print(f"Failed to normalize script line endings: {exc}", file=sys.stderr) + shutil.rmtree(tmpdir, ignore_errors=True) + return 1 + cmd = [ "docker", "run", From e44af4809d556a06887f7046f8dfad1dc1cfce6e Mon Sep 17 00:00:00 2001 From: OyczE <46287652+OyczE@users.noreply.github.com> Date: Tue, 21 Apr 2026 20:10:32 +0200 Subject: [PATCH 3/6] Update esp32c5-build-master.yml --- .github/workflows/esp32c5-build-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/esp32c5-build-master.yml b/.github/workflows/esp32c5-build-master.yml index 098a7080..392987b7 100644 --- a/.github/workflows/esp32c5-build-master.yml +++ b/.github/workflows/esp32c5-build-master.yml @@ -1,4 +1,4 @@ -name: ESP32C5 Build (IDF 6.0-beta1) +name: ESP32C5 Build (IDF 6.0) on: workflow_dispatch: From 675745607db5ee0d181e6dae2e4a61bbc56219db Mon Sep 17 00:00:00 2001 From: Nigdzie <46287652+Nigdzie@users.noreply.github.com> Date: Tue, 21 Apr 2026 20:30:30 +0200 Subject: [PATCH 4/6] fix build system for idf-6.0 --- .github/scripts/container_build.sh | 6 ++-- .github/workflows/esp32c5-build-master.yml | 12 +++---- .../esp32c5-build-release-no-discord.yml | 10 +++--- ESP32C5/main/main.c | 34 +++++++++++++++++-- ESP32C5/tools/build_bin_docker.py | 6 ++-- 5 files changed, 48 insertions(+), 20 deletions(-) diff --git a/.github/scripts/container_build.sh b/.github/scripts/container_build.sh index 75a1853f..a2fb3a0a 100644 --- a/.github/scripts/container_build.sh +++ b/.github/scripts/container_build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -IMAGE="${IDF_DOCKER_IMAGE:-espressif/idf:release-v6.0}" +IMAGE="${IDF_DOCKER_IMAGE:-espressif/idf:v6.0}" USE_DOCKER="${USE_DOCKER:-1}" SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" @@ -14,8 +14,8 @@ usage() { cat <<'EOF' Usage: container_build.sh [--no-docker] -Builds ESP32C5 firmware using esp-idf release/v6.0. -Defaults to running inside Docker (espressif/idf:release-v6.0). +Builds ESP32C5 firmware using esp-idf v6.0. +Defaults to running inside Docker (espressif/idf:v6.0). Options: --no-docker Run idf.py directly (for GitHub Actions container job or host with esp-idf installed) diff --git a/.github/workflows/esp32c5-build-master.yml b/.github/workflows/esp32c5-build-master.yml index 098a7080..a663c919 100644 --- a/.github/workflows/esp32c5-build-master.yml +++ b/.github/workflows/esp32c5-build-master.yml @@ -1,4 +1,4 @@ -name: ESP32C5 Build (IDF 6.0-beta1) +name: ESP32C5 Build (IDF 6.0) on: workflow_dispatch: @@ -23,7 +23,7 @@ jobs: contents: write runs-on: ubuntu-24.04 container: - image: espressif/idf:release-v6.0 + image: espressif/idf:v6.0 outputs: fw_version: ${{ steps.version.outputs.version }} steps: @@ -34,12 +34,12 @@ jobs: uses: actions/cache@v5 with: path: /root/.espressif - key: espidf-6.0-${{ runner.os }}-${{ hashFiles('ESP32C5/sdkconfig', 'ESP32C5/dependencies.lock') }} + key: espidf-v6.0-stable-${{ runner.os }}-${{ hashFiles('ESP32C5/sdkconfig', 'ESP32C5/dependencies.lock') }} restore-keys: | - espidf-6.0-${{ runner.os }}- - espidf-6.0- + espidf-v6.0-stable-${{ runner.os }}- + espidf-v6.0-stable- - - name: Build JanOS (IDF 6.0) + - name: Build JanOS (IDF 6.0 stable) run: IDF_PY_FLAGS="--preview" bash .github/scripts/container_build.sh --no-docker - name: Stamp JanOS with JANOS_VERSION diff --git a/.github/workflows/esp32c5-build-release-no-discord.yml b/.github/workflows/esp32c5-build-release-no-discord.yml index c746507e..7153289b 100644 --- a/.github/workflows/esp32c5-build-release-no-discord.yml +++ b/.github/workflows/esp32c5-build-release-no-discord.yml @@ -14,7 +14,7 @@ jobs: contents: write runs-on: ubuntu-24.04 container: - image: espressif/idf:release-v6.0 + image: espressif/idf:v6.0 outputs: fw_version: ${{ steps.version.outputs.version }} steps: @@ -25,12 +25,12 @@ jobs: uses: actions/cache@v5 with: path: /root/.espressif - key: espidf-6.0-${{ runner.os }}-${{ hashFiles('ESP32C5/sdkconfig', 'ESP32C5/dependencies.lock') }} + key: espidf-v6.0-stable-${{ runner.os }}-${{ hashFiles('ESP32C5/sdkconfig', 'ESP32C5/dependencies.lock') }} restore-keys: | - espidf-6.0-${{ runner.os }}- - espidf-6.0- + espidf-v6.0-stable-${{ runner.os }}- + espidf-v6.0-stable- - - name: Build JanOS (IDF 6.0) + - name: Build JanOS (IDF 6.0 stable) run: IDF_PY_FLAGS="--preview" bash .github/scripts/container_build.sh --no-docker - name: Stamp JanOS with JANOS_VERSION diff --git a/ESP32C5/main/main.c b/ESP32C5/main/main.c index 31f102d4..2871edd9 100644 --- a/ESP32C5/main/main.c +++ b/ESP32C5/main/main.c @@ -47,8 +47,20 @@ #include "esp_random.h" #include "mbedtls/ecp.h" #include "mbedtls/bignum.h" -#include "mbedtls/private/ctr_drbg.h" #include "mbedtls/base64.h" +#if defined(__has_include) +#if __has_include("mbedtls/ctr_drbg.h") +#include "mbedtls/ctr_drbg.h" +#define HAS_MBEDTLS_CTR_DRBG 1 +#elif __has_include("mbedtls/private/ctr_drbg.h") +#include "mbedtls/private/ctr_drbg.h" +#define HAS_MBEDTLS_CTR_DRBG 1 +#else +#define HAS_MBEDTLS_CTR_DRBG 0 +#endif +#else +#define HAS_MBEDTLS_CTR_DRBG 0 +#endif #include "esp_timer.h" #include "esp_app_format.h" @@ -1524,7 +1536,9 @@ static int64_t start_time = 0; static mbedtls_ecp_group ecc_group; // grupa ECC (secp256r1) static mbedtls_ecp_point ecc_element; // bieżący element (punkt ECC) static mbedtls_mpi ecc_scalar; // bieżący skalar +#if HAS_MBEDTLS_CTR_DRBG static mbedtls_ctr_drbg_context ctr_drbg; +#endif /* Router BSSID */ static uint8_t bssid[6] = { 0x30, 0xAA, 0xE4, 0x3C, 0x3F, 0x68}; @@ -17327,8 +17341,8 @@ static int trng_random_callback(void *ctx, unsigned char *output, size_t len) { static int crypto_init(void) { int ret; +#if HAS_MBEDTLS_CTR_DRBG const char *pers = "dragon_drain"; - mbedtls_ctr_drbg_init(&ctr_drbg); // TRNG as entropy source @@ -17341,6 +17355,7 @@ static int crypto_init(void) { ESP_LOGE(TAG, "mbedtls_ctr_drbg_seed failed: %d", ret); return ret; } +#endif mbedtls_ecp_group_init(&ecc_group); mbedtls_ecp_point_init(&ecc_element); @@ -17360,7 +17375,12 @@ static int crypto_init(void) { * Random MAC for client overflow attack. */ static void update_spoofed_src_random(void) { - esp_err_t ret = mbedtls_ctr_drbg_random(&ctr_drbg, spoofed_src, 6); + int ret; +#if HAS_MBEDTLS_CTR_DRBG + ret = mbedtls_ctr_drbg_random(&ctr_drbg, spoofed_src, 6); +#else + ret = trng_random_callback(NULL, spoofed_src, 6); +#endif if (ret != 0) { ESP_LOGE(TAG, "Unable to generate random MAC: %d", ret); return; @@ -17460,7 +17480,11 @@ void inject_sae_commit_frame() { size_t scalar_size = 32; do { +#if HAS_MBEDTLS_CTR_DRBG ret = mbedtls_mpi_fill_random(&ecc_scalar, scalar_size, mbedtls_ctr_drbg_random, &ctr_drbg); +#else + ret = mbedtls_mpi_fill_random(&ecc_scalar, scalar_size, trng_random_callback, NULL); +#endif if (ret != 0) { ESP_LOGE(TAG, "mbedtls_mpi_fill_random failed: %d", ret); return; @@ -17475,7 +17499,11 @@ void inject_sae_commit_frame() { } pos += scalar_size; +#if HAS_MBEDTLS_CTR_DRBG ret = mbedtls_ecp_mul(&ecc_group, &ecc_element, &ecc_scalar, &ecc_group.G, mbedtls_ctr_drbg_random, &ctr_drbg); +#else + ret = mbedtls_ecp_mul(&ecc_group, &ecc_element, &ecc_scalar, &ecc_group.G, trng_random_callback, NULL); +#endif if (ret != 0) { ESP_LOGE(TAG, "mbedtls_ecp_mul failed: %d", ret); return; diff --git a/ESP32C5/tools/build_bin_docker.py b/ESP32C5/tools/build_bin_docker.py index 3af4caa5..1b804d9c 100644 --- a/ESP32C5/tools/build_bin_docker.py +++ b/ESP32C5/tools/build_bin_docker.py @@ -5,7 +5,7 @@ po czym kopiuje artefakty do ESP32C5/tools/docker_bin_output. Usage: - python ESP32C5/tools/build_bin_docker.py [--image espressif/idf:release-v6.0] + python ESP32C5/tools/build_bin_docker.py [--image espressif/idf:v6.0] """ import argparse @@ -21,8 +21,8 @@ def parse_args() -> argparse.Namespace: parser = argparse.ArgumentParser(description=__doc__) parser.add_argument( "--image", - default="espressif/idf:release-v6.0", - help="Docker image to use (default: espressif/idf:release-v6.0)", + default="espressif/idf:v6.0", + help="Docker image to use (default: espressif/idf:v6.0)", ) return parser.parse_args() From 2ebed0b8cf8e3902a381b19d21bb494b9ddd2380 Mon Sep 17 00:00:00 2001 From: Nigdzie <46287652+Nigdzie@users.noreply.github.com> Date: Tue, 21 Apr 2026 20:45:03 +0200 Subject: [PATCH 5/6] idf:release-v6.0 fix #3 --- .github/scripts/container_build.sh | 6 +++--- .github/workflows/esp32c5-build-master.yml | 8 ++++---- .../esp32c5-build-release-no-discord.yml | 8 ++++---- ESP32C5/binaries-esp32c5/bootloader.bin | Bin 19664 -> 19664 bytes ESP32C5/binaries-esp32c5/projectZero.bin | Bin 2149168 -> 2149168 bytes ESP32C5/tools/build_bin_docker.py | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/scripts/container_build.sh b/.github/scripts/container_build.sh index a2fb3a0a..c8b75a8e 100644 --- a/.github/scripts/container_build.sh +++ b/.github/scripts/container_build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -IMAGE="${IDF_DOCKER_IMAGE:-espressif/idf:v6.0}" +IMAGE="${IDF_DOCKER_IMAGE:-espressif/idf:release-v6.0}" USE_DOCKER="${USE_DOCKER:-1}" SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" @@ -14,8 +14,8 @@ usage() { cat <<'EOF' Usage: container_build.sh [--no-docker] -Builds ESP32C5 firmware using esp-idf v6.0. -Defaults to running inside Docker (espressif/idf:v6.0). +Builds ESP32C5 firmware using esp-idf release-v6.0. +Defaults to running inside Docker (espressif/idf:release-v6.0). Options: --no-docker Run idf.py directly (for GitHub Actions container job or host with esp-idf installed) diff --git a/.github/workflows/esp32c5-build-master.yml b/.github/workflows/esp32c5-build-master.yml index a663c919..1643c923 100644 --- a/.github/workflows/esp32c5-build-master.yml +++ b/.github/workflows/esp32c5-build-master.yml @@ -23,7 +23,7 @@ jobs: contents: write runs-on: ubuntu-24.04 container: - image: espressif/idf:v6.0 + image: espressif/idf:release-v6.0 outputs: fw_version: ${{ steps.version.outputs.version }} steps: @@ -34,10 +34,10 @@ jobs: uses: actions/cache@v5 with: path: /root/.espressif - key: espidf-v6.0-stable-${{ runner.os }}-${{ hashFiles('ESP32C5/sdkconfig', 'ESP32C5/dependencies.lock') }} + key: espidf-release-v6.0-${{ runner.os }}-${{ hashFiles('ESP32C5/sdkconfig', 'ESP32C5/dependencies.lock') }} restore-keys: | - espidf-v6.0-stable-${{ runner.os }}- - espidf-v6.0-stable- + espidf-release-v6.0-${{ runner.os }}- + espidf-release-v6.0- - name: Build JanOS (IDF 6.0 stable) run: IDF_PY_FLAGS="--preview" bash .github/scripts/container_build.sh --no-docker diff --git a/.github/workflows/esp32c5-build-release-no-discord.yml b/.github/workflows/esp32c5-build-release-no-discord.yml index 7153289b..7f4b643c 100644 --- a/.github/workflows/esp32c5-build-release-no-discord.yml +++ b/.github/workflows/esp32c5-build-release-no-discord.yml @@ -14,7 +14,7 @@ jobs: contents: write runs-on: ubuntu-24.04 container: - image: espressif/idf:v6.0 + image: espressif/idf:release-v6.0 outputs: fw_version: ${{ steps.version.outputs.version }} steps: @@ -25,10 +25,10 @@ jobs: uses: actions/cache@v5 with: path: /root/.espressif - key: espidf-v6.0-stable-${{ runner.os }}-${{ hashFiles('ESP32C5/sdkconfig', 'ESP32C5/dependencies.lock') }} + key: espidf-release-v6.0-${{ runner.os }}-${{ hashFiles('ESP32C5/sdkconfig', 'ESP32C5/dependencies.lock') }} restore-keys: | - espidf-v6.0-stable-${{ runner.os }}- - espidf-v6.0-stable- + espidf-release-v6.0-${{ runner.os }}- + espidf-release-v6.0- - name: Build JanOS (IDF 6.0 stable) run: IDF_PY_FLAGS="--preview" bash .github/scripts/container_build.sh --no-docker diff --git a/ESP32C5/binaries-esp32c5/bootloader.bin b/ESP32C5/binaries-esp32c5/bootloader.bin index 59cb0682f7a78caa19b026e97d14412fae938a93..ac7c27a23687fa550023c94bb8d89bc2a888dd06 100644 GIT binary patch delta 55 zcmV-70LcH)nE}w50gzM(GB7$cG&(Xhv0PJ3A=e*N`OLU~-)N*S2}B|$=^c4us_ZCp N;WfQ`$h%nA&*5n}80r83 delta 55 zcmV-70LcH)nE}w50gzM(F*!OjG&(Rgv0PJ3A=}wtelU;8ZP?rZ-8Gu@S~z@4*}Fe0 N3s8}S$3gvO<`a7k7(M_1 diff --git a/ESP32C5/binaries-esp32c5/projectZero.bin b/ESP32C5/binaries-esp32c5/projectZero.bin index 07cc960618be658101630b2b20292a996ff80d2e..e513148fff6a3dd1e13e4e0fa98ed70211e881e9 100644 GIT binary patch delta 1267 zcmZA0U1(cn7zc22x}G;_+BF~TS(~L>+{e)iqt;HWFT|+lax*_RCg>J0VjY{2+zcj?R zXHA`mMaA>d*mm5EioGTen$L-Y(%5G7om)Bnv~p}jOH3S~@|l=8X!2xl#l)gj3g5-# z1+h(1W?=q|%*^01HgpgB+5A16V70$6z{<18vEf3rBfzS2IK*b=@ILE% zfFzrH0E6u)pg@}bz{ZPWyL5CO!HYDO7tqbd7tqhDi@3&S7V$G1T8a-6`6Z~V_BZyD zrUG6cq^E@c!Fe7lMSRUBinuu_w)EC0*>+bjs#jjcNbmBkcLrkqBd(xROnjUzxP#Gf z=qbC_T-ND~u6A}^D0SM)I-bbdb1s)U$ICju_4|8QmWeB+Qj=WvLVarw8ZC96E$eiC zxYqfm)afegcs^L|i0?`rr~HU2{eRtmEpT$jms6`o;LD>OD^ zMIRfg##J_7jT@|1gJqJoZ%y*{_1Kf7u~Lg3Hc^W>>$Bl2HfO^m+hK=!cxAhHn72Ey zpN^93#0fU;!~m<-A;)IwaEA@m!;vEM^$4(rxe0dVxN>q;Rc`8G?v*+8r!DHTpD}WeEM|H zw8-{Mn+q>WnjPJ37W%i@v;A!r_a-UVluf;CdAbTd&0@n+mqn3OFB}?ma^BMc%|fZ7 zSSi(%8p?V~EyYH$Qydg0rH)chQ79WI4U|TTi?Wg8rZiDDQ8s4-n&-#E54rB1JgEof ft%-^GVq5a;@5|R8A3y3I-I^XvX=?HI^mG3LMPTC3 delta 1264 zcmZA0Uu;ul7zXh5!20!c|N3WiqwBE3s3tNKx~0@9277Uc1Pvk<35Lu_&lVGtdEr9v zVioLJV&()(_oy+ZARD7AIu=|tAzT2d(O^6=u|Y2gA*AbI4jJ>nWG=q%HqvZOp8Rs& zKKb6{J2}IBhfTwjBbyxlU}IbJ{zxF`kGxef|2z8P6PAt7v@|ufG&LVR5cIy?7;jzo z<+X6=+^>h~M=A=}X7`Rcp0no9zyJ9+z5V{(ALudN6w{@cz9OctjOnE@-Ta*{E`Mr@ zA`uraNhLnqjEn82R%|>b_DCgO^c#^b;&F0k2I-0T-?yPW3mf0@_Zp?Iux1jAi(W6@}0Q=2>F6hD5EF+8ET zraWs`o#yH3kylTH^qFD&hJMU%Y?C2_V`iYzTfTYDA{`o7qa z%}bYgKU(ZuEOr`~b*^_W?z-}*^Q2vUWmzd1TPSV){ZYxTzGudUQ*>*pgq^G*;Q*_x zz*i()@}*OJ$t!V-$AMDV2FYwG0&LifH`u%xhuBVmL6Y9^FN6GsEtux9Plo$6IVxid zt5~73IV*ZtwG1PyQHHCmR*pH6wy#U^_6lrE(Kt|v4mMkfJ~mv1^K8BfH`q=aEJO3# z8;5wi9lPjJ@;Pvj9d#hdDo$kCoD&nQS`9~duS%K??VDx#)@+&H&9Y~Wl=o!Pd*$b?bho!7@_I?x0Ea3!;8sMo zbt|e&u~Nz?<&+9aC8dhO|Jx}Jijz`JSw(SCYACgo)f6|Sj^d%zQ`S%(%P6Y%r~Qw= o`Ea!Eo!?%byzukcD+AxQuASRaKGT+as^^m*Zd;lr{GC((15{z)$p8QV diff --git a/ESP32C5/tools/build_bin_docker.py b/ESP32C5/tools/build_bin_docker.py index 1b804d9c..3af4caa5 100644 --- a/ESP32C5/tools/build_bin_docker.py +++ b/ESP32C5/tools/build_bin_docker.py @@ -5,7 +5,7 @@ po czym kopiuje artefakty do ESP32C5/tools/docker_bin_output. Usage: - python ESP32C5/tools/build_bin_docker.py [--image espressif/idf:v6.0] + python ESP32C5/tools/build_bin_docker.py [--image espressif/idf:release-v6.0] """ import argparse @@ -21,8 +21,8 @@ def parse_args() -> argparse.Namespace: parser = argparse.ArgumentParser(description=__doc__) parser.add_argument( "--image", - default="espressif/idf:v6.0", - help="Docker image to use (default: espressif/idf:v6.0)", + default="espressif/idf:release-v6.0", + help="Docker image to use (default: espressif/idf:release-v6.0)", ) return parser.parse_args() From 8aa292d2d8d0e23fa4d496b85b07926270ba348b Mon Sep 17 00:00:00 2001 From: Nigdzie <46287652+Nigdzie@users.noreply.github.com> Date: Tue, 21 Apr 2026 20:54:21 +0200 Subject: [PATCH 6/6] mlock and led fix --- ESP32C5/dependencies.lock | 10 +++--- ESP32C5/main/idf_component.yml | 2 +- ESP32C5/sdkconfig | 56 +++++++++++++++++++++++++++------- 3 files changed, 51 insertions(+), 17 deletions(-) diff --git a/ESP32C5/dependencies.lock b/ESP32C5/dependencies.lock index 7e9fe0b7..53f806cc 100644 --- a/ESP32C5/dependencies.lock +++ b/ESP32C5/dependencies.lock @@ -1,6 +1,6 @@ dependencies: espressif/cjson: - component_hash: 9372811fb197926f522c467627cf4a8e72b681e0366e17879631da801103aef3 + component_hash: e788323270d90738662d66fffa910bfe1fba019bba087f01557e70c40485b469 dependencies: - name: idf require: private @@ -8,9 +8,9 @@ dependencies: source: registry_url: https://components.espressif.com/ type: service - version: 1.7.19 + version: 1.7.19~2 espressif/led_strip: - component_hash: 223998f10cae6d81f2ad2dd3c1103c2221be298c708e37917482b0153f3ec64e + component_hash: 28621486f77229aaf81c71f5e15d6fbf36c2949cf11094e07090593e659e7639 dependencies: - name: idf require: private @@ -18,7 +18,7 @@ dependencies: source: registry_url: https://components.espressif.com/ type: service - version: 3.0.1~1 + version: 3.0.3 idf: source: type: idf @@ -35,6 +35,6 @@ direct_dependencies: - espressif/led_strip - idf - lvgl/lvgl -manifest_hash: 89e75097ea075918e3fbc38d77518f549464abde71bb4b324ee57eab5d7eca45 +manifest_hash: ff5887322bf4426c782eb34c881d82e15c72c6f33497e602ba96ff772d05560e target: esp32c5 version: 3.0.0 diff --git a/ESP32C5/main/idf_component.yml b/ESP32C5/main/idf_component.yml index 0bbea177..4844e2c6 100644 --- a/ESP32C5/main/idf_component.yml +++ b/ESP32C5/main/idf_component.yml @@ -14,6 +14,6 @@ dependencies: # # `public` flag doesn't have an effect dependencies of the `main` component. # # All dependencies of `main` are public by default. # public: true - espressif/led_strip: '>=3.0.0,<4.0.0' + espressif/led_strip: '3.0.3' espressif/cjson: '>=1.7.19,<2.0.0' lvgl/lvgl: "9.2.0" diff --git a/ESP32C5/sdkconfig b/ESP32C5/sdkconfig index 15191454..8c164e72 100644 --- a/ESP32C5/sdkconfig +++ b/ESP32C5/sdkconfig @@ -99,6 +99,8 @@ CONFIG_SOC_APM_SUPPORTED=y # default: CONFIG_SOC_PMU_SUPPORTED=y # default: +CONFIG_SOC_PMU_PVT_SUPPORTED=y +# default: CONFIG_SOC_PAU_SUPPORTED=y # default: CONFIG_SOC_RTC_TIMER_V2_SUPPORTED=y @@ -523,23 +525,17 @@ CONFIG_SOC_SPI_MEM_SUPPORT_CHECK_SUS=y # default: CONFIG_SOC_SPI_MEM_SUPPORT_WRAP=y # default: -CONFIG_SOC_SPI_MEM_SUPPORT_WB_MODE_INDEPENDENT_CONTROL=y -# default: CONFIG_SOC_SPI_MEM_SUPPORT_CACHE_32BIT_ADDR_MAP=y # default: CONFIG_SOC_SPI_MEM_SUPPORT_TIMING_TUNING=y # default: CONFIG_SOC_SPI_MEM_SUPPORT_TSUS_TRES_SEPERATE_CTR=y # default: -CONFIG_SOC_MEMSPI_TIMING_TUNING_BY_MSPI_DELAY=y -# default: -CONFIG_SOC_MEMSPI_SRC_FREQ_120M_SUPPORTED=y +CONFIG_SOC_SPI_MEM_FLASH_SUPPORT_HPM=y # default: -CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y -# default: -CONFIG_SOC_MEMSPI_SRC_FREQ_40M_SUPPORTED=y +CONFIG_SOC_MEMSPI_TIMING_TUNING_BY_MSPI_DELAY=y # default: -CONFIG_SOC_MEMSPI_SRC_FREQ_20M_SUPPORTED=y +CONFIG_SOC_MEMSPI_ENCRYPTION_ALIGNMENT=16 # default: CONFIG_SOC_SYSTIMER_COUNTER_NUM=2 # default: @@ -575,6 +571,8 @@ CONFIG_SOC_TWAI_MASK_FILTER_NUM=3 # default: CONFIG_SOC_TWAI_RANGE_FILTER_NUM=1 # default: +CONFIG_SOC_TWAI_SUPPORT_SLEEP_RETENTION=y +# default: CONFIG_SOC_EFUSE_DIS_PAD_JTAG=y # default: CONFIG_SOC_EFUSE_DIS_USB_JTAG=y @@ -631,8 +629,14 @@ CONFIG_SOC_FLASH_ENCRYPTION_XTS_AES_256=y # default: CONFIG_SOC_FLASH_ENCRYPTION_XTS_AES_SUPPORT_PSEUDO_ROUND=y # default: +CONFIG_SOC_FLASH_ENCRYPTION_PAGE_CONFIGURABLE=y +# default: CONFIG_SOC_PSRAM_ENCRYPTION_XTS_AES_128=y # default: +CONFIG_SOC_PSRAM_ENCRYPTION_SEPARATE_KEY=y +# default: +CONFIG_SOC_PSRAM_ENCRYPTION_PAGE_CONFIGURABLE=y +# default: CONFIG_SOC_RECOVERY_BOOTLOADER_SUPPORTED=y # default: CONFIG_SOC_BOOTLOADER_ANTI_ROLLBACK_SUPPORTED=y @@ -803,6 +807,8 @@ CONFIG_SOC_WIFI_NAN_SUPPORT=y # default: CONFIG_SOC_BLE_SUPPORTED=y # default: +CONFIG_SOC_BLE_MESH_SUPPORTED=y +# default: CONFIG_SOC_ESP_NIMBLE_CONTROLLER=y # default: CONFIG_SOC_BLE_50_SUPPORTED=y @@ -868,6 +874,11 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y # CONFIG_APP_NO_BLOBS is not set # end of Build type +# +# App Update config +# +# end of App Update config + # # Bootloader config # @@ -1398,6 +1409,8 @@ CONFIG_BT_NIMBLE_TRANSPORT_EVT_COUNT=30 CONFIG_BT_NIMBLE_TRANSPORT_EVT_DISCARD_COUNT=8 # default: CONFIG_BT_NIMBLE_L2CAP_COC_SDU_BUFF_COUNT=1 +# default: +# CONFIG_BT_NIMBLE_MEMPOOL_RUNTIME_ALLOC is not set # end of Memory Settings # @@ -1833,6 +1846,8 @@ CONFIG_BT_LE_DFT_SYNC_SCHED_PRIO_LEVEL=1 # CONFIG_BT_LE_CTRL_SLV_FAST_RX_CONN_DATA_EN is not set # default: # CONFIG_BT_LE_CTRL_DL_ITVL_PHY_SYNC_EN is not set +# default: +# CONFIG_BT_LE_CTRL_ADV_FAST_TX_EN is not set # end of Controller Options # @@ -2261,6 +2276,8 @@ CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y # CONFIG_ESP_HTTP_CLIENT_ENABLE_GET_CONTENT_RANGE is not set # default: CONFIG_ESP_HTTP_CLIENT_EVENT_POST_TIMEOUT=2000 +# default: +# CONFIG_ESP_HTTP_CLIENT_SAVE_RESPONSE_HEADERS is not set # end of ESP HTTP client # @@ -2472,6 +2489,8 @@ CONFIG_ESP_SPI_BUS_LOCK_ISR_FUNCS_IN_IRAM=y # default: CONFIG_ESP_CLK_RC32K_NOT_TO_USE=y # default: +CONFIG_ESP_ENABLE_PVT=y +# default: CONFIG_ESP_INTR_IN_IRAM=y # end of Hardware Settings @@ -3009,6 +3028,8 @@ CONFIG_ESP_WIFI_TX_HETB_QUEUE_NUM=3 CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y # default: # CONFIG_ESP_WIFI_ENT_FREE_DYNAMIC_BUFFER is not set +# default: +# CONFIG_ESP_WIFI_PASSIVE_HIDDEN_AP_SUPPORT is not set # end of Wi-Fi # @@ -3306,11 +3327,11 @@ CONFIG_IEEE802154_PENDING_TABLE_SIZE=20 # default: # CONFIG_IEEE802154_MULTI_PAN_ENABLE is not set # default: +CONFIG_IEEE802154_INTERFACE_NUM=1 +# default: CONFIG_IEEE802154_TIMING_OPTIMIZATION=y # default: # CONFIG_IEEE802154_DEBUG is not set -# default: -# CONFIG_IEEE802154_DEBUG_ASSERT_MONITOR is not set # end of IEEE 802.15.4 # @@ -4111,6 +4132,8 @@ CONFIG_MBEDTLS_PKCS1_V21=y # CONFIG_NVS_ALLOCATE_CACHE_IN_SPIRAM is not set # default: # CONFIG_NVS_BDL_STACK is not set +# default: +# CONFIG_NVS_FLASH_VERIFY_ERASE is not set # end of NVS # @@ -4398,6 +4421,8 @@ CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y CONFIG_VFS_SUPPORT_TERMIOS=y # default: CONFIG_VFS_MAX_COUNT=8 +# default: +# CONFIG_VFS_SUPPRESS_CTX_DEPRECATION is not set # # Host File System I/O (Semihosting) @@ -4421,6 +4446,15 @@ CONFIG_WL_SECTOR_SIZE_4096=y CONFIG_WL_SECTOR_SIZE=4096 # end of Wear Levelling +# +# cJSON +# +# default: +CONFIG_CJSON_NESTING_LIMIT=1000 +# default: +CONFIG_CJSON_CIRCULAR_LIMIT=10000 +# end of cJSON + # # LVGL configuration #