Skip to content

Commit dec0b2e

Browse files
PeterC1965PeterC1965
committed
Merge branch 'master' into Update_Energy_Cluster_XML_For_1_4
2 parents 3ba3ff9 + 58536ba commit dec0b2e

File tree

841 files changed

+12488
-10620
lines changed

Some content is hidden

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

841 files changed

+12488
-10620
lines changed

‎.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ jobs:
332332
scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
333333
scripts/run_in_build_env.sh 'virtualenv pyenv'
334334
source pyenv/bin/activate
335-
pip3 install -r src/setup_payload/python/requirements.txt
335+
pip3 install -r scripts/setup/requirements.setuppayload.txt
336336
python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
337337
338338
build_linux_python_lighting_device:

‎.github/workflows/chef.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
if: github.actor != 'restyled-io[bot]'
9999

100100
container:
101-
image: ghcr.io/project-chip/chip-build-telink:54
101+
image: ghcr.io/project-chip/chip-build-telink:57
102102
options: --user root
103103

104104
steps:
@@ -110,7 +110,7 @@ jobs:
110110
platform: telink
111111
# - name: Update Zephyr to specific revision (for developers purpose)
112112
# shell: bash
113-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
113+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
114114
- name: CI Examples Telink
115115
shell: bash
116116
run: |

‎.github/workflows/examples-efr32.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
name: EFR32
3434

3535
env:
36-
SILABS_BOARD: BRD4161A
36+
SILABS_BOARD: BRD4187C
3737
BUILD_TYPE: gn_efr32
3838

3939
runs-on: ubuntu-latest
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-efr32:54
43+
image: ghcr.io/project-chip/chip-build-efr32:56
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-linux-tv-casting-app.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- name: Build Linux tv-casting-app
6262
run: |
6363
./scripts/run_in_build_env.sh \
64-
"scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app"
64+
"scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app chip_casting_simplified=true"
6565
6666
- name: Test casting from Linux tv-casting-app to Linux tv-app
6767
run: |

‎.github/workflows/examples-telink.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-telink:54
41+
image: ghcr.io/project-chip/chip-build-telink:57
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444

@@ -57,7 +57,7 @@ jobs:
5757
gh-context: ${{ toJson(github) }}
5858

5959
# - name: Update Zephyr to specific revision (for developers purpose)
60-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
60+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
6161

6262
- name: Build example Telink (B92 retention) Air Quality Sensor App
6363
run: |

‎.github/workflows/release_artifacts.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ jobs:
5858
efr32:
5959
name: EFR32
6060
env:
61-
SILABS_BOARD: BRD4161A
62-
BUILD_DIRECTORY: out/lock_app_debug/BRD4161A
61+
SILABS_BOARD: BRD4187C
62+
BUILD_DIRECTORY: out/lock_app_debug/BRD4187C
6363

6464
runs-on: ubuntu-latest
6565

6666
container:
67-
image: ghcr.io/project-chip/chip-build-efr32:54
67+
image: ghcr.io/project-chip/chip-build-efr32:56
6868
steps:
6969
- name: Checkout
7070
uses: actions/checkout@v4

‎.github/workflows/tests.yaml

+58-57
Large diffs are not rendered by default.

‎.gitmodules

+5-5
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@
231231
url = https://github.com/SiliconLabs/sdk_support.git
232232
branch = main
233233
platforms = silabs,silabs_docker
234-
[submodule "third_party/silabs/gecko_sdk"]
235-
path = third_party/silabs/gecko_sdk
236-
url = https://github.com/SiliconLabs/gecko_sdk.git
237-
branch = v4.4.2
234+
[submodule "third_party/silabs/simplicity_sdk"]
235+
path = third_party/silabs/simplicity_sdk
236+
url = https://github.com/SiliconLabs/simplicity_sdk.git
237+
branch = v2024.6.0
238238
platforms = silabs
239239
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
240240
path = third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -244,7 +244,7 @@
244244
[submodule "third_party/silabs/wifi_sdk"]
245245
path = third_party/silabs/wifi_sdk
246246
url = https://github.com/SiliconLabs/wiseconnect.git
247-
branch = v3.1.3-matter-hotfix.4
247+
branch = v3.3.0
248248
platforms = silabs
249249
[submodule "editline"]
250250
path = third_party/editline/repo

