Skip to content

Commit c39d0e9

Browse files
nivi-applenivi-apple
authored
Merge branch 'master' into add_support_for_device_changed_notification_rebased
2 parents e964cd1 + 4b58ad2 commit c39d0e9

File tree

438 files changed

+14539
-11686
lines changed

Some content is hidden

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

438 files changed

+14539
-11686
lines changed

‎.clang-format

+1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ SpacesInSquareBrackets: false
106106
Standard: Cpp11
107107
TabWidth: 8
108108
UseTab: Never
109+
InsertNewlineAtEOF: true
109110
---
110111
Language: ObjC
111112
BasedOnStyle: WebKit

‎.github/.wordlist.txt

+1
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ MoveWithOnOff
905905
MPSL
906906
MRP
907907
MTD
908+
MTR
908909
MTU
909910
Multiband
910911
Multicast

‎.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ jobs:
371371
372372
build_darwin:
373373
name: Build on Darwin (clang, python_lib, simulated)
374-
runs-on: macos-latest
374+
runs-on: macos-13
375375
if: github.actor != 'restyled-io[bot]'
376376

377377
steps:

‎.github/workflows/check-data-model-directory-updates.yaml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright (c) 2024 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: Check for changes to data_model directory without a sha update
16+
17+
on:
18+
pull_request:
19+
paths:
20+
- "data_model/**"
21+
22+
jobs:
23+
check-submodule-update-label:
24+
name: Check for changes to data_model directory without a sha update
25+
runs-on: ubuntu-latest
26+
if: "git diff --name-only HEAD^..HEAD data_model/ | grep -q spec_sha"
27+
steps:
28+
- name: Error Message
29+
run: echo This pull request attempts to update data_model directory, but is missing updates to spec_sha file with the latest version of the sha. Files in the data_model directory are generated automatically and should not be updated manually.
30+
- name: Fail Job
31+
run: exit 1

‎.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

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

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ name: Test TV Casting Example
1717
on:
1818
push:
1919
branches-ignore:
20-
- 'dependabot/**'
20+
- "dependabot/**"
2121
pull_request:
2222
merge_group:
2323

@@ -63,6 +63,12 @@ jobs:
6363
./scripts/run_in_build_env.sh \
6464
"scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app"
6565
66+
- name: Test casting from Linux tv-casting-app to Linux tv-app
67+
run: |
68+
./scripts/run_in_build_env.sh \
69+
"python3 ./scripts/tests/run_tv_casting_test.py"
70+
timeout-minutes: 1
71+
6672
- name: Uploading Size Reports
6773
uses: ./.github/actions/upload-size-reports
6874
if: ${{ !env.ACT }}

‎.github/workflows/fuzzing-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
build_darwin_fuzzing:
7070
name: Build on Darwin
71-
runs-on: macos-latest
71+
runs-on: macos-13
7272
if: github.actor != 'restyled-io[bot]'
7373

7474
steps:

‎.github/workflows/release_artifacts.yaml

+6-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323

2424
env:
2525
CHIP_NO_LOG_TIMESTAMPS: true
26-
26+
2727
jobs:
2828
esp32:
2929
name: ESP32
@@ -38,7 +38,7 @@ jobs:
3838
- name: Checkout
3939
uses: actions/checkout@v4
4040
with:
41-
ref: "${{ github.event.inputs.releaseTag }}"
41+
ref: "${{ github.event.inputs.releaseTag }}"
4242
- name: Bootstrap
4343
uses: ./.github/actions/bootstrap
4444

@@ -64,17 +64,18 @@ jobs:
6464
runs-on: ubuntu-latest
6565

6666
container:
67-
image: ghcr.io/project-chip/chip-build-efr32:47
67+
image: ghcr.io/project-chip/chip-build-efr32:49
6868
steps:
6969
- name: Checkout
7070
uses: actions/checkout@v4
7171
with:
72-
ref: "${{ github.event.inputs.releaseTag }}"
72+
ref: "${{ github.event.inputs.releaseTag }}"
7373
- name: Bootstrap
7474
uses: ./.github/actions/bootstrap
7575

7676
- name: Build example EFR32 Lock App
77-
run: scripts/examples/gn_silabs_example.sh examples/lock-app/efr32/
77+
run:
78+
scripts/examples/gn_silabs_example.sh examples/lock-app/efr32/
7879
out/lock_app_debug $SILABS_BOARD
7980

8081
- name: Upload artifact

‎.github/workflows/tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ jobs:
330330
LSAN_OPTIONS: detect_leaks=1 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
331331

332332
if: github.actor != 'restyled-io[bot]'
333-
runs-on: macos-latest
333+
runs-on: macos-13
334334

