Skip to content

Commit 4d82fb7

Browse files
chshuchshu
committed
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
2 parents badac88 + 125d41b commit 4d82fb7

15 files changed

+0
-130
lines changed

‎examples/all_device_types_app/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,3 @@ CONFIG_USE_MINIMAL_MDNS=n
1919

2020
# Disable STA
2121
CONFIG_ENABLE_WIFI_STATION=n
22-
23-
# Disable persist subscriptions
24-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
25-
26-
# MRP configs
27-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
28-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
29-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
30-
CONFIG_MRP_MAX_RETRANS=3

‎examples/door_lock/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,3 @@ CONFIG_ICD_IDLE_MODE_INTERVAL_SEC=60
6666
CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS=1000
6767
CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS=1000
6868
CONFIG_ENABLE_ICD_LIT=y
69-
70-
# Disable persist subscriptions
71-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
72-
73-
# MRP configs
74-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
75-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
76-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
77-
CONFIG_MRP_MAX_RETRANS=3

‎examples/generic_switch/sdkconfig.defaults.esp32h2

-10
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,3 @@ CONFIG_USE_MINIMAL_MDNS=n
1919

2020
# Disable STA for ESP32H2
2121
CONFIG_ENABLE_WIFI_STATION=n
22-
23-
# Disable persist subscriptions
24-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
25-
26-
# MRP configs
27-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
28-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
29-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
30-
CONFIG_MRP_MAX_RETRANS=3
31-

‎examples/light/sdkconfig.defaults.c6_thread

-9
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,6 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
4646
# Enable chip shell
4747
CONFIG_ENABLE_CHIP_SHELL=y
4848

49-
# Disable persist subscriptions
50-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
51-
52-
# MRP configs
53-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
54-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
55-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
56-
CONFIG_MRP_MAX_RETRANS=3
57-
5849
# ESP32-C6-DevKitM-1 Settings
5950
# Buttons
6051
CONFIG_BSP_BUTTONS_NUM=1

‎examples/light/sdkconfig.defaults.c6_wifi_thread

-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
4747
# Enable chip shell
4848
CONFIG_ENABLE_CHIP_SHELL=y
4949

50-
# Disable persist subscriptions
51-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=y
52-
5350
# ESP32-C6-DevKitM-1 Settings
5451
# Buttons
5552
CONFIG_BSP_BUTTONS_NUM=1

‎examples/light/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,3 @@ CONFIG_BSP_LEDS_NUM=1
3131
CONFIG_BSP_LED_TYPE_RGB=y
3232
CONFIG_BSP_LED_RGB_GPIO=8
3333
CONFIG_BSP_LED_RGB_BACKEND_RMT=y
34-
35-
# Disable persist subscriptions
36-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
37-
38-
# MRP configs
39-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
40-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
41-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
42-
CONFIG_MRP_MAX_RETRANS=3

‎examples/light_switch/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@ CONFIG_USE_MINIMAL_MDNS=n
2020
# Disable STA for ESP32H2
2121
CONFIG_ENABLE_WIFI_STATION=n
2222

23-
# Disable persist subscriptions
24-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
25-
26-
# MRP configs
27-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
28-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
29-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
30-
CONFIG_MRP_MAX_RETRANS=3
31-
3223
# ESP32-H2-DevKitM-1 Settings
3324
# Buttons
3425
CONFIG_BSP_BUTTONS_NUM=1

‎examples/managed_component_light/sdkconfig.defaults.c6_thread

-9
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,3 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
4949

5050
# Enable chip shell
5151
CONFIG_ENABLE_CHIP_SHELL=y
52-
53-
# Disable persist subscriptions
54-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
55-
56-
# MRP configs
57-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
58-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
59-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
60-
CONFIG_MRP_MAX_RETRANS=3

‎examples/managed_component_light/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,3 @@ CONFIG_BSP_LEDS_NUM=1
3131
CONFIG_BSP_LED_TYPE_RGB=y
3232
CONFIG_BSP_LED_RGB_GPIO=8
3333
CONFIG_BSP_LED_RGB_BACKEND_RMT=y
34-
35-
# Disable persist subscriptions
36-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
37-
38-
# MRP configs
39-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
40-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
41-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
42-
CONFIG_MRP_MAX_RETRANS=3

‎examples/multiple_on_off_plugin_units/sdkconfig.defaults.c6_thread

-9
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,3 @@ CONFIG_ENABLE_WIFI_AP=n
4545

4646
# Enable chip shell
4747
CONFIG_ENABLE_CHIP_SHELL=y
48-
49-
# Disable persist subscriptions
50-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
51-
52-
# MRP configs
53-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
54-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
55-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
56-
CONFIG_MRP_MAX_RETRANS=3

‎examples/multiple_on_off_plugin_units/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,3 @@ CONFIG_USE_MINIMAL_MDNS=n
1919

2020
# Disable STA for ESP32H2
2121
CONFIG_ENABLE_WIFI_STATION=n
22-
23-
# Disable persist subscriptions
24-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
25-
26-
# MRP configs
27-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
28-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
29-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
30-
CONFIG_MRP_MAX_RETRANS=3

‎examples/refrigerator/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,3 @@ CONFIG_BSP_BUTTONS_NUM=1
2626
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
2727
CONFIG_BSP_BUTTON_1_GPIO=9
2828
CONFIG_BSP_BUTTON_1_LEVEL=0
29-
30-
# Disable persist subscriptions
31-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
32-
33-
# MRP configs
34-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
35-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
36-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
37-
CONFIG_MRP_MAX_RETRANS=3

‎examples/room_air_conditioner/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,3 @@ CONFIG_USE_MINIMAL_MDNS=n
1919

2020
# Disable STA for ESP32H2
2121
CONFIG_ENABLE_WIFI_STATION=n
22-
23-
# Disable persist subscriptions
24-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
25-
26-
# MRP configs
27-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
28-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
29-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
30-
CONFIG_MRP_MAX_RETRANS=3

‎examples/sensors/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,3 @@ CONFIG_BSP_BUTTONS_NUM=1
2323
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
2424
CONFIG_BSP_BUTTON_1_GPIO=9
2525
CONFIG_BSP_BUTTON_1_LEVEL=0
26-
27-
# Disable persist subscriptions
28-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
29-
30-
# MRP configs
31-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
32-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
33-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
34-
CONFIG_MRP_MAX_RETRANS=3

‎examples/zap_light/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,3 @@ CONFIG_USE_MINIMAL_MDNS=n
1919

2020
# Disable STA for ESP32H2
2121
CONFIG_ENABLE_WIFI_STATION=n
22-
23-
# Disable persist subscriptions
24-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
25-
26-
# MRP configs
27-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
28-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
29-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
30-
CONFIG_MRP_MAX_RETRANS=3

0 commit comments

Comments
 (0)