Skip to content

Commit cfb11d5

Browse files
chshuchshu
committed
Merge branch 'examples/remove_same_configs' into 'main'
examples: Remove the same configs as the default See merge request app-frameworks/esp-matter!987
2 parents 5b84c67 + 7868b2a commit cfb11d5

File tree

82 files changed

+151
-1663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+151
-1663
lines changed

‎examples/all_device_types_app/sdkconfig.defaults

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Default to 921600 baud when flashing and monitoring device
2-
CONFIG_ESPTOOLPY_BAUD_921600B=y
3-
CONFIG_ESPTOOLPY_BAUD=921600
4-
CONFIG_ESPTOOLPY_COMPRESSED=y
5-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
6-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
71
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
82

93
#enable BT
@@ -35,8 +29,11 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
3529
# disable softap by default
3630
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
3731

38-
# Disable DS Peripheral
39-
CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
32+
# Remove this after `ENABLE_WIFI_AP` config has been deleted from chip component
33+
CONFIG_ENABLE_WIFI_AP=n
34+
35+
# Enable OTA Requestor
36+
CONFIG_ENABLE_OTA_REQUESTOR=y
4037

4138
# Enable HKDF in mbedtls
4239
CONFIG_MBEDTLS_HKDF_C=y

‎examples/all_device_types_app/sdkconfig.defaults.esp32c2

-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ CONFIG_COMPILER_OPTIMIZATION_SIZE=y
33
CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
44
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
55

6-
# Bluetooth
7-
CONFIG_BT_ENABLED=y
8-
CONFIG_BT_NIMBLE_ENABLED=y
9-
106
## NimBLE Options
117
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
128
CONFIG_BT_NIMBLE_MAX_BONDS=2
@@ -25,7 +21,6 @@ CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320
2521
CONFIG_BT_NIMBLE_ACL_BUF_COUNT=5
2622
CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=5
2723
CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=3
28-
CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=n
2924

3025
## Controller Options
3126
CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE=3072

‎examples/all_device_types_app/sdkconfig.defaults.esp32c6

-51
Original file line numberDiff line numberDiff line change
@@ -1,52 +1 @@
11
CONFIG_IDF_TARGET="esp32c6"
2-
3-
# libsodium
4-
CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
5-
6-
# NIMBLE
7-
CONFIG_BT_ENABLED=y
8-
CONFIG_BT_NIMBLE_ENABLED=y
9-
CONFIG_BT_NIMBLE_EXT_ADV=n
10-
CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
11-
CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=y
12-
13-
# FreeRTOS should use legacy API
14-
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
15-
16-
# Disable lwip ipv6 autoconfig
17-
CONFIG_LWIP_IPV6_AUTOCONFIG=y
18-
19-
# Use a custom partition table
20-
CONFIG_PARTITION_TABLE_CUSTOM=y
21-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
22-
23-
# Use minimal mDNS
24-
CONFIG_USE_MINIMAL_MDNS=y
25-
CONFIG_ENABLE_EXTENDED_DISCOVERY=y
26-
27-
# Enable OTA Requestor
28-
CONFIG_ENABLE_OTA_REQUESTOR=y
29-
30-
# Disable AP
31-
CONFIG_ENABLE_WIFI_STATION=y
32-
CONFIG_ENABLE_WIFI_AP=n
33-
34-
# Button
35-
CONFIG_BUTTON_PERIOD_TIME_MS=20
36-
CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
37-
38-
# Enable chip shell
39-
CONFIG_ENABLE_CHIP_SHELL=y
40-
41-
# ESP32-C6-DevKitM-1 Settings
42-
# Buttons
43-
CONFIG_BSP_BUTTONS_NUM=1
44-
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
45-
CONFIG_BSP_BUTTON_1_GPIO=9
46-
CONFIG_BSP_BUTTON_1_LEVEL=0
47-
# LEDs
48-
CONFIG_BSP_LEDS_NUM=1
49-
CONFIG_BSP_LED_TYPE_RGB=y
50-
CONFIG_BSP_LED_RGB_GPIO=8
51-
CONFIG_BSP_LED_RGB_BACKEND_RMT=y
52-

‎examples/all_device_types_app/sdkconfig.defaults.esp32h2

+1-35
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,24 @@
11
CONFIG_IDF_TARGET="esp32h2"
22

3-
# libsodium
4-
CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
5-
6-
# NIMBLE
7-
CONFIG_BT_ENABLED=y
8-
CONFIG_BT_NIMBLE_ENABLED=y
9-
CONFIG_BT_NIMBLE_EXT_ADV=n
10-
CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
11-
CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
12-
13-
# FreeRTOS should use legacy API
14-
CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
15-
163
# Enable OpenThread
174
CONFIG_OPENTHREAD_ENABLED=y
185
CONFIG_OPENTHREAD_SRP_CLIENT=y
19-
CONFIG_OPENTHREAD_DNS_CLIENT=y
206
CONFIG_OPENTHREAD_LOG_LEVEL_DYNAMIC=n
217
CONFIG_OPENTHREAD_LOG_LEVEL_NOTE=y
228
CONFIG_OPENTHREAD_CLI=n
239

