Merge branch 'master' into Add_tests_for_new_pause_and_resume_compati…

…ble_states
project-chip · Jan 18, 2024 · de3749f · de3749f
2 parents 3d10c16 + 88c0d58
commit de3749f
Show file tree

Hide file tree

Showing 503 changed files with 140,269 additions and 93,555 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -17,6 +17,7 @@ ables
 AccessControl
 AccessControlEntry
 accessor
+Accessors
 AccountLogin
 acdbc
 ack
@@ -31,7 +32,9 @@ AddNOC
 AddOrUpdateThreadNetwork
 AddOrUpdateWiFiNetwork
 addr
+AddResponse
 AddThreadNetwork
+AddStatus
 adk
 AdministratorCommissioning
 adoc
@@ -97,6 +100,7 @@ att
 attId
 attr
 attrib
+AttributeAccessInterface
 attributeValue
 attrListName
 attrMask
@@ -256,6 +260,7 @@ clusterAttrs
 clusterId
 clusterList
 clusterListName
+ClusterName
 ClusterObjectTests
 ClusterRevision
 ClusterTestGeneration
@@ -276,6 +281,8 @@ codelabs
 ColorControl
 Comcast
 Commandline
+CommandHandlerInterface
+CommandName
 Commissionable
 CommissionableDataProvider
 commissionables
@@ -289,6 +296,7 @@ configs
 configTOTAL
 ConfigurationManager
 ConfigurationManagerImpl
+conformant
 connectedhomeip
 ConnectionData
 ConnectIP
@@ -490,8 +498,11 @@ eg
 EjQ
 elftools
 elock
+emberAf
 emberAfExternalAttributeReadCallback
 emberAfExternalAttributeWriteCallback
+EmberAfInitializeAttributes
+emberAfSetDynamicEndpoint
 EnableNetwork
 EnableWiFiNetwork
 endian
@@ -519,8 +530,11 @@ EthyleneOxideConcentrationMeasurement
 EvalCode
 EvalCodeWithName
 EvalFrameDefault
+EV
 EVB
+EventLogging
 evk
+EVSE
 exceptfds
 ExchangeContext
 exe
@@ -592,6 +606,7 @@ GetDeviceInfo
 GetDns
 GetIP
 getManualTests
+GetSafeAttributePersistenceProvider
 getstarted
 getTests
 GH
@@ -627,6 +642,7 @@ Gv
 gz
 gzbf
 HaloaceticAcidsConcentrationMeasurement
+HandleCommand
 hardcoded
 hardknott
 hardwarever
@@ -698,6 +714,7 @@ installDebug
 instantiation
 integrations
 IntelliSense
+InteractionModelEngine
 InteractionModelVersion
 Interoperable
 introvideos
@@ -802,6 +819,7 @@ localhost
 LocalizationConfiguration
 localstatedir
 LockingState
+LogEvent
 loopback
 LowPower
 LPC
@@ -830,6 +848,7 @@ matterc
 MatterCustomTrace
 matterd
 MatterLock
+MatterReportingAttributeChangeCallback
 matterSdkSourceBuild
 matterSourceBuildAbiFilters
 matterUTestLib
@@ -1063,6 +1082,7 @@ plaintext
 PlatformManager
 PlatformManagerImpl
 plt
+PluginServerCallback
 png
 Podman
 PollControl
@@ -1150,6 +1170,8 @@ recommand
 recommanded
 recurse
 regen
+registerAttributeAccessOverride
+RegisterCommandHandler
 RelativeHumidityMeasurement
 RemainAfterExit
 remoteDeviceId
@@ -1159,6 +1181,7 @@ RendezvousParameters
 RendezVousTest
 REPL
 repo
+repos
 req
 Requestor
 Requestor's

diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
@@ -63,6 +63,8 @@ jobs:
                         --target qpg-qpg6105-light \
                         --target qpg-qpg6105-shell \
                         --target qpg-qpg6105-persistent-storage \
+                        --target qpg-qpg6105-light-switch \
+                        --target qpg-qpg6105-thermostat \
                         build \
                         --copy-artifacts-to out/artifacts \
                      "

diff --git a/build/chip/esp32/esp32_codegen.cmake b/build/chip/esp32/esp32_codegen.cmake
@@ -33,6 +33,7 @@ macro(chip_app_component_codegen IDL_NAME)
       OUTPUTS
             "app/PluginApplicationCallbacks.h"
             "app/callback-stub.cpp"
+            "app/cluster-init-callback.cpp"
       OUTPUT_PATH   APP_GEN_DIR
       OUTPUT_FILES  APP_GEN_FILES
     )

diff --git a/config/qpg/toolchain/BUILD.gn b/config/qpg/toolchain/BUILD.gn
@@ -31,6 +31,13 @@ arm_toolchain("qpg_lighting_app") {
   }
 }
 
+arm_toolchain("qpg_light_switch_app") {
+  toolchain_args = {
+    current_os = "freertos"
+    import("${chip_root}/examples/light-switch-app/qpg/args.gni")
+  }
+}
+
 arm_toolchain("qpg_shell_app") {
   toolchain_args = {
     current_os = "freertos"

diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt
@@ -97,7 +97,6 @@ matter_add_gn_arg_bool  ("chip_config_network_layer_ble"          CONFIG_BT)
 matter_add_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_NET_IPV4)
 matter_add_gn_arg_bool  ("chip_enable_nfc"                        CONFIG_CHIP_NFC_COMMISSIONING)
 matter_add_gn_arg_bool  ("chip_enable_ota_requestor"              CONFIG_CHIP_OTA_REQUESTOR)
-matter_add_gn_arg_bool  ("chip_enable_bootloader_mcuboot"         CONFIG_BOOTLOADER_MCUBOOT)
 matter_add_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   CONFIG_CHIP_BUILD_TESTS)
 matter_add_gn_arg_bool  ("chip_error_logging"                     CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 1)
 matter_add_gn_arg_bool  ("chip_progress_logging"                  CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 3)

diff --git a/data_model/clusters/BooleanSensorConfiguration.xml b/data_model/clusters/BooleanSensorConfiguration.xml