‎.vscode/tasks.json

+12-48
Original file line numberDiff line numberDiff line change
@@ -557,54 +557,18 @@
557557
"bouffalolab-xt-zb6-devkit-light",
558558
"bouffalolab-xt-zb6-devkit-light-rpc-115200",
559559
"bouffalolab-bl706-night-light-light",
560-
"efr32-brd4161a-light",
561-
"efr32-brd4163a-light",
562-
"efr32-brd4164a-light",
563-
"efr32-brd4166a-light",
564-
"efr32-brd4170a-light",
565-
"efr32-brd4186a-light",
566-
"efr32-brd4187a-light",
567-
"efr32-brd4304a-light",
568-
"efr32-brd4161a-light-rpc",
569-
"efr32-brd4163a-light-rpc",
570-
"efr32-brd4164a-light-rpc",
571-
"efr32-brd4166a-light-rpc",
572-
"efr32-brd4170a-light-rpc",
573-
"efr32-brd4186a-light-rpc",
574-
"efr32-brd4187a-light-rpc",
575-
"efr32-brd4304a-light-rpc",
576-
"efr32-brd4161a-lock",
577-
"efr32-brd4163a-lock",
578-
"efr32-brd4164a-lock",
579-
"efr32-brd4166a-lock",
580-
"efr32-brd4170a-lock",
581-
"efr32-brd4186a-lock",
582-
"efr32-brd4187a-lock",
583-
"efr32-brd4304a-lock",
584-
"efr32-brd4161a-unit-test",
585-
"efr32-brd4163a-unit-test",
586-
"efr32-brd4164a-unit-test",
587-
"efr32-brd4166a-unit-test",
588-
"efr32-brd4170a-unit-test",
589-
"efr32-brd4186a-unit-test",
590-
"efr32-brd4187a-unit-test",
591-
"efr32-brd4304a-unit-test",
592-
"efr32-brd4161a-switch",
593-
"efr32-brd4163a-switch",
594-
"efr32-brd4164a-switch",
595-
"efr32-brd4166a-switch",
596-
"efr32-brd4170a-switch",
597-
"efr32-brd4186a-switch",
598-
"efr32-brd4187a-switch",
599-
"efr32-brd4304a-switch",
600-
"efr32-brd4161a-window-covering",
601-
"efr32-brd4163a-window-covering",
602-
"efr32-brd4164a-window-covering",
603-
"efr32-brd4166a-window-covering",
604-
"efr32-brd4170a-window-covering",
605-
"efr32-brd4186a-window-covering",
606-
"efr32-brd4187a-window-covering",
607-
"efr32-brd4304a-window-covering",
560+
"efr32-brd4186c-light",
561+
"efr32-brd4186c-light-rpc",
562+
"efr32-brd4186c-lock",
563+
"efr32-brd4186c-unit-test",
564+
"efr32-brd4186c-switch",
565+
"efr32-brd4186c-window-covering",
566+
"efr32-brd4187c-light",
567+
"efr32-brd4187c-light-rpc",
568+
"efr32-brd4187c-lock",
569+
"efr32-brd4187c-unit-test",
570+
"efr32-brd4187c-switch",
571+
"efr32-brd4187c-window-covering",
608572
"efr32-brd4338a-light-wifi-917_soc-skip_rps_generation",
609573
"esp32-c3devkit-all-clusters",
610574
"esp32-devkitc-all-clusters",

‎BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
161161
"${chip_root}/examples/shell/standalone:chip-shell",
162162
"${chip_root}/src/app/tests/integration:chip-im-initiator",
163163
"${chip_root}/src/app/tests/integration:chip-im-responder",
164+
"${chip_root}/src/inet/tests:inet-layer-test-tool",
164165
"${chip_root}/src/lib/address_resolve:address-resolve-tool",
165166
"${chip_root}/src/messaging/tests/echo:chip-echo-requester",
166167
"${chip_root}/src/messaging/tests/echo:chip-echo-responder",

‎build/chip/chip_test_suite.gni

