From 331403adfe7a222d78ba6585a331eebbfeba9660 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 30 Sep 2024 11:43:36 -0300 Subject: [PATCH 01/16] minimum Matter WiFi cypher and LwIP --- configs/defconfig.common | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configs/defconfig.common b/configs/defconfig.common index 47310528c..9e5c81789 100644 --- a/configs/defconfig.common +++ b/configs/defconfig.common @@ -75,13 +75,9 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT=y CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT=y CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM=y -CONFIG_LWIP_MULTICAST_PING=y -CONFIG_LWIP_BROADCAST_PING=y CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 CONFIG_MBEDTLS_PSK_MODES=y CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y -CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y -CONFIG_MBEDTLS_ECJPAKE_C=y CONFIG_MBEDTLS_HKDF_C=y CONFIG_MBEDTLS_CAMELLIA_C=y CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER=y From fe49dcbcedade35fda52c83950c5757af21758e1 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 30 Sep 2024 11:48:18 -0300 Subject: [PATCH 02/16] add thread settings to C6 --- configs/defconfig.esp32c6 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index 7770504fc..10c0dc80d 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -33,4 +33,9 @@ CONFIG_OPENTHREAD_NETWORK_PANID=0x1234 CONFIG_OPENTHREAD_NETWORK_EXTPANID="dead00beef00cafe" CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff" CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" +# LwIP and mbedTLS necessary features +CONFIG_LWIP_MULTICAST_PING=y +CONFIG_LWIP_BROADCAST_PING=y +CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y +CONFIG_MBEDTLS_ECJPAKE_C=y # end of OpenThread From 0d45f309045587facbe566f1ad6563fbdf9d738c Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 30 Sep 2024 11:48:58 -0300 Subject: [PATCH 03/16] add thread settings to H2 --- configs/defconfig.esp32h2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index dfd36395d..3e0eb5455 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -29,4 +29,9 @@ CONFIG_OPENTHREAD_NETWORK_PANID=0x1234 CONFIG_OPENTHREAD_NETWORK_EXTPANID="dead00beef00cafe" CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff" CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" +# LwIP and mbedTLS necessary features +CONFIG_LWIP_MULTICAST_PING=y +CONFIG_LWIP_BROADCAST_PING=y +CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y +CONFIG_MBEDTLS_ECJPAKE_C=y # end of OpenThread From 38bd8b298f9b76c6f50a262daf52bf2da52a3985 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 30 Sep 2024 11:49:56 -0300 Subject: [PATCH 04/16] minimum matter number of IPv6 addresses --- configs/defconfig.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.common b/configs/defconfig.common index 9e5c81789..0d3566e87 100644 --- a/configs/defconfig.common +++ b/configs/defconfig.common @@ -75,7 +75,7 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT=y CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT=y CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM=y -CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 +CONFIG_LWIP_IPV6_NUM_ADDRESSES=6 CONFIG_MBEDTLS_PSK_MODES=y CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y CONFIG_MBEDTLS_HKDF_C=y From 51da104d9f61a2d1b1fc204596710becf1cec30e Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 30 Sep 2024 12:36:05 -0300 Subject: [PATCH 05/16] ESP DL has changed folder structure --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b0fca085..b2503ee47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,9 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) +set(DL_PATH ${CMAKE_SOURCE_DIR}/managed_components/espressif__esp-dl) +set(EXTRA_COMPONENT_DIRS ${DL_PATH}/esp-dl) + include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(arduino-lib-builder) From 047b310d8e0b680b4e6e3439c5f78024cfa099c2 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 30 Sep 2024 12:55:36 -0300 Subject: [PATCH 06/16] revert CMakeLists.txt --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2503ee47..8e9f441de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -set(DL_PATH ${CMAKE_SOURCE_DIR}/managed_components/espressif__esp-dl) -set(EXTRA_COMPONENT_DIRS ${DL_PATH}/esp-dl) +//set(DL_PATH ${CMAKE_SOURCE_DIR}/managed_components/espressif__esp-dl) +//set(EXTRA_COMPONENT_DIRS ${DL_PATH}/esp-dl) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(arduino-lib-builder) From 76a55f7ecf35289ee38131e8c80b8547b02744e0 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 30 Sep 2024 12:56:31 -0300 Subject: [PATCH 07/16] removes ESP-DL from idf_component.yml --- main/idf_component.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main/idf_component.yml b/main/idf_component.yml index 292709d64..a524d4ba3 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -12,12 +12,12 @@ dependencies: require: public rules: - if: "target not in [esp32c2]" - espressif/esp-dl: - version: "master" - git: https://github.com/espressif/esp-dl.git - require: public - rules: - - if: "target in [esp32s3, esp32s2, esp32]" +# espressif/esp-dl: +# version: "master" +# git: https://github.com/espressif/esp-dl.git +# require: public +# rules: +# - if: "target in [esp32s3, esp32s2, esp32]" espressif/esp-sr: version: ">=1.4.2" rules: From b8d447f368090b63790e6b3077728dd7f74ac13e Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 30 Sep 2024 13:04:42 -0300 Subject: [PATCH 08/16] argh... comment error --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e9f441de..e1175d2f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -//set(DL_PATH ${CMAKE_SOURCE_DIR}/managed_components/espressif__esp-dl) -//set(EXTRA_COMPONENT_DIRS ${DL_PATH}/esp-dl) +#set(DL_PATH ${CMAKE_SOURCE_DIR}/managed_components/espressif__esp-dl) +#set(EXTRA_COMPONENT_DIRS ${DL_PATH}/esp-dl) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(arduino-lib-builder) From c8094faefe98d4aa5b5b011819e86810204b4f67 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 1 Oct 2024 01:10:57 -0300 Subject: [PATCH 09/16] revert idf_component.yml --- main/idf_component.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main/idf_component.yml b/main/idf_component.yml index a524d4ba3..292709d64 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -12,12 +12,12 @@ dependencies: require: public rules: - if: "target not in [esp32c2]" -# espressif/esp-dl: -# version: "master" -# git: https://github.com/espressif/esp-dl.git -# require: public -# rules: -# - if: "target in [esp32s3, esp32s2, esp32]" + espressif/esp-dl: + version: "master" + git: https://github.com/espressif/esp-dl.git + require: public + rules: + - if: "target in [esp32s3, esp32s2, esp32]" espressif/esp-sr: version: ">=1.4.2" rules: From 2dd9b171d68c6744b25abf547d5701d5f8e998fc Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 1 Oct 2024 01:11:29 -0300 Subject: [PATCH 10/16] revert CMakeLists.txt --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1175d2f4..1b0fca085 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -#set(DL_PATH ${CMAKE_SOURCE_DIR}/managed_components/espressif__esp-dl) -#set(EXTRA_COMPONENT_DIRS ${DL_PATH}/esp-dl) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(arduino-lib-builder) From b8583fe1b7df2b93e263598eb1c4a10c29f599d5 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 1 Oct 2024 02:14:13 -0300 Subject: [PATCH 11/16] gcc optimization - CMakeLists.txt --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b0fca085..5a23b2488 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,4 +37,5 @@ add_custom_target(mem-variant DEPENDS "mem_variant") ################## ### ESP Matter ### ################## -idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-DCHIP_HAVE_CONFIG_H" APPEND) +idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DCHIP_HAVE_CONFIG_H" APPEND) +idf_build_set_property(C_COMPILE_OPTIONS "-Os" APPEND) From 4d2c339ab38195a2ec4e898d3fbe8922aa116751 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 1 Oct 2024 17:20:51 -0300 Subject: [PATCH 12/16] revert CMakeLists.txt --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a23b2488..1b0fca085 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,5 +37,4 @@ add_custom_target(mem-variant DEPENDS "mem_variant") ################## ### ESP Matter ### ################## -idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DCHIP_HAVE_CONFIG_H" APPEND) -idf_build_set_property(C_COMPILE_OPTIONS "-Os" APPEND) +idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-DCHIP_HAVE_CONFIG_H" APPEND) From 7795ae2191e465a24f15103b0d69f37a98149a53 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 1 Oct 2024 18:57:07 -0300 Subject: [PATCH 13/16] fixes TinyUSB commit to 0877a486c problems with TinyUSB master branch. It fails compilation. --- tools/update-components.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/update-components.sh b/tools/update-components.sh index 298783c74..93a5c1bd1 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -10,6 +10,10 @@ TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git" TINYUSB_REPO_DIR="$AR_COMPS/arduino_tinyusb/tinyusb" if [ ! -d "$TINYUSB_REPO_DIR" ]; then git clone "$TINYUSB_REPO_URL" "$TINYUSB_REPO_DIR" + # Temporary fix given that tinyusb/master is breaking Lib Builder + cd "$TINYUSB_REPO_DIR" + git checkout 0877a486c + cd - else git -C "$TINYUSB_REPO_DIR" fetch && \ git -C "$TINYUSB_REPO_DIR" pull --ff-only From 7f022ff5a979a47d5204b1c96952a1ce2443ff42 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 1 Oct 2024 19:00:00 -0300 Subject: [PATCH 14/16] Testing -Os C/CXX - may be temporary --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b0fca085..0b461d98d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,4 +37,6 @@ add_custom_target(mem-variant DEPENDS "mem_variant") ################## ### ESP Matter ### ################## -idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-DCHIP_HAVE_CONFIG_H" APPEND) +# JUST TESTING -Os related to bigged mbedTLS library... +idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DCHIP_HAVE_CONFIG_H" APPEND) +idf_build_set_property(C_COMPILE_OPTIONS "-Os" APPEND) From 65dc8ba8bef6f7e735ef385cac5eb5dfd3894f7f Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 1 Oct 2024 20:09:59 -0300 Subject: [PATCH 15/16] set latest working commit --- tools/update-components.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/update-components.sh b/tools/update-components.sh index 93a5c1bd1..25a4bf86e 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -12,7 +12,8 @@ if [ ! -d "$TINYUSB_REPO_DIR" ]; then git clone "$TINYUSB_REPO_URL" "$TINYUSB_REPO_DIR" # Temporary fix given that tinyusb/master is breaking Lib Builder cd "$TINYUSB_REPO_DIR" - git checkout 0877a486c + # from Sep 18, 2024 + git checkout 40b55170c87da109b3416ac80eaa55ca56eadc77 cd - else git -C "$TINYUSB_REPO_DIR" fetch && \ From 8b0baefa8aac886b9e150b789658115f9ebbe008 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 2 Oct 2024 10:54:57 -0300 Subject: [PATCH 16/16] revert TinyUSB version --- tools/update-components.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/update-components.sh b/tools/update-components.sh index 25a4bf86e..298783c74 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -10,11 +10,6 @@ TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git" TINYUSB_REPO_DIR="$AR_COMPS/arduino_tinyusb/tinyusb" if [ ! -d "$TINYUSB_REPO_DIR" ]; then git clone "$TINYUSB_REPO_URL" "$TINYUSB_REPO_DIR" - # Temporary fix given that tinyusb/master is breaking Lib Builder - cd "$TINYUSB_REPO_DIR" - # from Sep 18, 2024 - git checkout 40b55170c87da109b3416ac80eaa55ca56eadc77 - cd - else git -C "$TINYUSB_REPO_DIR" fetch && \ git -C "$TINYUSB_REPO_DIR" pull --ff-only