Skip to content

Commit df7261d

Browse files
chshuchshu
committed
Merge branch 'backport_v13_examples/remove_mrp_configs' into 'release/v1.3'
[v1.3] backport: examples: Removed MRP configs and enable CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS See merge request app-frameworks/esp-matter!995
2 parents f1cd133 + 2a735ea commit df7261d

13 files changed

+0
-117
lines changed

‎examples/all_device_types_app/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,3 @@ CONFIG_ENABLE_CHIP_SHELL=y
5353

5454
# Enable DS Peripheral
5555
CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y
56-
57-
# Disable persist subscriptions
58-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
59-
60-
# MRP configs
61-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
62-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
63-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
64-
CONFIG_MRP_MAX_RETRANS=3

‎examples/door_lock/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,3 @@ CONFIG_ICD_IDLE_MODE_INTERVAL_SEC=60
9292
CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS=1000
9393
CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS=1000
9494
CONFIG_ENABLE_ICD_LIT=y
95-
96-
# Disable persist subscriptions
97-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
98-
99-
# MRP configs
100-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
101-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
102-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
103-
CONFIG_MRP_MAX_RETRANS=3

‎examples/generic_switch/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,3 @@ CONFIG_BSP_BUTTONS_NUM=1
6060
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
6161
CONFIG_BSP_BUTTON_1_GPIO=9
6262
CONFIG_BSP_BUTTON_1_LEVEL=0
63-
64-
# Disable persist subscriptions
65-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
66-
67-
# MRP configs
68-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
69-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
70-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
71-
CONFIG_MRP_MAX_RETRANS=3

‎examples/icd_app/sdkconfig.defaults.esp32c6

-9
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,3 @@ CONFIG_ICD_IDLE_MODE_INTERVAL_SEC=60
9393
CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS=1000
9494
CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS=1000
9595
CONFIG_ENABLE_ICD_LIT=y
96-
97-
# Disable persist subscriptions
98-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
99-
100-
# MRP configs
101-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
102-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
103-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
104-
CONFIG_MRP_MAX_RETRANS=3

‎examples/icd_app/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,3 @@ CONFIG_ICD_IDLE_MODE_INTERVAL_SEC=60
9292
CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS=1000
9393
CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS=1000
9494
CONFIG_ENABLE_ICD_LIT=y
95-
96-
# Disable persist subscriptions
97-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
98-
99-
# MRP configs
100-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
101-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
102-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
103-
CONFIG_MRP_MAX_RETRANS=3

‎examples/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/light/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,3 @@ CONFIG_BSP_LEDS_NUM=1
6565
CONFIG_BSP_LED_TYPE_RGB=y
6666
CONFIG_BSP_LED_RGB_GPIO=8
6767
CONFIG_BSP_LED_RGB_BACKEND_RMT=y
68-
69-
# Disable persist subscriptions
70-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
71-
72-
# MRP configs
73-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
74-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
75-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
76-
CONFIG_MRP_MAX_RETRANS=3

‎examples/light_switch/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,6 @@ CONFIG_ENABLE_CHIP_SHELL=y
5454
# Enable DS Peripheral
5555
CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y
5656

57-
# Disable persist subscriptions
58-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
59-
60-
# MRP configs
61-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
62-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
63-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
64-
CONFIG_MRP_MAX_RETRANS=3
65-
6657
# ESP32-H2-DevKitM-1 Settings
6758
# Buttons
6859
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
@@ -65,12 +65,3 @@ CONFIG_BSP_LEDS_NUM=1
6565
CONFIG_BSP_LED_TYPE_RGB=y
6666
CONFIG_BSP_LED_RGB_GPIO=8
6767
CONFIG_BSP_LED_RGB_BACKEND_RMT=y
68-
69-
# Disable persist subscriptions
70-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
71-
72-
# MRP configs
73-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
74-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
75-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
76-
CONFIG_MRP_MAX_RETRANS=3

‎examples/refrigerator/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,3 @@ CONFIG_BSP_BUTTONS_NUM=1
8080
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
8181
CONFIG_BSP_BUTTON_1_GPIO=9
8282
CONFIG_BSP_BUTTON_1_LEVEL=0
83-
84-
# Disable persist subscriptions
85-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
86-
87-
# MRP configs
88-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
89-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
90-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
91-
CONFIG_MRP_MAX_RETRANS=3

‎examples/room_air_conditioner/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,3 @@ CONFIG_ENABLE_CHIP_SHELL=y
5353

5454
# Enable DS Peripheral
5555
CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y
56-
57-
# Disable persist subscriptions
58-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
59-
60-
# MRP configs
61-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
62-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
63-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
64-
CONFIG_MRP_MAX_RETRANS=3

‎examples/zap_light/sdkconfig.defaults.esp32h2

-9
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,3 @@ CONFIG_ENABLE_CHIP_SHELL=y
5353

5454
# Enable DS Peripheral
5555
CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y
56-
57-
# Disable persist subscriptions
58-
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n
59-
60-
# MRP configs
61-
CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD=5000
62-
CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD=5000
63-
CONFIG_MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD=5000
64-
CONFIG_MRP_MAX_RETRANS=3

0 commit comments

Comments
 (0)