Skip to content

Commit db44286

Browse files
jlatusekjlatusek
committed
Merge remote-tracking branch 'upstream/master' into bump_CI_images
2 parents 5f5e8fa + ee49ebd commit db44286

File tree

745 files changed

+23133
-8830
lines changed

Some content is hidden

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

745 files changed

+23133
-8830
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ jobs:
9191
--no-print \
9292
--log-level info \
9393
src/app/zap-templates/zcl/data-model/chip/global-attributes.xml \
94+
src/app/zap-templates/zcl/data-model/chip/global-structs.xml \
95+
src/app/zap-templates/zcl/data-model/chip/semantic-tag-namespace-enums.xml \
9496
src/app/zap-templates/zcl/data-model/chip/access-control-definitions.xml \
9597
src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml \
9698
src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml \

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

‎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

+5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ import("//build_overrides/chip.gni")
1818
import("${chip_root}/build/chip/tools.gni")
1919
import("${chip_root}/src/platform/device.gni")
2020

21+
declare_args() {
22+
# Build monolithic test library.
23+
chip_monolithic_tests = false
24+
}
25+
2126
declare_args() {
2227
# Enable building tests.
2328
chip_build_tests = current_os != "freertos"

‎config/common/cmake/chip_gn.cmake

+6-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)

‎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")

‎docs/zap_clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ Generally regenerate using one of:
9090
| 257 | 0x101 | DoorLock |
9191
| 258 | 0x102 | WindowCovering |
9292
| 259 | 0x103 | BarrierControl |
93+
| 336 | 0x150 | ServiceArea |
9394
| 512 | 0x200 | PumpConfigurationAndControl |
9495
| 513 | 0x201 | Thermostat |
9596
| 514 | 0x202 | FanControl |

‎examples/air-purifier-app/cc32xx/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ ti_simplelink_executable("air-purifier_app") {
100100
"${chip_root}/examples/air-purifier-app/air-purifier-common",
101101
"${chip_root}/examples/platform/cc32xx:cc32xx-attestation-credentials",
102102
"${chip_root}/src/lib",
103+
"${chip_root}/src/platform/logging:default",
103104
"${chip_root}/src/setup_payload",
104105
]
105106

‎examples/all-clusters-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ asr_executable("clusters_app") {
108108
"${chip_root}/examples/common/QRCode",
109109
"${chip_root}/examples/providers:device_info_provider",
110110
"${chip_root}/src/lib",
111+
"${chip_root}/src/platform/logging:default",
111112
"${chip_root}/src/setup_payload",
112113
]
113114

‎examples/all-clusters-app/cc13x4_26x4/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ ti_simplelink_executable("all-clusters-app") {
9191
"${chip_root}/examples/all-clusters-app/all-clusters-common",
9292
"${chip_root}/examples/platform/cc13x4_26x4:cc13x4_26x4-attestation-credentials",
9393
"${chip_root}/src/lib",
94+
"${chip_root}/src/platform/logging:default",
9495
"${chip_root}/third_party/openthread:openthread",
9596
]
9697
defines = []

‎examples/all-clusters-app/infineon/psoc6/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ psoc6_executable("clusters_app") {
138138
"${chip_root}/examples/common/QRCode",
139139
"${chip_root}/examples/providers:device_info_provider",
140140
"${chip_root}/src/lib",
141+
"${chip_root}/src/platform/logging:default",
141142
"${chip_root}/src/setup_payload",
142143
]
143144

‎examples/all-clusters-app/nxp/mw320/BUILD.gn

+4-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ mw320_executable("shell_mw320") {
6363
"${chip_root}/src/setup_payload",
6464
]
6565

66-
deps = [ "${chip_root}/src/platform:syscalls_stub" ]
66+
deps = [
67+
"${chip_root}/src/platform:syscalls_stub",
68+
"${chip_root}/src/platform/logging:default",
69+
]
6770