+5-2
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,12 @@ template("chip_test_suite") {
9494

9595
deps = [ dir_pw_unit_test ]
9696

97-
if (current_os != "zephyr" && current_os != "mbed") {
97+
if (current_os != "zephyr" && current_os != "mbed" &&
98+
chip_device_platform != "efr32") {
9899
# Depend on stdio logging, and have it take precedence over the default platform backend
99-
public_deps += [ "${chip_root}/src/platform/logging:force_stdio" ]
100+
public_deps += [ "${chip_root}/src/platform/logging:stdio" ]
101+
} else {
102+
public_deps += [ "${chip_root}/src/platform/logging:default" ]
100103
}
101104
}
102105
if (chip_link_tests) {

‎build/chip/tests.gni

100644100755
+8-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@
1515
import("//build_overrides/build.gni")
1616
import("//build_overrides/chip.gni")
1717

18+
import("${chip_root}/build/chip/tools.gni")
1819
import("${chip_root}/src/platform/device.gni")
1920

21+
declare_args() {
22+
# Build monolithic test library.
23+
chip_monolithic_tests = false
24+
}
25+
2026
declare_args() {
2127
# Enable building tests.
2228
chip_build_tests = current_os != "freertos"
@@ -40,6 +46,6 @@ declare_args() {
4046
}
4147

4248
declare_args() {
43-
# Enable use of nlfaultinjection.
44-
chip_with_nlfaultinjection = chip_build_tests
49+
# Enable use of nlfaultinjection when building tests or when building tools.
50+
chip_with_nlfaultinjection = chip_build_tests || chip_build_tools
4551
}

‎config/common/cmake/chip_gn.cmake

+7-1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ macro(matter_build target)
7777
LIB_PW_RPC
7878
LIB_MBEDTLS
7979
DEVICE_INFO_EXAMPLE_PROVIDER
80+
FORCE_LOGGING_STDIO
8081
)
8182
set(multiValueArgs GN_DEPENDENCIES)
8283

@@ -85,7 +86,11 @@ macro(matter_build target)
8586
set(MATTER_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/lib)
8687

8788
# Prepare Matter libraries that the application should be linked with
88-
set(MATTER_LIBRARIES -lCHIP)
89+
if (FORCE_LOGGING_STDIO)
90+
set(MATTER_LIBRARIES -lCHIPWithStdioLogging)
91+
else()
92+
set(MATTER_LIBRARIES -lCHIP)
93+
endif()
8994

9095
if (ARG_LIB_MBEDTLS)
9196
list(APPEND MATTER_LIBRARIES -lmbedtls)
@@ -158,6 +163,7 @@ macro(matter_build target)
158163
${CHIP_ROOT}/src/include
159164
${CHIP_ROOT}/third_party/nlassert/repo/include
160165
${CHIP_ROOT}/third_party/nlio/repo/include
166+
${CHIP_ROOT}/third_party/nlfaultinjection/include
161167
${CHIP_ROOT}/zzz_generated/app-common
162168
${CMAKE_CURRENT_BINARY_DIR}/gen/include
163169
)

‎config/nxp/chip-module/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
237237
COMMAND
238238
cp ${PROJECT_BINARY_DIR}/../modules/connectedhomeip/build_mcuboot/zephyr/zephyr.bin ${PROJECT_BINARY_DIR}/zephyr.mcuboot.bin
239239
)
240-
240+
add_dependencies(build_mcuboot ${ZEPHYR_FINAL_EXECUTABLE})
241241
set(BLOCK_SIZE "1024")
242242
dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
243243
dt_reg_size(mcuboot_size PATH ${dts_partition_path})
@@ -249,7 +249,7 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
249249
COMMAND
250250
dd if=${PROJECT_BINARY_DIR}/${ZEPHYR_OUTPUT_NAME}.bin of=${PROJECT_BINARY_DIR}/zephyr_full.bin bs=${BLOCK_SIZE} seek=${boot_blocks}
251251
)
252-
add_dependencies(merge_mcuboot ${ZEPHYR_FINAL_EXECUTABLE})
252+
add_dependencies(merge_mcuboot build_mcuboot)
253253

