From 3de9c30e07facf58d03644d0adf383d27b989fe9 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Tue, 17 Sep 2024 13:33:14 +0300 Subject: [PATCH 01/23] Add Matter component as part of the libs --- main/idf_component.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/main/idf_component.yml b/main/idf_component.yml index 011906d2..650dea52 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -22,6 +22,11 @@ dependencies: version: ">=1.4.2" rules: - if: "target in [esp32s3]" + espressif/esp_matter: + version: "^1.3.0" + require: public + rules: + - if: "target not in [esp32c2]" # esp-sr: "^1.3.1" # esp32-camera: "^2.0.4" From 327b33685c46ee527fedfa9fd0cc4e9bb2069b09 Mon Sep 17 00:00:00 2001 From: SuGliger Date: Thu, 19 Sep 2024 20:35:48 -0300 Subject: [PATCH 02/23] feat(matter): adds necessary setup --- CMakeLists.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88cede19..53abed11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,3 +33,25 @@ add_custom_command( VERBATIM ) 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) + +# WARNING: This is just an example for using key for decrypting the encrypted OTA image +# Please do not use it as is. +#if(CONFIG_ENABLE_ENCRYPTED_OTA) +# target_add_binary_data(light.elf "esp_image_encryption_key.pem" TEXT) +#endif() + +#if(CONFIG_IDF_TARGET_ESP32C2) +# include(relinker) +#endif() + +#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) +# For RISCV chips, project_include.cmake sets -Wno-format, but does not clear various +# flags that depend on -Wformat +#idf_build_set_property(COMPILE_OPTIONS "-Wno-format-nonliteral;-Wno-format-security" APPEND) From b45dbb4324cfafc2c922cdbf925bbe5581be9b8a Mon Sep 17 00:00:00 2001 From: SuGliger Date: Thu, 19 Sep 2024 20:36:17 -0300 Subject: [PATCH 03/23] feat(matter): sdkconfig for each SoC --- configs/defconfig.esp32 | 47 +++++++++++++++++++++++++++++++++++++ configs/defconfig.esp32c3 | 44 +++++++++++++++++++++++++++++++++++ configs/defconfig.esp32c6 | 30 ++++++++++++++++++++++++ configs/defconfig.esp32h2 | 37 +++++++++++++++++++++++++++++ configs/defconfig.esp32s2 | 49 +++++++++++++++++++++++++++++++++++++++ configs/defconfig.esp32s3 | 48 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 255 insertions(+) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 2e88a27e..a337c697 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -19,3 +19,50 @@ CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y + +# Matter Configuration + +# +# mbedTLS +# +CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y +CONFIG_MBEDTLS_ECJPAKE_C=y +CONFIG_MBEDTLS_HKDF_C=y +# libsodium +CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y +# end of mbedTLS + + +# +# lwIP +# +CONFIG_LWIP_MULTICAST_PING=y +CONFIG_LWIP_BROADCAST_PING=y +CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y +CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y +CONFIG_LWIP_IPV6_AUTOCONFIG=y +# Increase LwIP IPv6 address number to 8 (MAX_FABRIC + 1) +# unique local addresses for fabrics(MAX_FABRIC), a link local address(1) +CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 + +# +# Other +# + +# Disable Matter BLE - needs nimBLE to run +CONFIG_ENABLE_CHIPOBLE=n +CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n + +# ESP Insights +CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n + +# Use minimal mDNS +CONFIG_USE_MINIMAL_MDNS=y +CONFIG_ENABLE_EXTENDED_DISCOVERY=y + +# FreeRTOS should use legacy API +CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y + +# Use compact attribute storage mode +CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y + diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index c497b562..ecc0437d 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -6,3 +6,47 @@ CONFIG_ESP_WIFI_11KV_SUPPORT=y CONFIG_ESP_WIFI_SCAN_CACHE=y CONFIG_ESP_WIFI_MBO_SUPPORT=y CONFIG_ESP_WIFI_11R_SUPPORT=y + +# Matter Configuration + +# +# mbedTLS +# +CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y +CONFIG_MBEDTLS_ECJPAKE_C=y +CONFIG_MBEDTLS_HKDF_C=y +# libsodium +CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y +# end of mbedTLS + + +# +# lwIP +# +CONFIG_LWIP_MULTICAST_PING=y +CONFIG_LWIP_BROADCAST_PING=y +CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y +CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y +CONFIG_LWIP_IPV6_AUTOCONFIG=y +# Increase LwIP IPv6 address number to 8 (MAX_FABRIC + 1) +# unique local addresses for fabrics(MAX_FABRIC), a link local address(1) +CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 + +# +# Other +# + +# Disable Matter BLE - needs nimBLE to run +CONFIG_ENABLE_CHIPOBLE=n +CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n + +# Use minimal mDNS +CONFIG_USE_MINIMAL_MDNS=y +CONFIG_ENABLE_EXTENDED_DISCOVERY=y + +# FreeRTOS should use legacy API +CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y + +# Use compact attribute storage mode +CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y + diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index e2c9c33e..a9363a31 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -9,6 +9,19 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 #CONFIG_ULP_COPROC_RESERVE_MEM=4096 # +# Matter and Thread Configuration +# + +# Disable Matter BLE - needs nimBLE to run +CONFIG_ENABLE_CHIPOBLE=n +CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n + +# ESP Insights +CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n + +# Matter over Thread +CONFIG_ENABLE_MATTER_OVER_THREAD=y + # ESP32 Arduino OpenThread Configuration # # lwIP @@ -16,6 +29,9 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 CONFIG_LWIP_MULTICAST_PING=y CONFIG_LWIP_BROADCAST_PING=y +CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y +CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y +CONFIG_LWIP_IPV6_AUTOCONFIG=y # end of lwip # @@ -23,8 +39,22 @@ CONFIG_LWIP_BROADCAST_PING=y # CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y CONFIG_MBEDTLS_ECJPAKE_C=y +CONFIG_MBEDTLS_HKDF_C=y +# libsodium +CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y # end of mbedTLS +# Use minimal mDNS +CONFIG_USE_MINIMAL_MDNS=y +CONFIG_ENABLE_EXTENDED_DISCOVERY=y + +# FreeRTOS should use legacy API +CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y + +# Use compact attribute storage mode +CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y + + # # OpenThread # diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index 79a13544..a8b8da76 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -12,6 +12,9 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 CONFIG_LWIP_MULTICAST_PING=y CONFIG_LWIP_BROADCAST_PING=y +CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y +CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y +CONFIG_LWIP_IPV6_AUTOCONFIG=n # end of lwip # @@ -20,6 +23,11 @@ CONFIG_LWIP_BROADCAST_PING=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y CONFIG_MBEDTLS_ECJPAKE_C=y # end of mbedTLS +# Enable HKDF in mbedtls +CONFIG_MBEDTLS_HKDF_C=y +# libsodium +CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y +# end of mbedTLS # # OpenThread @@ -47,3 +55,32 @@ CONFIG_OPENTHREAD_NETWORK_EXTPANID="dead00beef00cafe" CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff" CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread + +# Matter Configuration + +# Disable Matter BLE +CONFIG_ENABLE_CHIPOBLE=n +CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n + +# Use minimal mDNS +CONFIG_USE_MINIMAL_MDNS=y +CONFIG_ENABLE_EXTENDED_DISCOVERY=y + +# FreeRTOS should use legacy API +CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y + +# Use compact attribute storage mode +CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y + +# MRP configs +CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000 +CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000 +CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000 +CONFIG_MRP_MAX_RETRANS=3 + +# ESP Insights +CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n + +# Matter over Thread +CONFIG_ENABLE_MATTER_OVER_THREAD=y + diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index 3b0af548..560b54b9 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -15,3 +15,52 @@ CONFIG_ULP_COPROC_ENABLED=y CONFIG_ULP_COPROC_TYPE_FSM=y # CONFIG_ULP_COPROC_TYPE_RISCV=y CONFIG_ULP_COPROC_RESERVE_MEM=512 + + +# Matter Configuration + +# +# mbedTLS +# +CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y +CONFIG_MBEDTLS_ECJPAKE_C=y +# Enable HKDF in mbedtls +CONFIG_MBEDTLS_HKDF_C=y +# libsodium +CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y +# end of mbedTLS + + +# +# lwIP +# +CONFIG_LWIP_MULTICAST_PING=y +CONFIG_LWIP_BROADCAST_PING=y +CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y +CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y +CONFIG_LWIP_IPV6_AUTOCONFIG=y +# Increase LwIP IPv6 address number to 8 (MAX_FABRIC + 1) +# unique local addresses for fabrics(MAX_FABRIC), a link local address(1) +CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 + +# +# Other +# + +# Disable Matter BLE +CONFIG_ENABLE_CHIPOBLE=n +CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n + +# ESP Insights +CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n + +# Use minimal mDNS +CONFIG_USE_MINIMAL_MDNS=y +CONFIG_ENABLE_EXTENDED_DISCOVERY=y + +# FreeRTOS should use legacy API +CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y + +# Use compact attribute storage mode +CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y + diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 2c2cba3c..0c5dccc0 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -17,3 +17,51 @@ CONFIG_ULP_COPROC_ENABLED=y CONFIG_ULP_COPROC_TYPE_FSM=y # CONFIG_ULP_COPROC_TYPE_RISCV=y CONFIG_ULP_COPROC_RESERVE_MEM=512 + +# Matter Configuration + +# +# mbedTLS +# +CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y +CONFIG_MBEDTLS_ECJPAKE_C=y +# Enable HKDF in mbedtls +CONFIG_MBEDTLS_HKDF_C=y +# libsodium +CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y +# end of mbedTLS + + +# +# lwIP +# +CONFIG_LWIP_MULTICAST_PING=y +CONFIG_LWIP_BROADCAST_PING=y +CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y +CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y +CONFIG_LWIP_IPV6_AUTOCONFIG=y +# Increase LwIP IPv6 address number to 8 (MAX_FABRIC + 1) +# unique local addresses for fabrics(MAX_FABRIC), a link local address(1) +CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 + +# +# Other +# + +# Disable Matter BLE +CONFIG_ENABLE_CHIPOBLE=n +CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n + +# ESP Insights +CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n + +# Use minimal mDNS +CONFIG_USE_MINIMAL_MDNS=y +CONFIG_ENABLE_EXTENDED_DISCOVERY=y + +# FreeRTOS should use legacy API +CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y + +# Use compact attribute storage mode +CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y + From edf680d802583d6bafd6d5394d77738c64a94354 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Sun, 22 Sep 2024 18:33:51 -0300 Subject: [PATCH 04/23] fix(matter): no wifi within C2 --- configs/defconfig.esp32h2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index a8b8da76..77e2b710 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -62,6 +62,10 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" CONFIG_ENABLE_CHIPOBLE=n CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n +# Disable STA and AP for ESP32H2 +CONFIG_ENABLE_WIFI_STATION=n +CONFIG_ENABLE_WIFI_AP=n + # Use minimal mDNS CONFIG_USE_MINIMAL_MDNS=y CONFIG_ENABLE_EXTENDED_DISCOVERY=y From 71f2a7ed7dbb6f0456ab43348c9703e6c9dc164e Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 23 Sep 2024 10:59:02 -0300 Subject: [PATCH 05/23] fix(matter): replaces wrong pieces --- tools/copy-libs.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index 8ee2276d..319312e4 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -491,6 +491,17 @@ echo -n "$LD_FLAGS" > "$FLAGS_DIR/ld_flags" echo -n "$LD_SCRIPTS" > "$FLAGS_DIR/ld_scripts" echo -n "$AR_LIBS" > "$FLAGS_DIR/ld_libs" +# Matter Library adjustments +sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/c_flags > $FLAGS_DIR/c_flags_temp +mv $FLAGS_DIR/c_flags_temp $FLAGS_DIR/c_flags +sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/cpp_flags > $FLAGS_DIR/cpp_flags_temp +mv $FLAGS_DIR/cpp_flags_temp $FLAGS_DIR/cpp_flags +sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/S_flags > $FLAGS_DIR/S_flags_temp +mv $FLAGS_DIR/S_flags_temp $FLAGS_DIR/S_flags +CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/onnectedhomeip/src/lib/address_resolve" +sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER//' AddressResolve.h > AddressResolve_temp.h +mv AddressResolve_temp.h AddressResolve.h + # copy zigbee + zboss lib if [ -d "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET/" ]; then cp -r "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/" From 4cc230035b41b555c1bca7f01d8a6a57b2e210f6 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 23 Sep 2024 16:56:16 -0300 Subject: [PATCH 06/23] fix(matter): forgot folder reference --- tools/copy-libs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index 319312e4..677598a7 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -499,8 +499,8 @@ mv $FLAGS_DIR/cpp_flags_temp $FLAGS_DIR/cpp_flags sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/S_flags > $FLAGS_DIR/S_flags_temp mv $FLAGS_DIR/S_flags_temp $FLAGS_DIR/S_flags CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/onnectedhomeip/src/lib/address_resolve" -sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER//' AddressResolve.h > AddressResolve_temp.h -mv AddressResolve_temp.h AddressResolve.h +sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER//' $CHIP_RESOLVE_DIR/AddressResolve.h > $CHIP_RESOLVE_DIR/AddressResolve_temp.h +mv $CHIP_RESOLVE_DIR/AddressResolve_temp.h $CHIP_RESOLVE_DIR/AddressResolve.h # copy zigbee + zboss lib if [ -d "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET/" ]; then From a540e5c9d972262c1df38e7ee9c5ec29d0ab3ffe Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 23 Sep 2024 17:02:18 -0300 Subject: [PATCH 07/23] feat(matter): strip matter lib.a --- tools/copy-libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index 677598a7..8fcb073d 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -541,7 +541,7 @@ for item; do done done -for lib in "openthread" "espressif__esp-tflite-micro" "bt"; do +for lib in "openthread" "espressif__esp-tflite-micro" "bt" "espressif__esp_matter; do if [ -f "$AR_SDK/lib/lib$lib.a" ]; then echo "Stripping $AR_SDK/lib/lib$lib.a" "$TOOLCHAIN-strip" -g "$AR_SDK/lib/lib$lib.a" From 977fbbaaca2edfe7556e00f51a35aad83ac8353e Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 23 Sep 2024 17:48:37 -0300 Subject: [PATCH 08/23] fix(matter): missing double quote --- tools/copy-libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index 8fcb073d..7a731b65 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -541,7 +541,7 @@ for item; do done done -for lib in "openthread" "espressif__esp-tflite-micro" "bt" "espressif__esp_matter; do +for lib in "openthread" "espressif__esp-tflite-micro" "bt" "espressif__esp_matter"; do if [ -f "$AR_SDK/lib/lib$lib.a" ]; then echo "Stripping $AR_SDK/lib/lib$lib.a" "$TOOLCHAIN-strip" -g "$AR_SDK/lib/lib$lib.a" From 0fbcf11c77f42e382a608cbe71985cb1594e5f1b Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 23 Sep 2024 19:23:36 -0300 Subject: [PATCH 09/23] fix(matter): bad folder name --- tools/copy-libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index 7a731b65..ffdcce9a 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -498,7 +498,7 @@ sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/S_flags > $FLAGS_DIR/S_flags_temp mv $FLAGS_DIR/S_flags_temp $FLAGS_DIR/S_flags -CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/onnectedhomeip/src/lib/address_resolve" +CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/connectedhomeip/src/lib/address_resolve" sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER//' $CHIP_RESOLVE_DIR/AddressResolve.h > $CHIP_RESOLVE_DIR/AddressResolve_temp.h mv $CHIP_RESOLVE_DIR/AddressResolve_temp.h $CHIP_RESOLVE_DIR/AddressResolve.h From 8c17e97c202ad2984de11e47a32988de58cf1af6 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 24 Sep 2024 11:53:52 -0300 Subject: [PATCH 10/23] feat(matter): testing freertos backward compatibility --- configs/defconfig.esp32s3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 0c5dccc0..86507027 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -60,7 +60,7 @@ CONFIG_USE_MINIMAL_MDNS=y CONFIG_ENABLE_EXTENDED_DISCOVERY=y # FreeRTOS should use legacy API -CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y +# CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y # Use compact attribute storage mode CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y From a797cb340c2335422e4cc721b4f7f920dd2de762 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 24 Sep 2024 12:47:35 -0300 Subject: [PATCH 11/23] feat(matter): testing not using minimal mdns --- configs/defconfig.esp32s3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 86507027..07e95ece 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -56,7 +56,7 @@ CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n # Use minimal mDNS -CONFIG_USE_MINIMAL_MDNS=y +# CONFIG_USE_MINIMAL_MDNS=y CONFIG_ENABLE_EXTENDED_DISCOVERY=y # FreeRTOS should use legacy API From 6bb7873088aaaa10545f1820b8b40449c2030df9 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 24 Sep 2024 14:20:18 -0300 Subject: [PATCH 12/23] feat(matter): disable lwip ipv6 autoconfig --- configs/defconfig.esp32s3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 07e95ece..7bb80192 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -39,7 +39,7 @@ CONFIG_LWIP_MULTICAST_PING=y CONFIG_LWIP_BROADCAST_PING=y CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y -CONFIG_LWIP_IPV6_AUTOCONFIG=y +# CONFIG_LWIP_IPV6_AUTOCONFIG=y # Increase LwIP IPv6 address number to 8 (MAX_FABRIC + 1) # unique local addresses for fabrics(MAX_FABRIC), a link local address(1) CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 From ce3497d18fa24621b9c1eb34955fc65371c383b5 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 25 Sep 2024 17:47:36 -0300 Subject: [PATCH 13/23] feat(matter): common settings --- configs/defconfig.common | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/configs/defconfig.common b/configs/defconfig.common index a6b42ed6..47310528 100644 --- a/configs/defconfig.common +++ b/configs/defconfig.common @@ -75,8 +75,14 @@ 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 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set @@ -111,3 +117,13 @@ CONFIG_ESP_COREDUMP_STACK_SIZE=1024 CONFIG_MBEDTLS_DYNAMIC_BUFFER=y CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y +# +# Matter Settings +# +# Disable Matter BLE +CONFIG_ENABLE_CHIPOBLE=n +CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n +# ESP Insights +CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n +# Use compact attribute storage mode +CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y From 6fd125d64ffdcf31377731dbfc0463cfedba23c5 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 25 Sep 2024 17:50:25 -0300 Subject: [PATCH 14/23] feat(matter): revert changes --- configs/defconfig.esp32 | 47 ----------------------------------------- 1 file changed, 47 deletions(-) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index a337c697..2e88a27e 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -19,50 +19,3 @@ CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y - -# Matter Configuration - -# -# mbedTLS -# -CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y -CONFIG_MBEDTLS_ECJPAKE_C=y -CONFIG_MBEDTLS_HKDF_C=y -# libsodium -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y -# end of mbedTLS - - -# -# lwIP -# -CONFIG_LWIP_MULTICAST_PING=y -CONFIG_LWIP_BROADCAST_PING=y -CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y -CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y -CONFIG_LWIP_IPV6_AUTOCONFIG=y -# Increase LwIP IPv6 address number to 8 (MAX_FABRIC + 1) -# unique local addresses for fabrics(MAX_FABRIC), a link local address(1) -CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 - -# -# Other -# - -# Disable Matter BLE - needs nimBLE to run -CONFIG_ENABLE_CHIPOBLE=n -CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n - -# ESP Insights -CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n - -# Use minimal mDNS -CONFIG_USE_MINIMAL_MDNS=y -CONFIG_ENABLE_EXTENDED_DISCOVERY=y - -# FreeRTOS should use legacy API -CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y - -# Use compact attribute storage mode -CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y - From a8326a60fc904df8362150ddf59eb693c361aa32 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 25 Sep 2024 17:51:34 -0300 Subject: [PATCH 15/23] feat(matter): revert changes --- configs/defconfig.esp32c3 | 44 --------------------------------------- 1 file changed, 44 deletions(-) diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index ecc0437d..c497b562 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -6,47 +6,3 @@ CONFIG_ESP_WIFI_11KV_SUPPORT=y CONFIG_ESP_WIFI_SCAN_CACHE=y CONFIG_ESP_WIFI_MBO_SUPPORT=y CONFIG_ESP_WIFI_11R_SUPPORT=y - -# Matter Configuration - -# -# mbedTLS -# -CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y -CONFIG_MBEDTLS_ECJPAKE_C=y -CONFIG_MBEDTLS_HKDF_C=y -# libsodium -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y -# end of mbedTLS - - -# -# lwIP -# -CONFIG_LWIP_MULTICAST_PING=y -CONFIG_LWIP_BROADCAST_PING=y -CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y -CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y -CONFIG_LWIP_IPV6_AUTOCONFIG=y -# Increase LwIP IPv6 address number to 8 (MAX_FABRIC + 1) -# unique local addresses for fabrics(MAX_FABRIC), a link local address(1) -CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 - -# -# Other -# - -# Disable Matter BLE - needs nimBLE to run -CONFIG_ENABLE_CHIPOBLE=n -CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n - -# Use minimal mDNS -CONFIG_USE_MINIMAL_MDNS=y -CONFIG_ENABLE_EXTENDED_DISCOVERY=y - -# FreeRTOS should use legacy API -CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y - -# Use compact attribute storage mode -CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y - From 76bd8ef033ac2876657fa032eda0c25b93bcf5e9 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 25 Sep 2024 17:53:59 -0300 Subject: [PATCH 16/23] feat(matter): revert changes --- configs/defconfig.esp32c6 | 47 --------------------------------------- 1 file changed, 47 deletions(-) diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index a9363a31..7770504f 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -8,53 +8,6 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 #CONFIG_ULP_COPROC_LP_CORE=y #CONFIG_ULP_COPROC_RESERVE_MEM=4096 -# -# Matter and Thread Configuration -# - -# Disable Matter BLE - needs nimBLE to run -CONFIG_ENABLE_CHIPOBLE=n -CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n - -# ESP Insights -CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n - -# Matter over Thread -CONFIG_ENABLE_MATTER_OVER_THREAD=y - -# ESP32 Arduino OpenThread Configuration -# -# lwIP -# -CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 -CONFIG_LWIP_MULTICAST_PING=y -CONFIG_LWIP_BROADCAST_PING=y -CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y -CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y -CONFIG_LWIP_IPV6_AUTOCONFIG=y -# end of lwip - -# -# mbedTLS -# -CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y -CONFIG_MBEDTLS_ECJPAKE_C=y -CONFIG_MBEDTLS_HKDF_C=y -# libsodium -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y -# end of mbedTLS - -# Use minimal mDNS -CONFIG_USE_MINIMAL_MDNS=y -CONFIG_ENABLE_EXTENDED_DISCOVERY=y - -# FreeRTOS should use legacy API -CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y - -# Use compact attribute storage mode -CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y - - # # OpenThread # From f6f65988bffa7880c437ad53d0d82346630c8da3 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 25 Sep 2024 17:56:32 -0300 Subject: [PATCH 17/23] feat(matter): revert changes --- configs/defconfig.esp32h2 | 56 +-------------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index 77e2b710..9d15abd8 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -4,31 +4,6 @@ CONFIG_RTC_CLK_CAL_CYCLES=576 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 -# -# ESP32 Arduino OpenThread Configuration -# -# lwIP -# -CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 -CONFIG_LWIP_MULTICAST_PING=y -CONFIG_LWIP_BROADCAST_PING=y -CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y -CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y -CONFIG_LWIP_IPV6_AUTOCONFIG=n -# end of lwip - -# -# mbedTLS -# -CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y -CONFIG_MBEDTLS_ECJPAKE_C=y -# end of mbedTLS -# Enable HKDF in mbedtls -CONFIG_MBEDTLS_HKDF_C=y -# libsodium -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y -# end of mbedTLS - # # OpenThread # @@ -56,35 +31,6 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff" CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread -# Matter Configuration - -# Disable Matter BLE -CONFIG_ENABLE_CHIPOBLE=n -CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n - -# Disable STA and AP for ESP32H2 +# Disable STA and AP for ESP32H2 (Matter Settings) CONFIG_ENABLE_WIFI_STATION=n CONFIG_ENABLE_WIFI_AP=n - -# Use minimal mDNS -CONFIG_USE_MINIMAL_MDNS=y -CONFIG_ENABLE_EXTENDED_DISCOVERY=y - -# FreeRTOS should use legacy API -CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y - -# Use compact attribute storage mode -CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y - -# MRP configs -CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000 -CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000 -CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000 -CONFIG_MRP_MAX_RETRANS=3 - -# ESP Insights -CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n - -# Matter over Thread -CONFIG_ENABLE_MATTER_OVER_THREAD=y - From 052d5aee73688d7299d557b2a469c8b568510522 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 25 Sep 2024 17:57:26 -0300 Subject: [PATCH 18/23] feat(matter): no WiFi matter for H2 - thread only --- configs/defconfig.esp32h2 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index 9d15abd8..dfd36395 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -30,7 +30,3 @@ CONFIG_OPENTHREAD_NETWORK_EXTPANID="dead00beef00cafe" CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff" CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53" # end of OpenThread - -# Disable STA and AP for ESP32H2 (Matter Settings) -CONFIG_ENABLE_WIFI_STATION=n -CONFIG_ENABLE_WIFI_AP=n From 5f3b99435282e542476185818616ab343782e97e Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 25 Sep 2024 17:58:25 -0300 Subject: [PATCH 19/23] feat(matter): revert changes --- configs/defconfig.esp32s2 | 49 --------------------------------------- 1 file changed, 49 deletions(-) diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index 560b54b9..3b0af548 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -15,52 +15,3 @@ CONFIG_ULP_COPROC_ENABLED=y CONFIG_ULP_COPROC_TYPE_FSM=y # CONFIG_ULP_COPROC_TYPE_RISCV=y CONFIG_ULP_COPROC_RESERVE_MEM=512 - - -# Matter Configuration - -# -# mbedTLS -# -CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y -CONFIG_MBEDTLS_ECJPAKE_C=y -# Enable HKDF in mbedtls -CONFIG_MBEDTLS_HKDF_C=y -# libsodium -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y -# end of mbedTLS - - -# -# lwIP -# -CONFIG_LWIP_MULTICAST_PING=y -CONFIG_LWIP_BROADCAST_PING=y -CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y -CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y -CONFIG_LWIP_IPV6_AUTOCONFIG=y -# Increase LwIP IPv6 address number to 8 (MAX_FABRIC + 1) -# unique local addresses for fabrics(MAX_FABRIC), a link local address(1) -CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 - -# -# Other -# - -# Disable Matter BLE -CONFIG_ENABLE_CHIPOBLE=n -CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n - -# ESP Insights -CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n - -# Use minimal mDNS -CONFIG_USE_MINIMAL_MDNS=y -CONFIG_ENABLE_EXTENDED_DISCOVERY=y - -# FreeRTOS should use legacy API -CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y - -# Use compact attribute storage mode -CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y - From 46e40600189d4c29d46ac015eb9736da0414ee82 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 25 Sep 2024 17:59:14 -0300 Subject: [PATCH 20/23] feat(matter): revert changes --- configs/defconfig.esp32s3 | 48 --------------------------------------- 1 file changed, 48 deletions(-) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 7bb80192..2c2cba3c 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -17,51 +17,3 @@ CONFIG_ULP_COPROC_ENABLED=y CONFIG_ULP_COPROC_TYPE_FSM=y # CONFIG_ULP_COPROC_TYPE_RISCV=y CONFIG_ULP_COPROC_RESERVE_MEM=512 - -# Matter Configuration - -# -# mbedTLS -# -CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y -CONFIG_MBEDTLS_ECJPAKE_C=y -# Enable HKDF in mbedtls -CONFIG_MBEDTLS_HKDF_C=y -# libsodium -CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y -# end of mbedTLS - - -# -# lwIP -# -CONFIG_LWIP_MULTICAST_PING=y -CONFIG_LWIP_BROADCAST_PING=y -CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y -CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y -# CONFIG_LWIP_IPV6_AUTOCONFIG=y -# Increase LwIP IPv6 address number to 8 (MAX_FABRIC + 1) -# unique local addresses for fabrics(MAX_FABRIC), a link local address(1) -CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 - -# -# Other -# - -# Disable Matter BLE -CONFIG_ENABLE_CHIPOBLE=n -CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n - -# ESP Insights -CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n - -# Use minimal mDNS -# CONFIG_USE_MINIMAL_MDNS=y -CONFIG_ENABLE_EXTENDED_DISCOVERY=y - -# FreeRTOS should use legacy API -# CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y - -# Use compact attribute storage mode -CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y - From 18dbe03297e1fdfda27388727aa34dbf25c7d5af Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 25 Sep 2024 18:00:31 -0300 Subject: [PATCH 21/23] feat(matter): no support for H2 - no WiFi --- main/idf_component.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/idf_component.yml b/main/idf_component.yml index 650dea52..292709d6 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -26,7 +26,7 @@ dependencies: version: "^1.3.0" require: public rules: - - if: "target not in [esp32c2]" + - if: "target not in [esp32c2, esp32h2]" # esp-sr: "^1.3.1" # esp32-camera: "^2.0.4" From 89b4af03c783d792d8a0769f2c5791076f1505c8 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 25 Sep 2024 18:01:24 -0300 Subject: [PATCH 22/23] feat(matter): clean up --- CMakeLists.txt | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53abed11..1b0fca08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,21 +37,4 @@ 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) - -# WARNING: This is just an example for using key for decrypting the encrypted OTA image -# Please do not use it as is. -#if(CONFIG_ENABLE_ENCRYPTED_OTA) -# target_add_binary_data(light.elf "esp_image_encryption_key.pem" TEXT) -#endif() - -#if(CONFIG_IDF_TARGET_ESP32C2) -# include(relinker) -#endif() - -#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) -# For RISCV chips, project_include.cmake sets -Wno-format, but does not clear various -# flags that depend on -Wformat -#idf_build_set_property(COMPILE_OPTIONS "-Wno-format-nonliteral;-Wno-format-security" APPEND) From 3b6b0cbd81ee9ef0886935b1fdd6fdd5696a9318 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 25 Sep 2024 18:10:52 -0300 Subject: [PATCH 23/23] feat(matter): script clean up --- tools/copy-libs.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index ffdcce9a..565eb454 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -492,15 +492,15 @@ echo -n "$LD_SCRIPTS" > "$FLAGS_DIR/ld_scripts" echo -n "$AR_LIBS" > "$FLAGS_DIR/ld_libs" # Matter Library adjustments -sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/c_flags > $FLAGS_DIR/c_flags_temp -mv $FLAGS_DIR/c_flags_temp $FLAGS_DIR/c_flags -sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/cpp_flags > $FLAGS_DIR/cpp_flags_temp -mv $FLAGS_DIR/cpp_flags_temp $FLAGS_DIR/cpp_flags -sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/S_flags > $FLAGS_DIR/S_flags_temp -mv $FLAGS_DIR/S_flags_temp $FLAGS_DIR/S_flags +for flag_file in "c_flags" "cpp_flags" "S_flags"; do + echo "Fixing $FLAGS_DIR/$flag_file" + sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/$flag_file > $FLAGS_DIR/$flag_file.temp + mv $FLAGS_DIR/$flag_file.temp $FLAGS_DIR/$flag_file +done CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/connectedhomeip/src/lib/address_resolve" sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER//' $CHIP_RESOLVE_DIR/AddressResolve.h > $CHIP_RESOLVE_DIR/AddressResolve_temp.h mv $CHIP_RESOLVE_DIR/AddressResolve_temp.h $CHIP_RESOLVE_DIR/AddressResolve.h +# End of Matter Library adjustments # copy zigbee + zboss lib if [ -d "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET/" ]; then pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy