Skip to content

Commit 78f6ec8

Browse files
rbultmanrbultman
committed
Merging from master
2 parents 9f4a39f + de796eb commit 78f6ec8

File tree

179 files changed

+4617
-2751
lines changed

Some content is hidden

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

179 files changed

+4617
-2751
lines changed

‎.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/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/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

‎.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-

‎.pullapprove.yml

+8
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,14 @@ groups:
173173
teams: [reviewers-samsung]
174174
reviews:
175175
request: 10
176+
shared-reviewers-eve:
177+
type: optional
178+
conditions:
179+
- files.include('*')
180+
reviewers:
181+
teams: [reviewers-eve]
182+
reviews:
183+
request: 10
176184
# shared-reviewers-signify disabled for now, because the reviewers-signify
177185
# team is empty and pullapprove seems to mis-handle that badly and treats
178186
# _all_ reviewers as being in this group.

‎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

+58
Original file line numberDiff line numberDiff line change
@@ -1229,4 +1229,62 @@ menu "CHIP Device Layer"
12291229

12301230
endmenu
12311231

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+
12321290
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"

‎docs/guides/infineon_trustm_provisioning.md

+13-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ can be used to perform provisioning by following the steps mentioned below.
3030

3131
```
3232
$ cd linux-optiga-trust-m/
33-
$ ./trustm_installation_aarch64_script.sh
33+
$ git checkout provider_dev
34+
$ git submodule update -f
35+
$ ./provider_installation_script.sh
3436
```
3537

3638
- Run the script to generate Matter test DAC for lock-app using the public key
@@ -39,13 +41,13 @@ can be used to perform provisioning by following the steps mentioned below.
3941

4042
```
4143
$ cd scripts/matter_provisioning/
42-
$ ./matter_dac_provisioning.sh
44+
$ ./matter_test_provisioning.sh
4345
```
4446

4547
_Note:_
4648

47-
_By running this example matter_dac_provisioning.sh, the steps shown below are
48-
executed:_
49+
_By running this example `matter_test_provisioning.sh`, the steps shown below
50+
are executed:_
4951

5052
_Step1: Extract the public key from the Infineon pre-provisioned
5153
Certificate(0xE0E0) using openssl command._
@@ -55,7 +57,11 @@ _Step2: Generate DAC test certificate using the extracted public key, Signed by
5557
Please note that production devices cannot re-use these test keys/certificates.
5658

5759
_Step3: Write DAC test certificate into OPTIGA™ Trust M certificate slot
58-
0xE0E0_
60+
0xE0E0._
5961

60-
\_Step4: Write Matter test PAI into OPTIGA™ Trust M certificate slot
61-
0xE0E8 and test CD into OPTIGA™ Trust M Arbitrary OID 0xF1E0.
62+
_Step4: Write Matter test PAI into OPTIGA™ Trust M certificate slot 0xE0E8
63+
and test CD into OPTIGA™ Trust M Arbitrary OID 0xF1E0._
64+
65+
For certificate claim and OPTIGA™ Trust M MTR provisioning, please refer
66+
to our
67+
[README for Late-stage Provisioning](https://github.com/Infineon/linux-optiga-trust-m/blob/provider_dev/scripts/matter_provisioning/README.md#certificate-claiming)

‎examples/all-clusters-app/esp32/main/CMakeLists.txt

+3-14
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ set(SRC_DIRS_LIST
9696
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-synchronization-server"
9797
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/valve-configuration-and-control-server"
9898
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/dishwasher-alarm-server"
99-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/laundry-washer-controls-server"
100-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/laundry-washer-controls-server"
99+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/laundry-washer-controls-server"
100+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/laundry-washer-controls-server"
101101
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/laundry-dryer-controls-server"
102102
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/src"
103103
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/energy-preference-server"
@@ -136,20 +136,9 @@ if (CONFIG_ENABLE_ICD_SERVER)
136136
list(APPEND SRC_DIRS_LIST "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/icd")
137137
endif()
138138

139-
set(PRIV_REQUIRES_LIST chip QRCode bt app_update nvs_flash spi_flash openthread)
140-
141-
if(${IDF_TARGET} STREQUAL "esp32")
142-
list(APPEND PRIV_REQUIRES_LIST spidriver screen-framework)
143-
endif()
144-
145-
if(CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM)
146-
list(APPEND PRIV_REQUIRES_LIST led_strip)
147-
endif()
148-
149139
idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
150140
SRC_DIRS ${SRC_DIRS_LIST}
151-
EXCLUDE_SRCS ${EXCLUDE_SRCS}
152-
PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
141+
EXCLUDE_SRCS ${EXCLUDE_SRCS})
153142

154143
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
155144

‎examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt

+2-13
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ set(SRC_DIRS_LIST
8282
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/door-lock-server"
8383
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/occupancy-sensor-server"
8484
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/device-energy-management-server"
85-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/energy-evse-server"
85+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/energy-evse-server"
8686
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ethernet-network-diagnostics-server"
8787
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/localization-configuration-server"
8888
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-format-localization-server"
@@ -118,19 +118,8 @@ set(SRC_DIRS_LIST "${SRC_DIRS_LIST}"
118118
)
119119
endif (CONFIG_ENABLE_PW_RPC)
120120

121-
set(PRIV_REQUIRES_LIST chip QRCode bt driver app_update nvs_flash spi_flash openthread)
122-
123-
if(${IDF_TARGET} STREQUAL "esp32")
124-
list(APPEND PRIV_REQUIRES_LIST spidriver screen-framework)
125-
endif()
126-
127-
if(CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM)
128-
list(APPEND PRIV_REQUIRES_LIST led_strip)
129-
endif()
130-
131121
idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
132-
SRC_DIRS ${SRC_DIRS_LIST}
133-
PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
122+
SRC_DIRS ${SRC_DIRS_LIST})
134123

135124
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
136125

‎examples/bridge-app/esp32/main/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ idf_component_register(PRIV_INCLUDE_DIRS
4848
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/operational-credentials-server"
4949
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-commissioning-server"
5050
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/common"
51-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
52-
PRIV_REQUIRES chip QRCode bt nvs_flash)
51+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers")
5352

5453
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
5554

‎examples/chef/common/stubs.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -235,3 +235,7 @@ void emberAfWakeOnLanClusterInitCallback(EndpointId endpoint)
235235
WakeOnLan::SetDefaultDelegate(endpoint, &wakeOnLanManager);
236236
}
237237
#endif
238+
239+
// No-op function, used to force linking this file,
240+
// instead of the weak functions from other files
241+
extern "C" void chef_include_stubs_impl(void) {}