254254
if (CONFIG_CHIP_OTA_IMAGE_BUILD)
255255
chip_ota_image(chip-ota-image

‎config/nxp/chip-module/Kconfig.defaults

+5-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ config BT_BUF_ACL_TX_SIZE
205205

206206
config BT_RX_STACK_SIZE
207207
default 2048 if NO_OPTIMIZATIONS && DEBUG
208-
default 1536
208+
default 1600
209209

210210
config BT_DEVICE_NAME_GATT_WRITABLE
211211
bool
@@ -217,6 +217,9 @@ config HCI_NXP_ENABLE_AUTO_SLEEP
217217
config CHIP_OTA_REQUESTOR
218218
default n
219219

220+
config CHIP_DEVICE_SOFTWARE_VERSION
221+
default 1
222+
220223
# Enable extended discovery
221224
config CHIP_EXTENDED_DISCOVERY
222225
default y
@@ -225,7 +228,7 @@ config NVS_LOOKUP_CACHE
225228
default y
226229

227230
config NVS_LOOKUP_CACHE_SIZE
228-
default 512
231+
default 1024
229232

230233
if CHIP_WIFI
231234

‎config/openiotsdk/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ matter_build(chip
7979
LIB_SHELL ${CONFIG_CHIP_LIB_SHELL}
8080
LIB_TESTS ${CONFIG_CHIP_LIB_TESTS}
8181
GN_DEPENDENCIES ${CONFIG_GN_DEPENDENCIES}
82+
FORCE_LOGGING_STDIO ${CONFIG_CHIP_FORCE_LOGGING_STDIO}
8283
)
8384

8485
target_link_libraries(chip INTERFACE

‎config/openiotsdk/cmake/chip.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ set(CONFIG_CHIP_PROJECT_CONFIG_INCLUDE_DIRS "" CACHE STRING "")
2727
set(CONFIG_CHIP_LIB_TESTS NO CACHE BOOL "")
2828
set(CONFIG_CHIP_LIB_SHELL NO CACHE BOOL "")
2929

30+
set(CONFIG_CHIP_FORCE_LOGGING_STDIO NO CACHE BOOL "Enable stdio logging backend")
3031
set(CONFIG_CHIP_DETAIL_LOGGING YES CACHE BOOL "Enable logging at detail level")
3132
set(CONFIG_CHIP_PROGRESS_LOGGING YES CACHE BOOL "Enable logging at progress level")
3233
set(CONFIG_CHIP_AUTOMATION_LOGGING YES CACHE BOOL "Enable logging at automation level")

‎config/telink/chip-module/CMakeLists.txt

+16-15
Original file line numberDiff line numberDiff line change
@@ -95,39 +95,40 @@ matter_add_gn_arg_bool ("chip_logging" CONFIG_LOG)
9595
matter_add_gn_arg_bool ("chip_enable_openthread" CONFIG_NET_L2_OPENTHREAD)
9696
matter_add_gn_arg_bool ("chip_openthread_ftd" CONFIG_OPENTHREAD_FTD)
9797
matter_add_gn_arg_bool ("chip_config_network_layer_ble" CONFIG_BT)
98-
matter_add_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_NET_IPV4)
98+
matter_add_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_CHIP_IPV4)
9999
matter_add_gn_arg_bool ("chip_enable_nfc" CONFIG_CHIP_NFC_COMMISSIONING)
100100
matter_add_gn_arg_bool ("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR)
101-
matter_add_gn_arg_bool ("chip_inet_config_enable_tcp_endpoint" CONFIG_CHIP_BUILD_TESTS)
101+
matter_add_gn_arg_bool ("chip_inet_config_enable_tcp_endpoint" FALSE)
102102
matter_add_gn_arg_bool ("chip_error_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 1)
103103
matter_add_gn_arg_bool ("chip_progress_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 3)
104104
matter_add_gn_arg_bool ("chip_detail_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 4)
105105
matter_add_gn_arg_bool ("chip_automation_logging" FALSE)
106106
matter_add_gn_arg_bool ("chip_enable_wifi" CONFIG_WIFI_W91)
107107
matter_add_gn_arg_bool ("chip_enable_icd_server" CONFIG_CHIP_ENABLE_ICD_SUPPORT)
108+
matter_add_gn_arg_bool ("chip_enable_factory_data" CONFIG_CHIP_FACTORY_DATA)
109+
matter_add_gn_arg_bool ("chip_mdns_minimal" CONFIG_WIFI_W91)
110+
matter_add_gn_arg_bool ("chip_mdns_platform" CONFIG_NET_L2_OPENTHREAD)
108111

109112
if (CONFIG_CHIP_ENABLE_ICD_SUPPORT)
110-
matter_add_gn_arg_bool ("chip_enable_icd_lit" CONFIG_CHIP_ICD_LIT_SUPPORT)
111-
matter_add_gn_arg_bool ("chip_enable_icd_checkin" CONFIG_CHIP_ICD_CHECK_IN_SUPPORT)
112-
matter_add_gn_arg_bool ("chip_enable_icd_user_active_mode_trigger" CONFIG_CHIP_ICD_UAT_SUPPORT)
113+
matter_add_gn_arg_bool ("chip_enable_icd_lit" CONFIG_CHIP_ICD_LIT_SUPPORT)
114+
matter_add_gn_arg_bool ("chip_enable_icd_checkin" CONFIG_CHIP_ICD_CHECK_IN_SUPPORT)
115+
matter_add_gn_arg_bool ("chip_enable_icd_user_active_mode_trigger" CONFIG_CHIP_ICD_UAT_SUPPORT)
113116
endif()
114117

115-
if (CONFIG_CHIP_FACTORY_DATA)
116-
matter_add_gn_arg_bool ("chip_use_transitional_commissionable_data_provider" "false")
117-
matter_add_gn_arg_bool ("chip_enable_factory_data" "true")
118-
elseif (CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)
119-
matter_add_gn_arg_bool ("chip_use_transitional_commissionable_data_provider" "false")
118+
if (CONFIG_CHIP_FACTORY_DATA OR CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)
119+
matter_add_gn_arg_bool("chip_use_transitional_commissionable_data_provider" FALSE)
120+
matter_add_gn_arg_bool("chip_use_transitional_device_instance_info_provider" FALSE)
120121
endif()
121122

122123
if (CONFIG_CHIP_ROTATING_DEVICE_ID)
123-
matter_add_gn_arg_bool("chip_enable_rotating_device_id" "true")
124-
matter_add_gn_arg_bool("chip_enable_additional_data_advertising" "true")
124+
matter_add_gn_arg_bool("chip_enable_rotating_device_id" TRUE)
125+
matter_add_gn_arg_bool("chip_enable_additional_data_advertising" TRUE)
125126
endif()
126127

127-
if (CONFIG_NET_L2_OPENTHREAD)
128-
matter_add_gn_arg_string("chip_mdns" "platform")
129-
elseif(CONFIG_WIFI_W91)
128+
if(CONFIG_WIFI_W91)
130129
matter_add_gn_arg_string("chip_mdns" "minimal")
130+
elseif (CONFIG_NET_L2_OPENTHREAD)
131+
matter_add_gn_arg_string("chip_mdns" "platform")
131132
else()
132133
matter_add_gn_arg_string("chip_mdns" "none")
133134
endif()

‎config/telink/chip-module/Kconfig

+10-1
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,18 @@ config CHIP_LOG_SIZE_OPTIMIZATION
178178
full configuration enabled by this option in the
179179
platform/telink/CHIPPlatformConfig.h file.
180180

181+
config CHIP_IPV4
182+
bool "IPv4 support for Matter"
183+
default n
184+
depends on NET_IPV4
185+
help
186+
If disabled, it allows to build Telink SDK application
187+
with IPv4 support independently of the Matter stack still
188+
running over IPv6.
189+
181190
config CHIP_BUTTON_MANAGER_IRQ_MODE
182191
bool "Use GPIO in an IRQ mode instead of polling the GPIO"
183-
default PM || BOARD_TLSR9118BDK40D
192+
default PM
184193
help
185194
Use GPIO in an IRQ mode to avoid button polling loop and extend the battery lifetime by waking up by GPIO event.
186195
GPIO events are working only with GPIO IRQ. This option changes button matrix configuration.

0 commit comments

Comments
 (0)