Merge branch 'examples/remove_mrp_configs' into 'main'

examples: Removed MRP configs and enable CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS See merge request app-frameworks/esp-matter!993
espressif · Dec 27, 2024 · 4d82fb7 · 4d82fb7
2 parents badac88 + 125d41b
commit 4d82fb7
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 130 deletions.
diff --git a/examples/all_device_types_app/sdkconfig.defaults.esp32h2 b/examples/all_device_types_app/sdkconfig.defaults.esp32h2
@@ -19,12 +19,3 @@ CONFIG_USE_MINIMAL_MDNS=n
 
 # Disable STA
 CONFIG_ENABLE_WIFI_STATION=n
-
-# 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
@@ -66,12 +66,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
@@ -19,13 +19,3 @@ CONFIG_USE_MINIMAL_MDNS=n
 
 # Disable STA for ESP32H2
 CONFIG_ENABLE_WIFI_STATION=n
-
-# 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
@@ -46,15 +46,6 @@ 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
-
 # ESP32-C6-DevKitM-1 Settings
 # Buttons
 CONFIG_BSP_BUTTONS_NUM=1

diff --git a/examples/light/sdkconfig.defaults.c6_wifi_thread b/examples/light/sdkconfig.defaults.c6_wifi_thread
@@ -47,9 +47,6 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
 # Enable chip shell
 CONFIG_ENABLE_CHIP_SHELL=y
 
-# Disable persist subscriptions
-CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=y
-
 # ESP32-C6-DevKitM-1 Settings
 # Buttons
 CONFIG_BSP_BUTTONS_NUM=1

diff --git a/examples/light/sdkconfig.defaults.esp32h2 b/examples/light/sdkconfig.defaults.esp32h2
@@ -31,12 +31,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
@@ -20,15 +20,6 @@ CONFIG_USE_MINIMAL_MDNS=n
 # Disable STA for ESP32H2
 CONFIG_ENABLE_WIFI_STATION=n
 
-# 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
@@ -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
@@ -31,12 +31,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/multiple_on_off_plugin_units/sdkconfig.defaults.c6_thread b/examples/multiple_on_off_plugin_units/sdkconfig.defaults.c6_thread
@@ -45,12 +45,3 @@ CONFIG_ENABLE_WIFI_AP=n
 
 # 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/multiple_on_off_plugin_units/sdkconfig.defaults.esp32h2 b/examples/multiple_on_off_plugin_units/sdkconfig.defaults.esp32h2
@@ -19,12 +19,3 @@ CONFIG_USE_MINIMAL_MDNS=n
 
 # Disable STA for ESP32H2
 CONFIG_ENABLE_WIFI_STATION=n
-
-# 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
@@ -26,12 +26,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
@@ -19,12 +19,3 @@ CONFIG_USE_MINIMAL_MDNS=n
 
 # Disable STA for ESP32H2
 CONFIG_ENABLE_WIFI_STATION=n
-
-# 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/sensors/sdkconfig.defaults.esp32h2 b/examples/sensors/sdkconfig.defaults.esp32h2
@@ -23,12 +23,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/zap_light/sdkconfig.defaults.esp32h2 b/examples/zap_light/sdkconfig.defaults.esp32h2
@@ -19,12 +19,3 @@ CONFIG_USE_MINIMAL_MDNS=n
 
 # Disable STA for ESP32H2
 CONFIG_ENABLE_WIFI_STATION=n
-
-# 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