24-
2510
# Disable lwip ipv6 autoconfig
2611
CONFIG_LWIP_IPV6_AUTOCONFIG=n
2712

28-
# Use a custom partition table
29-
CONFIG_PARTITION_TABLE_CUSTOM=y
30-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
31-
3213
# LwIP config for OpenThread
3314
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
3415
CONFIG_LWIP_MULTICAST_PING=y
3516

3617
# MDNS platform
3718
CONFIG_USE_MINIMAL_MDNS=n
38-
CONFIG_ENABLE_EXTENDED_DISCOVERY=y
3919

40-
# Enable OTA Requestor
41-
CONFIG_ENABLE_OTA_REQUESTOR=y
42-
43-
# Disable STA and AP for ESP32H2
20+
# Disable STA
4421
CONFIG_ENABLE_WIFI_STATION=n
45-
CONFIG_ENABLE_WIFI_AP=n
46-
47-
# Button
48-
CONFIG_BUTTON_PERIOD_TIME_MS=20
49-
CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
50-
51-
# Enable chip shell
52-
CONFIG_ENABLE_CHIP_SHELL=y
53-
54-
# Enable DS Peripheral
55-
CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y
5622

5723
# Disable persist subscriptions
5824
CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS=n

‎examples/bridge_apps/blemesh_bridge/sdkconfig.defaults

-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Default to 921600 baud when flashing and monitoring device
2-
CONFIG_ESPTOOLPY_BAUD_921600B=y
3-
CONFIG_ESPTOOLPY_BAUD=921600
4-
CONFIG_ESPTOOLPY_COMPRESSED=y
5-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
6-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
71
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
82

93
# Enable BT
@@ -53,9 +47,6 @@ CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=n
5347
# disable softap by default
5448
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
5549

56-
# Disable DS Peripheral
57-
CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
58-
5950
# Enable HKDF in mbedtls
6051
CONFIG_MBEDTLS_HKDF_C=y
6152

‎examples/bridge_apps/bridge_cli/sdkconfig.defaults

-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Default to 921600 baud when flashing and monitoring device
2-
CONFIG_ESPTOOLPY_BAUD_921600B=y
3-
CONFIG_ESPTOOLPY_BAUD=921600
4-
CONFIG_ESPTOOLPY_COMPRESSED=y
5-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
6-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
71
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
82

93
#enable BT
@@ -31,9 +25,6 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
3125
# disable softap by default
3226
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
3327

34-
# Disable DS Peripheral
35-
CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
36-
3728
# Enable HKDF in mbedtls
3829
CONFIG_MBEDTLS_HKDF_C=y
3930

‎examples/bridge_apps/esp-now_bridge_light/sdkconfig.defaults

-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Default to 921600 baud when flashing and monitoring device
2-
CONFIG_ESPTOOLPY_BAUD_921600B=y
3-
CONFIG_ESPTOOLPY_BAUD=921600
4-
CONFIG_ESPTOOLPY_COMPRESSED=y
5-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
6-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
71
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
82

93
#enable BT
@@ -32,9 +26,6 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
3226
# disable softap by default
3327
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
3428

35-
# Disable DS Peripheral
36-
CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
37-
3829
# ESP-NOW Control Configuration
3930
CONFIG_ESPNOW_CONTROL_AUTO_CHANNEL_SENDING=y
4031
CONFIG_ESPNOW_CONTROL_RETRANSMISSION_TIMES=5

‎examples/bridge_apps/zigbee_bridge/sdkconfig.defaults

-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Default to 921600 baud when flashing and monitoring device
2-
CONFIG_ESPTOOLPY_BAUD_921600B=y
3-
CONFIG_ESPTOOLPY_BAUD=921600
4-
CONFIG_ESPTOOLPY_COMPRESSED=y
5-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
6-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
71
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
82

93
# Enable BT
@@ -38,9 +32,6 @@ CONFIG_ZB_ENABLED=y
3832
CONFIG_ZB_ZCZR=y
3933
CONFIG_ZB_RADIO_MACSPLIT_UART=y
4034

41-
# Disable DS Peripheral
42-
CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
43-
4435
# Enable HKDF in mbedtls
4536
CONFIG_MBEDTLS_HKDF_C=y
4637

‎examples/bridge_apps/zigbee_bridge/sdkconfig.defaults.esp32s3

