Merge branch 'master' into add_presets_to_Sdk

# Conflicts: # examples/air-purifier-app/air-purifier-common/air-purifier-app.matter # examples/all-clusters-app/all-clusters-common/all-clusters-app.matter # examples/all-clusters-app/all-clusters-common/all-clusters-app.zap # examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter # examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter # examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter # examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter # examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter # examples/placeholder/linux/apps/app1/config.matter # examples/placeholder/linux/apps/app2/config.matter # examples/thermostat/linux/include/thermostat-delegate-impl.h # examples/thermostat/linux/thermostat-delegate-impl.cpp # examples/thermostat/nxp/zap/thermostat_matter_thread.matter # examples/thermostat/nxp/zap/thermostat_matter_wifi.matter # examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter # examples/thermostat/thermostat-common/thermostat.matter # examples/thermostat/thermostat-common/thermostat.zap # scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h # src/app/clusters/thermostat-server/PresetStructWithOwnedMembers.cpp # src/app/clusters/thermostat-server/thermostat-delegate.h # src/app/clusters/thermostat-server/thermostat-server.cpp # src/app/clusters/thermostat-server/thermostat-server.h # src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml # src/controller/data_model/controller-clusters.matter # src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java # src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java # src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java # src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java # src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatCluster.kt # src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp # src/controller/python/chip/clusters/CHIPClusters.py # src/controller/python/chip/clusters/Objects.py # src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm # src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm # src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h # src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm # src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h # src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm # src/darwin/Framework/CHIP/zap-generated/MTRClusters.h # src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm # src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h # src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm # src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h # zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp # zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h # zzz_generated/app-common/app-common/zap-generated/callback.h # zzz_generated/app-common/app-common/zap-generated/cluster-enums.h # zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp # zzz_generated/app-common/app-common/zap-generated/cluster-objects.h # zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h # zzz_generated/app-common/app-common/zap-generated/ids/Commands.h # zzz_generated/chip-tool/zap-generated/cluster/Commands.h # zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp # zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
project-chip · Jul 30, 2024 · 7acd5d4 · 7acd5d4
2 parents 6d2fda4 + c77832f
commit 7acd5d4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/examples/thermostat/linux/thermostat-delegate-impl.cpp b/examples/thermostat/linux/thermostat-delegate-impl.cpp
@@ -221,6 +221,7 @@ CHIP_ERROR ThermostatDelegate::GetPendingPresetAtIndex(size_t index, PresetStruc
 
 CHIP_ERROR ThermostatDelegate::ApplyPendingPresets()
 {
+
     // TODO: #34546 - Need to support deletion of presets that are removed from Presets.
     for (uint8_t indexInPendingPresets = 0; indexInPendingPresets < mNextFreeIndexInPendingPresetsList; indexInPendingPresets++)
     {

diff --git a/src/app/clusters/thermostat-server/PresetStructWithOwnedMembers.cpp b/src/app/clusters/thermostat-server/PresetStructWithOwnedMembers.cpp
@@ -63,7 +63,7 @@ CHIP_ERROR PresetStructWithOwnedMembers::SetPresetHandle(const Nullable<ByteSpan
         if (newPresetHandleSize > kPresetHandleSize)
         {
             ChipLogError(Zcl, "Failed to set Preset handle. New preset handle size (%u) > allowed preset handle size (%u)",
-                         static_cast<uint8_t>(newPresetHandleSize), static_cast<uint8_t>(kPresetNameSize));
+                         static_cast<unsigned>(newPresetHandleSize), static_cast<unsigned>(kPresetNameSize));
             return CHIP_ERROR_NO_MEMORY;
         }
         MutableByteSpan targetSpan(presetHandleData);

diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml
@@ -448,7 +448,8 @@ limitations under the License.
       <description>Schedules</description>
       <access op="write" privilege="manage"/>
     </attribute>
-    <attribute code="0x0052" side="server" type="epoch_s" define="PRESETS_SCHEDULES_EDITABLE" optional="true" isNullable="true">SetpointHoldExpiryTimestamp</attribute>
+    <attribute code="0x0052" side="server" type="epoch_s" define="SETPOINT_HOLD_EXPIRY_TIMESTAMP" optional="true" isNullable="true">SetpointHoldExpiryTimestamp</attribute>
+
     <!-- Client Commands -->
     <command source="client" code="0x00" name="SetpointRaiseLower" optional="false">
       <description>Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them.</description>
-Original file line number
+Diff line change
@@ Expand Up @@
     CHIP_ERROR ThermostatDelegate::ApplyPendingPresets()
     {
         // TODO: #34546 - Need to support deletion of presets that are removed from Presets.
         for (uint8_t indexInPendingPresets = 0; indexInPendingPresets < mNextFreeIndexInPendingPresetsList; indexInPendingPresets++)
         {
@@ Expand Down @@