335335
steps:
336336
- name: Checkout
@@ -588,7 +588,7 @@ jobs:
588588
TSAN_OPTIONS: "halt_on_error=1"
589589

590590
if: github.actor != 'restyled-io[bot]' && false
591-
runs-on: macos-latest
591+
runs-on: macos-13
592592

593593
steps:
594594
- name: Checkout

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
# Build System
1212
out/
13+
/examples/virtual-device-app/android/App/buildSrc/build/
1314
/src/test_driver/nrfconnect/build/
1415
/src/darwin/Framework/build/
1516

‎.gitmodules

+2-3
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
[submodule "third_party/silabs/gecko_sdk"]
245245
path = third_party/silabs/gecko_sdk
246246
url = https://github.com/SiliconLabs/gecko_sdk.git
247-
branch = v4.4.1
247+
branch = v4.4.2
248248
platforms = silabs
249249
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
250250
path = third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -254,7 +254,7 @@
254254
[submodule "third_party/silabs/wifi_sdk"]
255255
path = third_party/silabs/wifi_sdk
256256
url = https://github.com/SiliconLabs/wiseconnect.git
257-
branch = v3.1.3
257+
branch = v3.1.3-matter-hotfix.4
258258
platforms = silabs
259259
[submodule "editline"]
260260
path = third_party/editline/repo
@@ -334,4 +334,3 @@
334334
url = https://github.com/Infineon/optiga-trust-m.git
335335
branch = matter_support
336336
platforms = infineon
337-

