From b3c2a5e5d5cfff2a53c2624027b8fe570cfb0e6b Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 2 Oct 2024 16:34:19 -0300 Subject: [PATCH 1/7] revert Matter for 3.0.x --- CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b0fca08..88cede19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,8 +33,3 @@ 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) From 186d8366855a94b8812165f10ca32646653d3e70 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 2 Oct 2024 16:37:16 -0300 Subject: [PATCH 2/7] revert Matter for 3.0.x --- configs/defconfig.common | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/configs/defconfig.common b/configs/defconfig.common index 47310528..a6b42ed6 100644 --- a/configs/defconfig.common +++ b/configs/defconfig.common @@ -75,14 +75,8 @@ 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 @@ -117,13 +111,3 @@ 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 2098e2b3336e3cbcd7699a6c8d4c3eb5d0040bd2 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 2 Oct 2024 16:39:08 -0300 Subject: [PATCH 3/7] revert Matter for 3.0.x --- configs/defconfig.esp32c6 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index 7770504f..0137d4bc 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -9,6 +9,23 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 #CONFIG_ULP_COPROC_RESERVE_MEM=4096 # +# ESP32 Arduino OpenThread Configuration +# +# lwIP +# +CONFIG_LWIP_IPV6_NUM_ADDRESSES=8 +CONFIG_LWIP_MULTICAST_PING=y +CONFIG_LWIP_BROADCAST_PING=y +# end of lwip + +# +# mbedTLS +# +CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y +CONFIG_MBEDTLS_ECJPAKE_C=y +# end of mbedTLS +# + # OpenThread # CONFIG_OPENTHREAD_ENABLED=y From b0ccb491b52c41cc269fac8cfa2326c1e0ff5573 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 2 Oct 2024 16:39:59 -0300 Subject: [PATCH 4/7] revert Matter for 3.0.x --- configs/defconfig.esp32h2 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index dfd36395..79a13544 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -4,6 +4,23 @@ 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 +# end of lwip + +# +# mbedTLS +# +CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y +CONFIG_MBEDTLS_ECJPAKE_C=y +# end of mbedTLS + # # OpenThread # From 39688cea6376065453d2ebdceb9b719de98ac4af Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 2 Oct 2024 16:40:49 -0300 Subject: [PATCH 5/7] revert Matter for 3.0.x --- main/idf_component.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/main/idf_component.yml b/main/idf_component.yml index 00682c10..d98a1778 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -22,11 +22,6 @@ 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, esp32h2]" # esp-sr: "^1.3.1" # esp32-camera: "^2.0.4" From a75ea50f1e7271d50f320a3efaba0e34282eec7f Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 2 Oct 2024 16:42:23 -0300 Subject: [PATCH 6/7] revert Matter for 3.0.x --- tools/copy-libs.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index bbc89e08..f169d5d8 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -491,17 +491,6 @@ 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 -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 cp -r "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/" @@ -541,7 +530,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"; 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 26f620c456f9938c2de892b74d2e4a43e4ae68cc Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Wed, 2 Oct 2024 16:44:21 -0300 Subject: [PATCH 7/7] fortmatting --- configs/defconfig.esp32c6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index 0137d4bc..e2c9c33e 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -24,8 +24,8 @@ CONFIG_LWIP_BROADCAST_PING=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y CONFIG_MBEDTLS_ECJPAKE_C=y # end of mbedTLS -# +# # OpenThread # CONFIG_OPENTHREAD_ENABLED=y 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