6871
include_dirs = [
6972
"${chip_root}/src/platform/nxp/mw320",

‎examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn

+8-2
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,12 @@ rt_executable("all_cluster_app") {
168168
"${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
169169
"${common_example_dir}/icd/source/ICDUtil.cpp",
170170
"${common_example_dir}/matter_button/source/AppMatterButtonEmpty.cpp",
171-
"${common_example_dir}/matter_cli/source/AppMatterCli.cpp",
172171
]
173172

174-
deps = [ "${chip_root}/examples/${app_common_folder}" ]
173+
deps = [
174+
"${chip_root}/examples/${app_common_folder}",
175+
"${chip_root}/src/platform/logging:default",
176+
]
175177

176178
sources += [
177179
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
@@ -185,6 +187,10 @@ rt_executable("all_cluster_app") {
185187
"${chip_root}/examples/shell/shell_common:shell_common",
186188
"${chip_root}/src/lib/shell:shell",
187189
]
190+
sources += [
191+
"${common_example_dir}/matter_cli/source/AppCLIBase.cpp",
192+
"${common_example_dir}/matter_cli/source/AppCLIFreeRTOS.cpp",
193+
]
188194
}
189195

190196
if (chip_enable_ota_requestor) {

‎examples/all-clusters-minimal-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ asr_executable("clusters_minimal_app") {
9494
"${chip_root}/examples/common/QRCode",
9595
"${chip_root}/examples/providers:device_info_provider",
9696
"${chip_root}/src/lib",
97+
"${chip_root}/src/platform/logging:default",
9798
"${chip_root}/src/setup_payload",
9899
]
99100

‎examples/all-clusters-minimal-app/infineon/psoc6/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ psoc6_executable("clusters_minimal_app") {
126126
"${chip_root}/examples/common/QRCode",
127127
"${chip_root}/examples/providers:device_info_provider",
128128
"${chip_root}/src/lib",
129+
"${chip_root}/src/platform/logging:default",
129130
"${chip_root}/src/setup_payload",
130131
]
131132

‎examples/bridge-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ asr_executable("bridge_app") {
9595
"${chip_root}/examples/common/QRCode",
9696
"${chip_root}/examples/providers:device_info_provider",
9797
"${chip_root}/src/lib",
98+
"${chip_root}/src/platform/logging:default",
9899
"${chip_root}/src/setup_payload",
99100
]
100101

‎examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter

+136-9
Original file line numberDiff line numberDiff line change
@@ -1573,6 +1573,38 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
15731573
readonly attribute int16u clusterRevision = 65533;
15741574
}
15751575

1576+
/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
1577+
cluster TemperatureMeasurement = 1026 {
1578+
revision 1; // NOTE: Default/not specifically set
1579+
1580+
readonly attribute nullable temperature measuredValue = 0;
1581+
readonly attribute nullable temperature minMeasuredValue = 1;
1582+
readonly attribute nullable temperature maxMeasuredValue = 2;
1583+
readonly attribute optional int16u tolerance = 3;
1584+
readonly attribute command_id generatedCommandList[] = 65528;
1585+
readonly attribute command_id acceptedCommandList[] = 65529;
1586+
readonly attribute event_id eventList[] = 65530;
1587+
readonly attribute attrib_id attributeList[] = 65531;
1588+
readonly attribute bitmap32 featureMap = 65532;
1589+
readonly attribute int16u clusterRevision = 65533;
1590+
}
1591+
1592+
/** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
1593+
cluster RelativeHumidityMeasurement = 1029 {
1594+
revision 3;
1595+
1596+
readonly attribute nullable int16u measuredValue = 0;
1597+
readonly attribute nullable int16u minMeasuredValue = 1;
1598+
readonly attribute nullable int16u maxMeasuredValue = 2;
1599+
readonly attribute optional int16u tolerance = 3;
1600+
readonly attribute command_id generatedCommandList[] = 65528;
1601+
readonly attribute command_id acceptedCommandList[] = 65529;
1602+
readonly attribute event_id eventList[] = 65530;
1603+
readonly attribute attrib_id attributeList[] = 65531;
1604+
readonly attribute bitmap32 featureMap = 65532;
1605+
readonly attribute int16u clusterRevision = 65533;
1606+
}
1607+
15761608
endpoint 0 {
15771609
device type ma_rootdevice = 22, version 1;
15781610

@@ -1812,20 +1844,26 @@ endpoint 1 {
18121844
}
18131845

18141846
server cluster Thermostat {
1815-
ram attribute localTemperature;
1847+
ram attribute localTemperature default = 2800;
1848+
ram attribute absMinHeatSetpointLimit default = 700;
1849+
ram attribute absMaxHeatSetpointLimit default = 3000;
18161850
ram attribute absMinCoolSetpointLimit default = 1600;
1817-
ram attribute absMaxCoolSetpointLimit default = 3000;
1851+
ram attribute absMaxCoolSetpointLimit default = 3200;
18181852
ram attribute occupiedCoolingSetpoint default = 2600;
1853+
ram attribute occupiedHeatingSetpoint default = 2000;
1854+
ram attribute minHeatSetpointLimit default = 700;
1855+
ram attribute maxHeatSetpointLimit default = 3000;
18191856
ram attribute minCoolSetpointLimit default = 1600;
1820-
ram attribute maxCoolSetpointLimit default = 3000;
1821-
ram attribute controlSequenceOfOperation default = 0x00;
1822-
ram attribute systemMode default = 0x03;
1857+
ram attribute maxCoolSetpointLimit default = 3200;
1858+
ram attribute controlSequenceOfOperation default = 0x04;
1859+
ram attribute systemMode default = 0x01;
1860+
ram attribute ACLouverPosition default = 0;
18231861
callback attribute generatedCommandList;
18241862
callback attribute acceptedCommandList;
18251863
callback attribute eventList;
18261864
callback attribute attributeList;
1827-
ram attribute featureMap default = 2;
1828-
ram attribute clusterRevision default = 6;
1865+
ram attribute featureMap default = 3;
1866+
ram attribute clusterRevision default = 7;
18291867

18301868
handle command SetpointRaiseLower;
18311869
}
@@ -1835,16 +1873,19 @@ endpoint 1 {
18351873
ram attribute fanModeSequence default = 2;
18361874
ram attribute percentSetting default = 0;
18371875
ram attribute percentCurrent default = 0;
1876+
ram attribute airflowDirection default = 0;
18381877
callback attribute generatedCommandList;
18391878
callback attribute acceptedCommandList;
18401879
callback attribute eventList;
18411880
callback attribute attributeList;
1842-
ram attribute featureMap default = 0;
1881+
ram attribute featureMap default = 33;
18431882
ram attribute clusterRevision default = 1;
1883+
1884+
handle command Step;
18441885
}
18451886

18461887
server cluster ThermostatUserInterfaceConfiguration {
1847-
ram attribute temperatureDisplayMode default = 0x01;
1888+
ram attribute temperatureDisplayMode default = 0x00;
18481889
ram attribute keypadLockout default = 0x00;
18491890
callback attribute generatedCommandList;
18501891
callback attribute acceptedCommandList;
@@ -1854,5 +1895,91 @@ endpoint 1 {
18541895
ram attribute clusterRevision default = 2;
18551896
}
18561897
}
1898+
endpoint 2 {
1899+
device type ma_tempsensor = 770, version 1;
1900+
1901+
1902+
server cluster Identify {
1903+
ram attribute identifyTime default = 0x0;
1904+
ram attribute identifyType default = 0x00;
1905+
callback attribute generatedCommandList;
1906+
callback attribute acceptedCommandList;
1907+
callback attribute eventList;
1908+
callback attribute attributeList;
1909+
ram attribute featureMap default = 0;
1910+
ram attribute clusterRevision default = 4;
1911+
1912+
handle command Identify;
1913+
handle command TriggerEffect;
1914+
}
1915+
1916+
server cluster Descriptor {
1917+
callback attribute deviceTypeList;
1918+
callback attribute serverList;
1919+
callback attribute clientList;
1920+
callback attribute partsList;
1921+
callback attribute generatedCommandList;
1922+
callback attribute acceptedCommandList;
1923+
callback attribute eventList;
1924+
callback attribute attributeList;
1925+
callback attribute featureMap;
1926+
callback attribute clusterRevision;
1927+
}
1928+
1929+
server cluster TemperatureMeasurement {
1930+
ram attribute measuredValue default = 2800;
1931+
ram attribute minMeasuredValue default = 1500;
1932+
ram attribute maxMeasuredValue default = 4500;
1933+
callback attribute generatedCommandList;
1934+
callback attribute acceptedCommandList;
1935+
callback attribute eventList;
1936+
callback attribute attributeList;
1937+
ram attribute featureMap default = 0;
1938+
ram attribute clusterRevision default = 3;
1939+
}
1940+
}
1941+
endpoint 3 {
1942+
device type ma_humiditysensor = 775, version 1;
1943+
1944+
1945+
server cluster Identify {
1946+
ram attribute identifyTime default = 0x0;
1947+
ram attribute identifyType default = 0x00;
1948+
callback attribute generatedCommandList;
1949+
callback attribute acceptedCommandList;
1950+
callback attribute eventList;
1951+
callback attribute attributeList;
1952+
ram attribute featureMap default = 0;
1953+
ram attribute clusterRevision default = 4;
1954+
1955+
handle command Identify;
1956+
handle command TriggerEffect;
1957+
}
1958+
1959+
server cluster Descriptor {
1960+
callback attribute deviceTypeList;
1961+
callback attribute serverList;
1962+
callback attribute clientList;
1963+
callback attribute partsList;
1964+
callback attribute generatedCommandList;
1965+
callback attribute acceptedCommandList;
1966+
callback attribute eventList;
1967+
callback attribute attributeList;
1968+
callback attribute featureMap;
1969+
callback attribute clusterRevision;
1970+
}
1971+
1972+
server cluster RelativeHumidityMeasurement {
1973+
ram attribute measuredValue default = 6500;
1974+
ram attribute minMeasuredValue default = 3000;
1975+
ram attribute maxMeasuredValue default = 10000;
1976+
callback attribute generatedCommandList;
1977+
callback attribute acceptedCommandList;
1978+
callback attribute eventList;
1979+
callback attribute attributeList;
1980+
ram attribute featureMap default = 0;
1981+
ram attribute clusterRevision default = 3;
1982+
}
1983+
}
18571984

18581985

0 commit comments

Comments
 (0)