‎build/chip/tools.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ declare_args() {
1919
chip_build_tools = current_os != "freertos" && current_os != "android" &&
2020
chip_device_platform != "fake"
2121
chip_can_build_cert_tool =
22-
chip_crypto == "openssl" ||
22+
chip_crypto == "openssl" || chip_crypto == "boringssl" ||
2323
(chip_crypto == "" &&
2424
(current_os != "android" && current_os != "freertos" &&
2525
current_os != "zephyr" && current_os != "mbed" &&

‎config/ameba/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ lwip_platform = "external"
2828

2929
chip_build_tests = false
3030

31-
chip_inet_config_enable_tcp_endpoint = true
31+
chip_inet_config_enable_tcp_endpoint = false
3232
chip_inet_config_enable_udp_endpoint = true
3333

3434
chip_config_network_layer_ble = true

‎config/beken/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ lwip_platform = "external"
2626

2727
chip_build_tests = false
2828

29-
chip_inet_config_enable_tcp_endpoint = true
29+
chip_inet_config_enable_tcp_endpoint = false
3030
chip_inet_config_enable_udp_endpoint = true
3131

3232
chip_config_network_layer_ble = true

‎config/esp32/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ lwip_platform = "external"
2626

2727
#Enabling this causes some error
2828
#chip_inet_config_enable_tun_endpoint = false
29-
chip_inet_config_enable_tcp_endpoint = true
29+
chip_inet_config_enable_tcp_endpoint = false
3030
chip_inet_config_enable_udp_endpoint = true
3131

3232
custom_toolchain = "//third_party/connectedhomeip/config/esp32/toolchain:esp32"

‎config/esp32/components/chip/Kconfig

+65-6
Original file line numberDiff line numberDiff line change
@@ -726,12 +726,13 @@ menu "CHIP Device Layer"
726726
should not start advertising automatically after power-up.
727727

728728
config USE_BLE_ONLY_FOR_COMMISSIONING
729-
bool "Use BLE only for commissioning"
730-
default y
731-
help
732-
Disable this flag if BLE is used for any other purpose than commissioning.
733-
When enabled, it deinitialized the BLE on successful commissioning, and on
734-
bootup do not initialize the BLE if device is already provisioned with Wi-Fi/Thread credentials.
729+
depends on BT_ENABLED
730+
bool "Use BLE only for commissioning"
731+
default y
732+
help
733+
Disable this flag if BLE is used for any other purpose than commissioning.
734+
When enabled, it deinitialized the BLE on successful commissioning, and on
735+
bootup do not initialize the BLE if device is already provisioned with Wi-Fi/Thread credentials.
735736

736737
endmenu
737738

@@ -1228,4 +1229,62 @@ menu "CHIP Device Layer"
12281229

12291230
endmenu
12301231

1232+
menu "Message Reliable Protocol Options"
1233+
config MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_THREAD
1234+
int "MRP local active retry interval for Thread network in milliseconds"
1235+
depends on OPENTHREAD_ENABLED
1236+
range 0 3600000
1237+
default 800
1238+
help
1239+
Base retry interval of the present Thread node when it is in the active state.
1240+
1241+
config MRP_LOCAL_ACTIVE_RETRY_INTERVAL_FOR_WIFI_ETHERNET
1242+
int "MRP local active retry interval for WIFI or ETHERNET network in milliseconds"
1243+
depends on !OPENTHREAD_ENABLED
1244+
range 0 3600000
1245+
default 300
1246+
help
1247+
Base retry interval of the present node (WIFI or ETHERNET) when it is in the active state.
1248+
1249+
config MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_THREAD
1250+
int "MRP local idle retry interval for Thread network in milliseconds"
1251+
depends on OPENTHREAD_ENABLED
1252+
range 0 3600000
1253+
default 800
1254+
help
1255+
Base retry interval of the present Thread node when it is in the idle state.
1256+
1257+
config MRP_LOCAL_IDLE_RETRY_INTERVAL_FOR_WIFI_ETHERNET
1258+
int "MRP local idle retry interval for WIFI or ETHERNET network in milliseconds"
1259+
depends on !OPENTHREAD_ENABLED
1260+
range 0 3600000
1261+
default 500
1262+
help
1263+
Base retry interval of the present node (WIFI or ETHERNET) when it is in the idle state.
1264+
1265+
config MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_THREAD
1266+
int "MRP retransmission delta timeout for Thread network in milliseconds"
1267+
depends on OPENTHREAD_ENABLED
1268+
range 0 3600000
1269+
default 500
1270+
help
1271+
A constant value added to the calculated retransmission timeout.
1272+
1273+
config MRP_RETRY_INTERVAL_SENDER_BOOST_FOR_WIFI_ETHERNET
1274+
int "MRP retransmission delta timeout for WIFI or ETHERNET network in milliseconds"
1275+
depends on !OPENTHREAD_ENABLED
1276+
range 0 3600000
1277+
default 0
1278+
help
1279+
A constant value added to the calculated retransmission timeout.
1280+
1281+
config MRP_MAX_RETRANS
1282+
int "MRP retransmission maximum count"
1283+
range 1 10
1284+
default 4
1285+
help
1286+
The maximum number of retransmissions before giving up.
1287+
1288+
endmenu
1289+
12311290
endmenu

‎config/genio/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ lwip_platform = "external"
2424

2525
chip_build_tests = true
2626

27-
chip_inet_config_enable_tcp_endpoint = true
27+
chip_inet_config_enable_tcp_endpoint = false
2828
chip_inet_config_enable_udp_endpoint = true
2929

3030
custom_toolchain = "//third_party/connectedhomeip/config/genio/toolchain:genio"

‎config/mbed/chip-gn/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ chip_system_project_config_include = ""
2121
chip_device_project_config_include = ""
2222

2323
chip_inet_config_enable_udp_endpoint = true
24-
chip_inet_config_enable_tcp_endpoint = true
24+
chip_inet_config_enable_tcp_endpoint = false
2525

2626
custom_toolchain = "${chip_root}/config/mbed/chip-gn/toolchain:mbed"
2727
mbedtls_target = "${chip_root}/config/mbed/chip-gn/mbedtls:mbedtls"

‎config/nrfconnect/app/enable-gnu-std.cmake

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
add_library(gnu17 INTERFACE)
22
target_compile_options(gnu17
33
INTERFACE
4-
$<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
5-
-D_SYS__PTHREADTYPES_H_)
4+
$<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
65
target_link_libraries(app PRIVATE gnu17)

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ else()
168168
endif()
169169

170170
if (CONFIG_CHIP_CRYPTO_PSA)
171-
matter_add_gn_arg_string("chip_crypto" "psa")
171+
matter_add_gn_arg_string("chip_crypto" "psa")
172+
matter_add_gn_arg_bool ("chip_crypto_psa_spake2p" CONFIG_PSA_WANT_ALG_SPAKE2P_MATTER)
172173
endif()
173174

174175
if (BOARD STREQUAL "native_posix")

‎config/nrfconnect/chip-module/Kconfig

+5
Original file line numberDiff line numberDiff line change
@@ -302,4 +302,9 @@ config CHIP_FACTORY_RESET_ON_KEY_MIGRATION_FAILURE
302302
Perform factory reset of the device if the operational key for Fabric has not been migrated
303303
properly to PSA ITS storage.
304304

305+
config CHIP_PERSISTENT_SUBSCRIPTIONS
306+
default n
307+
# selecting experimental for this feature since there is an issue with multiple controllers.
308+
select EXPERIMENTAL
309+
305310
endif # CHIP

0 commit comments

Comments
 (0)