Merge remote-tracking branch 'upstream/master' into ubuntu-qemu

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

@@ -61,7 +61,7 @@ jobs:
  - name: Build Linux tv-casting-app
  run: |
  ./scripts/run_in_build_env.sh \
- "scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app"
+ "scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app chip_casting_simplified=true"
 
  - name: Test casting from Linux tv-casting-app to Linux tv-app
  run: |

.github/workflows/tests.yaml

@@ -91,6 +91,8 @@ jobs:
  --no-print \
  --log-level info \
  src/app/zap-templates/zcl/data-model/chip/global-attributes.xml \
+ src/app/zap-templates/zcl/data-model/chip/global-structs.xml \
+ src/app/zap-templates/zcl/data-model/chip/semantic-tag-namespace-enums.xml \
  src/app/zap-templates/zcl/data-model/chip/access-control-definitions.xml \
  src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml \
  src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml \

.gitmodules

@@ -231,10 +231,10 @@
  url = https://github.com/SiliconLabs/sdk_support.git
  branch = main
  platforms = silabs,silabs_docker
-[submodule "third_party/silabs/gecko_sdk"]
- path = third_party/silabs/gecko_sdk
- url = https://github.com/SiliconLabs/gecko_sdk.git
- branch = v4.4.2
+[submodule "third_party/silabs/simplicity_sdk"]
+ path = third_party/silabs/simplicity_sdk
+ url = https://github.com/SiliconLabs/simplicity_sdk.git
+ branch = v2024.6.0
  platforms = silabs
 [submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
  path = third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -244,7 +244,7 @@
 [submodule "third_party/silabs/wifi_sdk"]
  path = third_party/silabs/wifi_sdk
  url = https://github.com/SiliconLabs/wiseconnect.git
- branch = v3.1.3-matter-hotfix.4
+ branch = v3.3.0
  platforms = silabs
 [submodule "editline"]
  path = third_party/editline/repo

build/chip/chip_test_suite.gni

@@ -94,9 +94,12 @@ template("chip_test_suite") {
 
  deps = [ dir_pw_unit_test ]
 
- if (current_os != "zephyr" && current_os != "mbed") {
+ if (current_os != "zephyr" && current_os != "mbed" &&
+ chip_device_platform != "efr32") {
  # Depend on stdio logging, and have it take precedence over the default platform backend
- public_deps += [ "${chip_root}/src/platform/logging:force_stdio" ]
+ public_deps += [ "${chip_root}/src/platform/logging:stdio" ]
+ } else {
+ public_deps += [ "${chip_root}/src/platform/logging:default" ]
  }
  }
  if (chip_link_tests) {

build/chip/tests.gni

@@ -18,6 +18,11 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/build/chip/tools.gni")
 import("${chip_root}/src/platform/device.gni")
 
+declare_args() {
+ # Build monolithic test library.
+ chip_monolithic_tests = false
+}
+
 declare_args() {
  # Enable building tests.
  chip_build_tests = current_os != "freertos"

config/common/cmake/chip_gn.cmake

@@ -77,6 +77,7 @@ macro(matter_build target)
  LIB_PW_RPC
  LIB_MBEDTLS
  DEVICE_INFO_EXAMPLE_PROVIDER
+ FORCE_LOGGING_STDIO
  )
  set(multiValueArgs GN_DEPENDENCIES)
 
@@ -85,7 +86,11 @@ macro(matter_build target)
  set(MATTER_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/lib)
 
  # Prepare Matter libraries that the application should be linked with
- set(MATTER_LIBRARIES -lCHIP)
+ if (FORCE_LOGGING_STDIO)
+ set(MATTER_LIBRARIES -lCHIPWithStdioLogging)
+ else()
+ set(MATTER_LIBRARIES -lCHIP)
+ endif()
 
  if (ARG_LIB_MBEDTLS)
  list(APPEND MATTER_LIBRARIES -lmbedtls)

config/openiotsdk/CMakeLists.txt

@@ -79,6 +79,7 @@ matter_build(chip
  LIB_SHELL ${CONFIG_CHIP_LIB_SHELL}
  LIB_TESTS ${CONFIG_CHIP_LIB_TESTS}
  GN_DEPENDENCIES ${CONFIG_GN_DEPENDENCIES}
+ FORCE_LOGGING_STDIO ${CONFIG_CHIP_FORCE_LOGGING_STDIO}
 )
 
 target_link_libraries(chip INTERFACE

config/openiotsdk/cmake/chip.cmake

@@ -27,6 +27,7 @@ set(CONFIG_CHIP_PROJECT_CONFIG_INCLUDE_DIRS "" CACHE STRING "")
 set(CONFIG_CHIP_LIB_TESTS NO CACHE BOOL "")
 set(CONFIG_CHIP_LIB_SHELL NO CACHE BOOL "")
 
+set(CONFIG_CHIP_FORCE_LOGGING_STDIO NO CACHE BOOL "Enable stdio logging backend")
 set(CONFIG_CHIP_DETAIL_LOGGING YES CACHE BOOL "Enable logging at detail level")
 set(CONFIG_CHIP_PROGRESS_LOGGING YES CACHE BOOL "Enable logging at progress level")
 set(CONFIG_CHIP_AUTOMATION_LOGGING YES CACHE BOOL "Enable logging at automation level")

docs/zap_clusters.md

@@ -90,6 +90,7 @@ Generally regenerate using one of:
 | 257 | 0x101 | DoorLock |
 | 258 | 0x102 | WindowCovering |
 | 259 | 0x103 | BarrierControl |
+| 336 | 0x150 | ServiceArea |
 | 512 | 0x200 | PumpConfigurationAndControl |
 | 513 | 0x201 | Thermostat |
 | 514 | 0x202 | FanControl |

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

@@ -100,6 +100,7 @@ ti_simplelink_executable("air-purifier_app") {
  "${chip_root}/examples/air-purifier-app/air-purifier-common",
  "${chip_root}/examples/platform/cc32xx:cc32xx-attestation-credentials",
  "${chip_root}/src/lib",
+ "${chip_root}/src/platform/logging:default",
  "${chip_root}/src/setup_payload",
  ]
 

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

@@ -108,6 +108,7 @@ asr_executable("clusters_app") {
  "${chip_root}/examples/common/QRCode",
  "${chip_root}/examples/providers:device_info_provider",
  "${chip_root}/src/lib",
+ "${chip_root}/src/platform/logging:default",
  "${chip_root}/src/setup_payload",
  ]
 

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

@@ -91,6 +91,7 @@ ti_simplelink_executable("all-clusters-app") {
  "${chip_root}/examples/all-clusters-app/all-clusters-common",
  "${chip_root}/examples/platform/cc13x4_26x4:cc13x4_26x4-attestation-credentials",
  "${chip_root}/src/lib",
+ "${chip_root}/src/platform/logging:default",
  "${chip_root}/third_party/openthread:openthread",
  ]
  defines = []

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

@@ -138,6 +138,7 @@ psoc6_executable("clusters_app") {
  "${chip_root}/examples/common/QRCode",
  "${chip_root}/examples/providers:device_info_provider",
  "${chip_root}/src/lib",
+ "${chip_root}/src/platform/logging:default",
  "${chip_root}/src/setup_payload",
  ]
 

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

@@ -63,7 +63,10 @@ mw320_executable("shell_mw320") {
  "${chip_root}/src/setup_payload",
  ]
 
- deps = [ "${chip_root}/src/platform:syscalls_stub" ]
+ deps = [
+ "${chip_root}/src/platform:syscalls_stub",
+ "${chip_root}/src/platform/logging:default",
+ ]
 
  include_dirs = [
  "${chip_root}/src/platform/nxp/mw320",

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

@@ -168,10 +168,12 @@ rt_executable("all_cluster_app") {
  "${common_example_dir}/device_manager/source/CHIPDeviceManager.cpp",
  "${common_example_dir}/icd/source/ICDUtil.cpp",
  "${common_example_dir}/matter_button/source/AppMatterButtonEmpty.cpp",
- "${common_example_dir}/matter_cli/source/AppMatterCli.cpp",
  ]
 
- deps = [ "${chip_root}/examples/${app_common_folder}" ]
+ deps = [
+ "${chip_root}/examples/${app_common_folder}",
+ "${chip_root}/src/platform/logging:default",
+ ]
 
  sources += [
  "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
@@ -185,6 +187,10 @@ rt_executable("all_cluster_app") {
  "${chip_root}/examples/shell/shell_common:shell_common",
  "${chip_root}/src/lib/shell:shell",
  ]
+ sources += [
+ "${common_example_dir}/matter_cli/source/AppCLIBase.cpp",
+ "${common_example_dir}/matter_cli/source/AppCLIFreeRTOS.cpp",
+ ]
  }
 
  if (chip_enable_ota_requestor) {

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

@@ -94,6 +94,7 @@ asr_executable("clusters_minimal_app") {
  "${chip_root}/examples/common/QRCode",
  "${chip_root}/examples/providers:device_info_provider",
  "${chip_root}/src/lib",
+ "${chip_root}/src/platform/logging:default",
  "${chip_root}/src/setup_payload",
  ]
 

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

@@ -126,6 +126,7 @@ psoc6_executable("clusters_minimal_app") {
  "${chip_root}/examples/common/QRCode",
  "${chip_root}/examples/providers:device_info_provider",
  "${chip_root}/src/lib",
+ "${chip_root}/src/platform/logging:default",
  "${chip_root}/src/setup_payload",
  ]
 

examples/bridge-app/asr/BUILD.gn

@@ -95,6 +95,7 @@ asr_executable("bridge_app") {
  "${chip_root}/examples/common/QRCode",
  "${chip_root}/examples/providers:device_info_provider",
  "${chip_root}/src/lib",
+ "${chip_root}/src/platform/logging:default",
  "${chip_root}/src/setup_payload",
  ]
 

examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter

@@ -1573,6 +1573,38 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
  readonly attribute int16u clusterRevision = 65533;
 }
 
+/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
+cluster TemperatureMeasurement = 1026 {
+ revision 1; // NOTE: Default/not specifically set
+
+ readonly attribute nullable temperature measuredValue = 0;
+ readonly attribute nullable temperature minMeasuredValue = 1;
+ readonly attribute nullable temperature maxMeasuredValue = 2;
+ readonly attribute optional int16u tolerance = 3;
+ readonly attribute command_id generatedCommandList[] = 65528;
+ readonly attribute command_id acceptedCommandList[] = 65529;
+ readonly attribute event_id eventList[] = 65530;
+ readonly attribute attrib_id attributeList[] = 65531;
+ readonly attribute bitmap32 featureMap = 65532;
+ readonly attribute int16u clusterRevision = 65533;
+}
+
+/** Attributes and commands for configuring the measurement of relative humidity, and reporting relative humidity measurements. */
+cluster RelativeHumidityMeasurement = 1029 {
+ revision 3;
+
+ readonly attribute nullable int16u measuredValue = 0;
+ readonly attribute nullable int16u minMeasuredValue = 1;
+ readonly attribute nullable int16u maxMeasuredValue = 2;
+ readonly attribute optional int16u tolerance = 3;
+ readonly attribute command_id generatedCommandList[] = 65528;
+ readonly attribute command_id acceptedCommandList[] = 65529;
+ readonly attribute event_id eventList[] = 65530;
+ readonly attribute attrib_id attributeList[] = 65531;
+ readonly attribute bitmap32 featureMap = 65532;
+ readonly attribute int16u clusterRevision = 65533;
+}
+
 endpoint 0 {
  device type ma_rootdevice = 22, version 1;
 
@@ -1812,20 +1844,26 @@ endpoint 1 {
  }
 
  server cluster Thermostat {
- ram attribute localTemperature;
+ ram attribute localTemperature default = 2800;
+ ram attribute absMinHeatSetpointLimit default = 700;
+ ram attribute absMaxHeatSetpointLimit default = 3000;
  ram attribute absMinCoolSetpointLimit default = 1600;
- ram attribute absMaxCoolSetpointLimit default = 3000;
+ ram attribute absMaxCoolSetpointLimit default = 3200;
  ram attribute occupiedCoolingSetpoint default = 2600;
+ ram attribute occupiedHeatingSetpoint default = 2000;
+ ram attribute minHeatSetpointLimit default = 700;
+ ram attribute maxHeatSetpointLimit default = 3000;
  ram attribute minCoolSetpointLimit default = 1600;
- ram attribute maxCoolSetpointLimit default = 3000;
- ram attribute controlSequenceOfOperation default = 0x00;
- ram attribute systemMode default = 0x03;
+ ram attribute maxCoolSetpointLimit default = 3200;
+ ram attribute controlSequenceOfOperation default = 0x04;
+ ram attribute systemMode default = 0x01;
+ ram attribute ACLouverPosition default = 0;
  callback attribute generatedCommandList;
  callback attribute acceptedCommandList;
  callback attribute eventList;
  callback attribute attributeList;
- ram attribute featureMap default = 2;
- ram attribute clusterRevision default = 6;
+ ram attribute featureMap default = 3;
+ ram attribute clusterRevision default = 7;
 
  handle command SetpointRaiseLower;
  }
@@ -1835,16 +1873,19 @@ endpoint 1 {
  ram attribute fanModeSequence default = 2;
  ram attribute percentSetting default = 0;
  ram attribute percentCurrent default = 0;
+ ram attribute airflowDirection default = 0;
  callback attribute generatedCommandList;
  callback attribute acceptedCommandList;
  callback attribute eventList;
  callback attribute attributeList;
- ram attribute featureMap default = 0;
+ ram attribute featureMap default = 33;
  ram attribute clusterRevision default = 1;
+
+ handle command Step;
  }
 
  server cluster ThermostatUserInterfaceConfiguration {
- ram attribute temperatureDisplayMode default = 0x01;
+ ram attribute temperatureDisplayMode default = 0x00;
  ram attribute keypadLockout default = 0x00;
  callback attribute generatedCommandList;
  callback attribute acceptedCommandList;
@@ -1854,5 +1895,91 @@ endpoint 1 {
  ram attribute clusterRevision default = 2;
  }
 }
+endpoint 2 {
+ device type ma_tempsensor = 770, version 1;
+
+
+ server cluster Identify {
+ ram attribute identifyTime default = 0x0;
+ ram attribute identifyType default = 0x00;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute eventList;
+ callback attribute attributeList;
+ ram attribute featureMap default = 0;
+ ram attribute clusterRevision default = 4;
+
+ handle command Identify;
+ handle command TriggerEffect;
+ }
+
+ server cluster Descriptor {
+ callback attribute deviceTypeList;
+ callback attribute serverList;
+ callback attribute clientList;
+ callback attribute partsList;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute eventList;
+ callback attribute attributeList;
+ callback attribute featureMap;
+ callback attribute clusterRevision;
+ }
+
+ server cluster TemperatureMeasurement {
+ ram attribute measuredValue default = 2800;
+ ram attribute minMeasuredValue default = 1500;
+ ram attribute maxMeasuredValue default = 4500;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute eventList;
+ callback attribute attributeList;
+ ram attribute featureMap default = 0;
+ ram attribute clusterRevision default = 3;
+ }
+}
+endpoint 3 {
+ device type ma_humiditysensor = 775, version 1;
+
+
+ server cluster Identify {
+ ram attribute identifyTime default = 0x0;
+ ram attribute identifyType default = 0x00;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute eventList;
+ callback attribute attributeList;
+ ram attribute featureMap default = 0;
+ ram attribute clusterRevision default = 4;
+
+ handle command Identify;
+ handle command TriggerEffect;
+ }
+
+ server cluster Descriptor {
+ callback attribute deviceTypeList;
+ callback attribute serverList;
+ callback attribute clientList;
+ callback attribute partsList;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute eventList;
+ callback attribute attributeList;
+ callback attribute featureMap;
+ callback attribute clusterRevision;
+ }
+
+ server cluster RelativeHumidityMeasurement {
+ ram attribute measuredValue default = 6500;
+ ram attribute minMeasuredValue default = 3000;
+ ram attribute maxMeasuredValue default = 10000;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute eventList;
+ callback attribute attributeList;
+ ram attribute featureMap default = 0;
+ ram attribute clusterRevision default = 3;
+ }
+}