From 2a735eafcaf7210d1c28883b4e99574290eb8d65 Mon Sep 17 00:00:00 2001 From: chendejin Date: Fri, 27 Dec 2024 14:52:09 +0800 Subject: [PATCH] [v1.3] backport: examples: Removed MRP configs and enable CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS --- examples/all_device_types_app/sdkconfig.defaults.esp32h2 | 9 --------- examples/door_lock/sdkconfig.defaults.esp32h2 | 9 --------- examples/generic_switch/sdkconfig.defaults.esp32h2 | 9 --------- examples/icd_app/sdkconfig.defaults.esp32c6 | 9 --------- examples/icd_app/sdkconfig.defaults.esp32h2 | 9 --------- examples/light/sdkconfig.defaults.c6_thread | 9 --------- examples/light/sdkconfig.defaults.esp32h2 | 9 --------- examples/light_switch/sdkconfig.defaults.esp32h2 | 9 --------- .../managed_component_light/sdkconfig.defaults.c6_thread | 9 --------- .../managed_component_light/sdkconfig.defaults.esp32h2 | 9 --------- examples/refrigerator/sdkconfig.defaults.esp32h2 | 9 --------- examples/room_air_conditioner/sdkconfig.defaults.esp32h2 | 9 --------- examples/zap_light/sdkconfig.defaults.esp32h2 | 9 --------- 13 files changed, 117 deletions(-) diff --git a/examples/all_device_types_app/sdkconfig.defaults.esp32h2 b/examples/all_device_types_app/sdkconfig.defaults.esp32h2 index ad74247e1..0a4d4149f 100644 --- a/examples/all_device_types_app/sdkconfig.defaults.esp32h2 +++ b/examples/all_device_types_app/sdkconfig.defaults.esp32h2 @@ -53,12 +53,3 @@ CONFIG_ENABLE_CHIP_SHELL=y # Enable DS Peripheral CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 diff --git a/examples/door_lock/sdkconfig.defaults.esp32h2 b/examples/door_lock/sdkconfig.defaults.esp32h2 index 77e989440..03a2900c6 100644 --- a/examples/door_lock/sdkconfig.defaults.esp32h2 +++ b/examples/door_lock/sdkconfig.defaults.esp32h2 @@ -92,12 +92,3 @@ CONFIG_ICD_IDLE_MODE_INTERVAL_SEC=60 CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS=1000 CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS=1000 CONFIG_ENABLE_ICD_LIT=y - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 diff --git a/examples/generic_switch/sdkconfig.defaults.esp32h2 b/examples/generic_switch/sdkconfig.defaults.esp32h2 index eae225eb3..bc2fc4afb 100644 --- a/examples/generic_switch/sdkconfig.defaults.esp32h2 +++ b/examples/generic_switch/sdkconfig.defaults.esp32h2 @@ -60,12 +60,3 @@ CONFIG_BSP_BUTTONS_NUM=1 CONFIG_BSP_BUTTON_1_TYPE_GPIO=y CONFIG_BSP_BUTTON_1_GPIO=9 CONFIG_BSP_BUTTON_1_LEVEL=0 - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 diff --git a/examples/icd_app/sdkconfig.defaults.esp32c6 b/examples/icd_app/sdkconfig.defaults.esp32c6 index 294042e7a..7ac4003f2 100644 --- a/examples/icd_app/sdkconfig.defaults.esp32c6 +++ b/examples/icd_app/sdkconfig.defaults.esp32c6 @@ -93,12 +93,3 @@ CONFIG_ICD_IDLE_MODE_INTERVAL_SEC=60 CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS=1000 CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS=1000 CONFIG_ENABLE_ICD_LIT=y - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 diff --git a/examples/icd_app/sdkconfig.defaults.esp32h2 b/examples/icd_app/sdkconfig.defaults.esp32h2 index 77e989440..03a2900c6 100644 --- a/examples/icd_app/sdkconfig.defaults.esp32h2 +++ b/examples/icd_app/sdkconfig.defaults.esp32h2 @@ -92,12 +92,3 @@ CONFIG_ICD_IDLE_MODE_INTERVAL_SEC=60 CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS=1000 CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS=1000 CONFIG_ENABLE_ICD_LIT=y - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 diff --git a/examples/light/sdkconfig.defaults.c6_thread b/examples/light/sdkconfig.defaults.c6_thread index de4607c18..0c65765db 100644 --- a/examples/light/sdkconfig.defaults.c6_thread +++ b/examples/light/sdkconfig.defaults.c6_thread @@ -49,12 +49,3 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000 # Enable chip shell CONFIG_ENABLE_CHIP_SHELL=y - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 diff --git a/examples/light/sdkconfig.defaults.esp32h2 b/examples/light/sdkconfig.defaults.esp32h2 index 35b7c03fa..8e60916dc 100644 --- a/examples/light/sdkconfig.defaults.esp32h2 +++ b/examples/light/sdkconfig.defaults.esp32h2 @@ -65,12 +65,3 @@ CONFIG_BSP_LEDS_NUM=1 CONFIG_BSP_LED_TYPE_RGB=y CONFIG_BSP_LED_RGB_GPIO=8 CONFIG_BSP_LED_RGB_BACKEND_RMT=y - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 diff --git a/examples/light_switch/sdkconfig.defaults.esp32h2 b/examples/light_switch/sdkconfig.defaults.esp32h2 index d9174aa76..bc2fc4afb 100644 --- a/examples/light_switch/sdkconfig.defaults.esp32h2 +++ b/examples/light_switch/sdkconfig.defaults.esp32h2 @@ -54,15 +54,6 @@ CONFIG_ENABLE_CHIP_SHELL=y # Enable DS Peripheral CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 - # ESP32-H2-DevKitM-1 Settings # Buttons CONFIG_BSP_BUTTONS_NUM=1 diff --git a/examples/managed_component_light/sdkconfig.defaults.c6_thread b/examples/managed_component_light/sdkconfig.defaults.c6_thread index de4607c18..0c65765db 100644 --- a/examples/managed_component_light/sdkconfig.defaults.c6_thread +++ b/examples/managed_component_light/sdkconfig.defaults.c6_thread @@ -49,12 +49,3 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000 # Enable chip shell CONFIG_ENABLE_CHIP_SHELL=y - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 diff --git a/examples/managed_component_light/sdkconfig.defaults.esp32h2 b/examples/managed_component_light/sdkconfig.defaults.esp32h2 index 35b7c03fa..8e60916dc 100644 --- a/examples/managed_component_light/sdkconfig.defaults.esp32h2 +++ b/examples/managed_component_light/sdkconfig.defaults.esp32h2 @@ -65,12 +65,3 @@ CONFIG_BSP_LEDS_NUM=1 CONFIG_BSP_LED_TYPE_RGB=y CONFIG_BSP_LED_RGB_GPIO=8 CONFIG_BSP_LED_RGB_BACKEND_RMT=y - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 diff --git a/examples/refrigerator/sdkconfig.defaults.esp32h2 b/examples/refrigerator/sdkconfig.defaults.esp32h2 index 19d8f2179..64b7cd4f4 100644 --- a/examples/refrigerator/sdkconfig.defaults.esp32h2 +++ b/examples/refrigerator/sdkconfig.defaults.esp32h2 @@ -80,12 +80,3 @@ CONFIG_BSP_BUTTONS_NUM=1 CONFIG_BSP_BUTTON_1_TYPE_GPIO=y CONFIG_BSP_BUTTON_1_GPIO=9 CONFIG_BSP_BUTTON_1_LEVEL=0 - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 diff --git a/examples/room_air_conditioner/sdkconfig.defaults.esp32h2 b/examples/room_air_conditioner/sdkconfig.defaults.esp32h2 index bcd5d743b..3533a4b66 100644 --- a/examples/room_air_conditioner/sdkconfig.defaults.esp32h2 +++ b/examples/room_air_conditioner/sdkconfig.defaults.esp32h2 @@ -53,12 +53,3 @@ CONFIG_ENABLE_CHIP_SHELL=y # Enable DS Peripheral CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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 diff --git a/examples/zap_light/sdkconfig.defaults.esp32h2 b/examples/zap_light/sdkconfig.defaults.esp32h2 index bcd5d743b..3533a4b66 100644 --- a/examples/zap_light/sdkconfig.defaults.esp32h2 +++ b/examples/zap_light/sdkconfig.defaults.esp32h2 @@ -53,12 +53,3 @@ CONFIG_ENABLE_CHIP_SHELL=y # Enable DS Peripheral CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y - -# Disable persist subscriptions -CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n - -# 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