‎examples/chef/esp32/main/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,11 @@ endif (CONFIG_ENABLE_PW_RPC)
118118
idf_component_register(PRIV_INCLUDE_DIRS
119119
"${CHIP_SHELL_DIR}/shell_common/include"
120120
"${PRIV_INCLUDE_DIRS_LIST}"
121-
PRIV_REQUIRES chip nvs_flash bt console mbedtls QRCode tft screen-framework spidriver
122121
SRC_DIRS ${SRC_DIRS_LIST})
123122

123+
# Forces the linker to include common/stubs.cpp
124+
target_link_libraries(${COMPONENT_LIB} INTERFACE "-u chef_include_stubs_impl")
125+
124126
include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
125127
chip_app_component_codegen("${CHEF}/devices/${SAMPLE_NAME}.matter")
126128
chip_app_component_zapgen("${CHEF}/devices/${SAMPLE_NAME}.zap")

‎examples/energy-management-app/esp32/main/CMakeLists.txt

+1-8
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ set(SRC_DIRS_LIST
7272
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/electrical-power-measurement-server"
7373
)
7474

75-
set(PRIV_REQUIRES_LIST chip QRCode bt led_strip app_update openthread driver nvs_flash spi_flash)
76-
77-
if(${IDF_TARGET} STREQUAL "esp32")
78-
list(APPEND PRIV_REQUIRES_LIST spidriver screen-framework)
79-
endif()
80-
8175

8276
if (CONFIG_ENABLE_PW_RPC)
8377
# Append additional directories for RPC build
@@ -103,8 +97,7 @@ set(SRC_DIRS_LIST "${SRC_DIRS_LIST}"
10397
endif (CONFIG_ENABLE_PW_RPC)
10498

10599
idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
106-
SRC_DIRS ${SRC_DIRS_LIST}
107-
PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
100+
SRC_DIRS ${SRC_DIRS_LIST})
108101
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
109102

110103
include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")

‎examples/light-switch-app/esp32/main/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ idf_component_register(PRIV_INCLUDE_DIRS
5959
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/groups-server"
6060
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/group-key-mgmt-server"
6161
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-synchronization-server"
62-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/icd-management-server"
63-
PRIV_REQUIRES chip QRCode bt app_update driver nvs_flash spi_flash)
62+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/icd-management-server")
63+
6464
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
6565

6666
include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")

‎examples/light-switch-app/light-switch-common/light-switch-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2792,7 +2792,7 @@ endpoint 0 {
27922792
callback attribute acceptedCommandList;
27932793
callback attribute attributeList;
27942794
ram attribute featureMap default = 0x0B;
2795-
ram attribute clusterRevision default = 1;
2795+
ram attribute clusterRevision default = 2;
27962796

27972797
handle command SetUTCTime;
27982798
handle command SetTrustedTimeSource;

‎examples/light-switch-app/light-switch-common/light-switch-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3826,7 +3826,7 @@
38263826
"storageOption": "RAM",
38273827
"singleton": 0,
38283828
"bounded": 0,
3829-
"defaultValue": "1",
3829+
"defaultValue": "2",
38303830
"reportable": 1,
38313831
"minInterval": 1,
38323832
"maxInterval": 65534,

0 commit comments

Comments
 (0)