+1-32
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,6 @@
1-
# Default to 921600 baud when flashing and monitoring device
2-
CONFIG_ESPTOOLPY_BAUD_921600B=y
3-
CONFIG_ESPTOOLPY_BAUD=921600
4-
CONFIG_ESPTOOLPY_COMPRESSED=y
5-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
6-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
7-
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
8-
9-
#enable BT
10-
CONFIG_BT_ENABLED=y
11-
CONFIG_BT_NIMBLE_ENABLED=y
12-
CONFIG_BT_NIMBLE_TASK_STACK_SIZE=5120
13-
14-
#enable lwip ipv6 autoconfig
15-
CONFIG_LWIP_IPV6_AUTOCONFIG=y
16-
17-
# Use a custom partition table
18-
CONFIG_PARTITION_TABLE_CUSTOM=y
19-
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
20-
21-
# Enable chip shell
22-
CONFIG_ENABLE_CHIP_SHELL=y
23-
24-
#enable lwIP route hooks
25-
CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
26-
CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
27-
28-
# Watchdog
29-
CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
30-
CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=n
1+
CONFIG_IDF_TARGET="esp32s3"
312

323
# Zboss
33-
CONFIG_ZB_ENABLED=y
34-
CONFIG_ZB_ZCZR=y
354
CONFIG_ZB_HOST=y
365

376
# System event stack size

‎examples/controller/sdkconfig.defaults

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Default to 921600 baud when flashing and monitoring device
2-
CONFIG_ESPTOOLPY_BAUD_921600B=y
3-
CONFIG_ESPTOOLPY_BAUD=921600
4-
CONFIG_ESPTOOLPY_COMPRESSED=y
5-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
6-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
71
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
82

93
#enable BT

‎examples/controller/sdkconfig.defaults.otbr

-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Default to 115200 baud when monitoring device
2-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
31
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
42

53
# Enable Openthread Border Router
@@ -29,14 +27,9 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
2927
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_br.csv"
3028

3129
# mbedTLS
32-
CONFIG_MBEDTLS_HARDWARE_AES=y
33-
CONFIG_MBEDTLS_HARDWARE_MPI=y
34-
CONFIG_MBEDTLS_HARDWARE_SHA=y
35-
CONFIG_MBEDTLS_CMAC_C=y
3630
CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
3731
CONFIG_MBEDTLS_ECJPAKE_C=y
3832
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
39-
CONFIG_MBEDTLS_HKDF_C=y
4033

4134
# MDNS platform
4235
CONFIG_USE_MINIMAL_MDNS=n

‎examples/door_lock/sdkconfig.defaults

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# Default to 921600 baud when flashing and monitoring device
2-
CONFIG_ESPTOOLPY_BAUD_921600B=y
3-
CONFIG_ESPTOOLPY_BAUD=921600
4-
CONFIG_ESPTOOLPY_COMPRESSED=y
5-
CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
6-
CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
71
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
82

93
#enable BT
@@ -35,15 +29,17 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000
3529
# disable softap by default
3630
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=n
3731

38-
# Disable DS Peripheral
39-
CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
32+
# Enable OTA Requestor
33+
CONFIG_ENABLE_OTA_REQUESTOR=y
4034

4135
# Use compact attribute storage mode
4236
CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
4337

4438
# Enable HKDF in mbedtls
4539
CONFIG_MBEDTLS_HKDF_C=y
4640

41+
CONFIG_ENABLE_WIFI_AP=n
42+
4743
# Increase LwIP IPv6 address number to 6 (MAX_FABRIC + 1)
4844
# unique local addresses for fabrics(MAX_FABRIC), a link local address(1)
4945
CONFIG_LWIP_IPV6_NUM_ADDRESSES=6

‎examples/door_lock/sdkconfig.defaults.esp32c2

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1+
CONFIG_IDF_TARGET="esp32c2"
2+
13
# Compiler options
24
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
35
CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
46
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
57

6-
# Bluetooth
7-
CONFIG_BT_ENABLED=y
8-
CONFIG_BT_NIMBLE_ENABLED=y
9-
108
## NimBLE Options
119
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1
1210
CONFIG_BT_NIMBLE_MAX_BONDS=2

‎examples/door_lock/sdkconfig.defaults.esp32c3

-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
CONFIG_IDF_TARGET="esp32c3"
22

3-
# Enable OTA Requestor
4-
CONFIG_ENABLE_OTA_REQUESTOR=y
5-
6-
# Disable AP
7-
CONFIG_ENABLE_WIFI_STATION=y
8-
CONFIG_ENABLE_WIFI_AP=n
9-
103
# ESP32-C3-DevKitC-02 Settings
114
# Buttons
125
CONFIG_BSP_BUTTONS_NUM=1

0 commit comments

Comments
 (0)