From 8362564ca10f550c97a1a002d6a21220d1216882 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 23 May 2022 11:34:35 -0400 Subject: [PATCH] Align thermostat cluster better with the spec. (#18594) Specific changes: * Adjust names of attributes to match the spec. * Mark the attributes that are supposed to be nullable as nullable. * Make the min values be decimal for various attributes, for readability. * Add the various setback attributes and EmergencyHeatDelta. * Fix incorrect fourth field for SetWeeklySchedule and GetWeeklyScheduleResponse. * Fix the types for the NumberOfTransitionsForSequence fields in SetWeeklySchedule and GetWeeklyScheduleResponse. * Fix incorrect type of RelayStatus in GetRelayStatusLogResponse. https://github.com/CHIP-Specifications/connectedhomeip-spec/issues/5238 tracks the outstanding spec issue about the fields of the ThermostatScheduleTransition struct. Fixes https://github.com/project-chip/connectedhomeip/issues/11670 --- .../all-clusters-app.matter | 8 +- .../placeholder/linux/apps/app1/config.matter | 8 +- .../placeholder/linux/apps/app2/config.matter | 8 +- .../thermostat-common/thermostat.matter | 18 +- .../certification/Test_TC_TSTAT_2_1.yaml | 34 +- .../certification/Test_TC_TSTAT_2_2.yaml | 138 +- .../data-model/chip/thermostat-cluster.xml | 166 ++- .../data_model/controller-clusters.matter | 18 +- .../CHIPAttributeTLVValueDecoder.cpp | 15 +- .../zap-generated/CHIPInvokeCallbacks.cpp | 172 ++- .../java/zap-generated/CHIPReadCallbacks.cpp | 67 + .../java/zap-generated/CHIPReadCallbacks.h | 30 + .../chip/devicecontroller/ChipClusters.java | 31 +- .../chip/devicecontroller/ChipStructs.java | 30 + .../devicecontroller/ClusterInfoMapping.java | 82 +- .../devicecontroller/ClusterReadMapping.java | 3 +- .../python/chip/clusters/CHIPClusters.py | 4 +- .../python/chip/clusters/Objects.py | 269 +++- .../CHIPAttributeTLVValueDecoder.mm | 185 ++- .../CHIP/zap-generated/CHIPCallbackBridge.mm | 21 +- .../CHIP/zap-generated/CHIPClustersObjc.h | 242 +++- .../CHIP/zap-generated/CHIPClustersObjc.mm | 1016 +++++++++++---- .../zap-generated/CHIPCommandPayloadsObjc.h | 4 +- .../zap-generated/CHIPCommandPayloadsObjc.mm | 4 +- .../CHIP/zap-generated/CHIPStructsObjc.h | 7 + .../CHIP/zap-generated/CHIPStructsObjc.mm | 15 + .../zap-generated/MatterClusterConstants.h | 29 +- .../all-clusters-app/zap-generated/access.h | 84 +- .../zap-generated/endpoint_config.h | 106 +- .../app-common/zap-generated/af-structs.h | 8 + .../app-common/zap-generated/attribute-id.h | 7 + .../zap-generated/attributes/Accessors.cpp | 553 +++++++- .../zap-generated/attributes/Accessors.h | 111 +- .../app-common/zap-generated/callback.h | 12 +- .../zap-generated/cluster-objects.cpp | 127 +- .../zap-generated/cluster-objects.h | 265 ++-- .../app-common/zap-generated/ids/Attributes.h | 72 +- .../cluster/CHIPTestClustersObjc.h | 18 +- .../cluster/CHIPTestClustersObjc.mm | 141 +- .../zap-generated/cluster/Commands.h | 1140 +++++++++++++---- .../zap-generated/test/Commands.h | 28 +- .../zap-generated/cluster/Commands.h | 275 ++-- .../cluster/ComplexArgumentParser.cpp | 32 + .../cluster/ComplexArgumentParser.h | 4 + .../cluster/logging/DataModelLogger.cpp | 188 ++- .../cluster/logging/DataModelLogger.h | 2 + .../chip-tool/zap-generated/test/Commands.h | 2 +- .../placeholder/app1/zap-generated/access.h | 84 +- .../app1/zap-generated/endpoint_config.h | 62 +- .../placeholder/app2/zap-generated/access.h | 84 +- .../app2/zap-generated/endpoint_config.h | 62 +- .../thermostat/zap-generated/access.h | 84 +- .../zap-generated/endpoint_config.h | 56 +- 53 files changed, 4602 insertions(+), 1629 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index b9af6c37182927..f2f96c7a142d5a 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -3339,7 +3339,13 @@ server cluster Thermostat = 513 { kAutomode = 0x20; } - readonly attribute int16s localTemperature = 0; + struct ThermostatScheduleTransition { + int16u transitionTime = 0; + nullable int16s heatSetpoint = 1; + nullable int16s coolSetpoint = 2; + } + + readonly attribute nullable int16s localTemperature = 0; readonly attribute int16s absMinHeatSetpointLimit = 3; readonly attribute int16s absMaxHeatSetpointLimit = 4; readonly attribute int16s absMinCoolSetpointLimit = 5; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 43a4796ee0e391..a57b883834f239 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -2302,7 +2302,13 @@ server cluster Thermostat = 513 { kAutomode = 0x20; } - readonly attribute int16s localTemperature = 0; + struct ThermostatScheduleTransition { + int16u transitionTime = 0; + nullable int16s heatSetpoint = 1; + nullable int16s coolSetpoint = 2; + } + + readonly attribute nullable int16s localTemperature = 0; readonly attribute int16s absMinHeatSetpointLimit = 3; readonly attribute int16s absMinCoolSetpointLimit = 5; readonly attribute int16s absMaxCoolSetpointLimit = 6; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 43a4796ee0e391..a57b883834f239 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -2302,7 +2302,13 @@ server cluster Thermostat = 513 { kAutomode = 0x20; } - readonly attribute int16s localTemperature = 0; + struct ThermostatScheduleTransition { + int16u transitionTime = 0; + nullable int16s heatSetpoint = 1; + nullable int16s coolSetpoint = 2; + } + + readonly attribute nullable int16s localTemperature = 0; readonly attribute int16s absMinHeatSetpointLimit = 3; readonly attribute int16s absMinCoolSetpointLimit = 5; readonly attribute int16s absMaxCoolSetpointLimit = 6; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 23901ccebeb421..abda1cb10f504b 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1042,7 +1042,13 @@ server cluster Thermostat = 513 { kAutomode = 0x20; } - readonly attribute int16s localTemperature = 0; + struct ThermostatScheduleTransition { + int16u transitionTime = 0; + nullable int16s heatSetpoint = 1; + nullable int16s coolSetpoint = 2; + } + + readonly attribute nullable int16s localTemperature = 0; readonly attribute int16s absMinHeatSetpointLimit = 3; readonly attribute int16s absMaxHeatSetpointLimit = 4; readonly attribute int16s absMinCoolSetpointLimit = 5; @@ -1068,10 +1074,10 @@ server cluster Thermostat = 513 { } request struct SetWeeklyScheduleRequest { - ENUM8 numberOfTransitionsForSequence = 0; + INT8U numberOfTransitionsForSequence = 0; DayOfWeek dayOfWeekForSequence = 1; ModeForSequence modeForSequence = 2; - INT8U payload[] = 3; + ThermostatScheduleTransition transitions[] = 3; } request struct GetWeeklyScheduleRequest { @@ -1080,15 +1086,15 @@ server cluster Thermostat = 513 { } response struct GetWeeklyScheduleResponse = 0 { - ENUM8 numberOfTransitionsForSequence = 0; + INT8U numberOfTransitionsForSequence = 0; DayOfWeek dayOfWeekForSequence = 1; ModeForSequence modeForSequence = 2; - INT8U payload[] = 3; + ThermostatScheduleTransition transitions[] = 3; } response struct GetRelayStatusLogResponse = 1 { INT16U timeOfDay = 0; - BITMAP16 relayStatus = 1; + BITMAP8 relayStatus = 1; INT16S localTemperature = 2; INT8U humidityInPercentage = 3; INT16S setpoint = 4; diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml index 206b584cda5ad5..5b42c72a1f7fae 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml @@ -33,7 +33,7 @@ tests: - label: "Reads constraints of mandatory attributes from DUT: LocalTemperature" command: "readAttribute" - attribute: "local temperature" + attribute: "LocalTemperature" response: constraints: type: int16 @@ -42,7 +42,7 @@ tests: "Reads constraints of mandatory attributes from DUT: AbsMinHeatSetpointLimit" command: "readAttribute" - attribute: "abs min heat setpoint limit" + attribute: "AbsMinHeatSetpointLimit" response: constraints: type: int16 @@ -53,7 +53,7 @@ tests: "Reads constraints of mandatory attributes from DUT: AbsMaxHeatSetpointLimit" command: "readAttribute" - attribute: "abs max heat setpoint limit" + attribute: "AbsMaxHeatSetpointLimit" response: constraints: type: int16 @@ -65,7 +65,7 @@ tests: AbsMinCoolSetpointLimit" optional: true command: "readAttribute" - attribute: "abs min cool setpoint limit" + attribute: "AbsMinCoolSetpointLimit" response: constraints: type: int16 @@ -77,7 +77,7 @@ tests: AbsMaxCoolSetpointLimit" optional: true command: "readAttribute" - attribute: "abs max cool setpoint limit" + attribute: "AbsMaxCoolSetpointLimit" response: constraints: type: int16 @@ -111,7 +111,7 @@ tests: OccupiedCoolingSetpoint" optional: true command: "readAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" response: constraints: type: int16 @@ -122,7 +122,7 @@ tests: "Reads constraints of mandatory attributes from DUT: OccupiedHeatingSetpoint" command: "readAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" response: constraints: type: int16 @@ -157,7 +157,7 @@ tests: "Reads constraints of mandatory attributes from DUT: MinHeatSetpointLimit" command: "readAttribute" - attribute: "min heat setpoint limit" + attribute: "MinHeatSetpointLimit" response: constraints: type: int16 @@ -168,7 +168,7 @@ tests: "Reads constraints of mandatory attributes from DUT: MaxHeatSetpointLimit" command: "readAttribute" - attribute: "max heat setpoint limit" + attribute: "MaxHeatSetpointLimit" response: constraints: type: int16 @@ -180,7 +180,7 @@ tests: MinCoolSetpointLimit" optional: true command: "readAttribute" - attribute: "min cool setpoint limit" + attribute: "MinCoolSetpointLimit" response: constraints: type: int16 @@ -192,7 +192,7 @@ tests: MaxCoolSetpointLimit" optional: true command: "readAttribute" - attribute: "max cool setpoint limit" + attribute: "MaxCoolSetpointLimit" response: constraints: type: int16 @@ -203,7 +203,7 @@ tests: "Reads constraints of mandatory attributes from DUT: ControlSequenceOfOperation" command: "readAttribute" - attribute: "control sequence of operation" + attribute: "ControlSequenceOfOperation" response: constraints: type: enum8 @@ -212,7 +212,7 @@ tests: - label: "Reads constraints of mandatory attributes from DUT: SystemMode" command: "readAttribute" - attribute: "system mode" + attribute: "SystemMode" response: constraints: type: enum8 @@ -267,7 +267,7 @@ tests: MinSetpointDeadBand" optional: true command: "readAttribute" - attribute: "min setpoint dead band" + attribute: "MinSetpointDeadBand" response: constraints: type: int8 @@ -309,7 +309,7 @@ tests: - label: "Reads constraints of optional attributes from DUT: StartOfWeek" optional: true command: "readAttribute" - attribute: "start of week" + attribute: "StartOfWeek" response: constraints: type: enum8 @@ -321,7 +321,7 @@ tests: NumberOfWeeklyTransitions" optional: true command: "readAttribute" - attribute: "number of weekly transitions" + attribute: "NumberOfWeeklyTransitions" response: constraints: type: uint8 @@ -331,7 +331,7 @@ tests: NumberOfDailyTransitions" optional: true command: "readAttribute" - attribute: "number of daily transitions" + attribute: "NumberOfDailyTransitions" response: constraints: type: uint8 diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml index 3f1e178ccacf5a..9012c5e373725f 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml @@ -33,7 +33,7 @@ tests: that the value is within range" optional: true command: "readAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT response: value: 2600 @@ -47,7 +47,7 @@ tests: OccupiedCoolingSetpoint attribute" optional: true command: "writeAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT arguments: value: 2000 @@ -57,7 +57,7 @@ tests: OccupiedCoolingSetpoint attribute" optional: true command: "readAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT response: value: 2000 @@ -68,7 +68,7 @@ tests: MinCoolSetpointLimit" disabled: true command: "writeAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT arguments: value: 30 @@ -79,7 +79,7 @@ tests: MaxCoolSetpointLimit" disabled: true command: "writeAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT arguments: value: 4000 @@ -89,7 +89,7 @@ tests: attribute" optional: true command: "writeAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT arguments: value: 1600 @@ -99,7 +99,7 @@ tests: attribute" optional: true command: "writeAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT arguments: value: 2600 @@ -108,7 +108,7 @@ tests: "Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range" command: "readAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT response: value: 2000 @@ -121,7 +121,7 @@ tests: "Writes a value back that is different but valid for OccupiedHeatingSetpoint attribute" command: "writeAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT arguments: value: 2100 @@ -130,7 +130,7 @@ tests: "Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute" command: "readAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT response: value: 2100 @@ -141,7 +141,7 @@ tests: MinHeatSetpointLimit" disabled: true command: "writeAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT arguments: value: 1002 @@ -152,7 +152,7 @@ tests: MaxHeatSetpointLimit" disabled: true command: "writeAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT arguments: value: 4010 @@ -161,7 +161,7 @@ tests: "Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint attribute" command: "writeAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT arguments: value: 700 @@ -170,7 +170,7 @@ tests: "Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint attribute" command: "writeAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT arguments: value: 3000 @@ -179,7 +179,7 @@ tests: "Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within range" command: "readAttribute" - attribute: "min heat setpoint limit" + attribute: "MinHeatSetpointLimit" PICS: A_MINHEATSETPOINTLIMIT response: value: 700 @@ -192,7 +192,7 @@ tests: "Writes a value back that is different but valid for MinHeatSetpointLimit attribute" command: "writeAttribute" - attribute: "min heat setpoint limit" + attribute: "MinHeatSetpointLimit" PICS: A_MINHEATSETPOINTLIMIT arguments: value: 2000 @@ -201,7 +201,7 @@ tests: "Reads it back again to confirm the successful write of MinHeatSetpointLimit attribute" command: "readAttribute" - attribute: "min heat setpoint limit" + attribute: "MinHeatSetpointLimit" PICS: A_MINHEATSETPOINTLIMIT response: value: 2000 @@ -212,7 +212,7 @@ tests: AbsMinHeatSetpointLimit " disabled: true command: "writeAttribute" - attribute: "min heat setpoint limit" + attribute: "MinHeatSetpointLimit" PICS: A_MINHEATSETPOINTLIMIT arguments: value: 650 @@ -223,7 +223,7 @@ tests: AbsMaxHeatSetpointLimit " disabled: true command: "writeAttribute" - attribute: "min heat setpoint limit" + attribute: "MinHeatSetpointLimit" PICS: A_MINHEATSETPOINTLIMIT arguments: value: 4050 @@ -232,7 +232,7 @@ tests: "Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit attribute" command: "writeAttribute" - attribute: "min heat setpoint limit" + attribute: "MinHeatSetpointLimit" PICS: A_MINHEATSETPOINTLIMIT arguments: value: 700 @@ -241,7 +241,7 @@ tests: "Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit attribute" command: "writeAttribute" - attribute: "min heat setpoint limit" + attribute: "MinHeatSetpointLimit" PICS: A_MINHEATSETPOINTLIMIT arguments: value: 3000 @@ -250,7 +250,7 @@ tests: "Reads MaxHeatSetpointLimit attribute from Server DUT and verifies that the value is within range" command: "readAttribute" - attribute: "max heat setpoint limit" + attribute: "MaxHeatSetpointLimit" PICS: A_MAXHEATSETPOINTLIMIT response: value: 3000 @@ -263,7 +263,7 @@ tests: "Writes a value back that is different but valid for MaxHeatSetpointLimit attribute" command: "writeAttribute" - attribute: "max heat setpoint limit" + attribute: "MaxHeatSetpointLimit" PICS: A_MAXHEATSETPOINTLIMIT arguments: value: 2000 @@ -272,7 +272,7 @@ tests: "Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute" command: "readAttribute" - attribute: "max heat setpoint limit" + attribute: "MaxHeatSetpointLimit" PICS: A_MAXHEATSETPOINTLIMIT response: value: 2000 @@ -283,7 +283,7 @@ tests: AbsMinHeatSetpointLimit " disabled: true command: "writeAttribute" - attribute: "max heat setpoint limit" + attribute: "MaxHeatSetpointLimit" PICS: A_MAXHEATSETPOINTLIMIT arguments: value: 500 @@ -294,7 +294,7 @@ tests: AbsMaxHeatSetpointLimit " disabled: true command: "writeAttribute" - attribute: "max heat setpoint limit" + attribute: "MaxHeatSetpointLimit" PICS: A_MAXHEATSETPOINTLIMIT arguments: value: 4000 @@ -303,7 +303,7 @@ tests: "Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit attribute" command: "writeAttribute" - attribute: "max heat setpoint limit" + attribute: "MaxHeatSetpointLimit" PICS: A_MAXHEATSETPOINTLIMIT arguments: value: 700 @@ -312,7 +312,7 @@ tests: "Writes the limit of AbsMaxHeatSetpointLimit to MaxHeatSetpointLimit attribute" command: "writeAttribute" - attribute: "max heat setpoint limit" + attribute: "MaxHeatSetpointLimit" PICS: A_MAXHEATSETPOINTLIMIT arguments: value: 3000 @@ -322,7 +322,7 @@ tests: that the value is within range" optional: true command: "readAttribute" - attribute: "min cool setpoint limit" + attribute: "MinCoolSetpointLimit" PICS: A_MINCOOLSETPOINTLIMIT response: value: 1600 @@ -336,7 +336,7 @@ tests: MinCoolSetpointLimit attribute" optional: true command: "writeAttribute" - attribute: "min cool setpoint limit" + attribute: "MinCoolSetpointLimit" PICS: A_MINCOOLSETPOINTLIMIT arguments: value: 2000 @@ -346,7 +346,7 @@ tests: MinCoolSetpointLimit attribute" optional: true command: "readAttribute" - attribute: "min cool setpoint limit" + attribute: "MinCoolSetpointLimit" PICS: A_MINCOOLSETPOINTLIMIT response: value: 2000 @@ -357,7 +357,7 @@ tests: AbsMinCoolSetpointLimit " disabled: true command: "writeAttribute" - attribute: "min cool setpoint limit" + attribute: "MinCoolSetpointLimit" PICS: A_MINCOOLSETPOINTLIMIT arguments: value: 1000 @@ -367,7 +367,7 @@ tests: "Writes MinCoolSetpointLimit to value above the MaxCoolSetpointLimit " disabled: true command: "writeAttribute" - attribute: "min cool setpoint limit" + attribute: "MinCoolSetpointLimit" PICS: A_MINCOOLSETPOINTLIMIT arguments: value: 4000 @@ -377,7 +377,7 @@ tests: attribute" optional: true command: "writeAttribute" - attribute: "min cool setpoint limit" + attribute: "MinCoolSetpointLimit" PICS: A_MINCOOLSETPOINTLIMIT arguments: value: 1600 @@ -387,7 +387,7 @@ tests: attribute" optional: true command: "writeAttribute" - attribute: "min cool setpoint limit" + attribute: "MinCoolSetpointLimit" PICS: A_MINCOOLSETPOINTLIMIT arguments: value: 3200 @@ -397,7 +397,7 @@ tests: that the value is within range" optional: true command: "readAttribute" - attribute: "max cool setpoint limit" + attribute: "MaxCoolSetpointLimit" PICS: A_MAXCOOLSETPOINTLIMIT response: value: 3200 @@ -411,7 +411,7 @@ tests: MaxCoolSetpointLimit attribute" optional: true command: "writeAttribute" - attribute: "max cool setpoint limit" + attribute: "MaxCoolSetpointLimit" PICS: A_MAXCOOLSETPOINTLIMIT arguments: value: 2000 @@ -421,7 +421,7 @@ tests: MaxCoolSetpointLimit attribute" optional: true command: "readAttribute" - attribute: "max cool setpoint limit" + attribute: "MaxCoolSetpointLimit" PICS: A_MAXCOOLSETPOINTLIMIT response: value: 2000 @@ -432,7 +432,7 @@ tests: AbsMinCoolSetpointLimit " disabled: true command: "writeAttribute" - attribute: "max cool setpoint limit" + attribute: "MaxCoolSetpointLimit" PICS: A_MAXCOOLSETPOINTLIMIT arguments: value: 1000 @@ -442,7 +442,7 @@ tests: "Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit " disabled: true command: "writeAttribute" - attribute: "max cool setpoint limit" + attribute: "MaxCoolSetpointLimit" PICS: A_MAXCOOLSETPOINTLIMIT arguments: value: 4000 @@ -452,7 +452,7 @@ tests: attribute" optional: true command: "writeAttribute" - attribute: "max cool setpoint limit" + attribute: "MaxCoolSetpointLimit" PICS: A_MAXCOOLSETPOINTLIMIT arguments: value: 1600 @@ -462,7 +462,7 @@ tests: attribute" optional: true command: "writeAttribute" - attribute: "max cool setpoint limit" + attribute: "MaxCoolSetpointLimit" PICS: A_MAXCOOLSETPOINTLIMIT arguments: value: 3200 @@ -471,7 +471,7 @@ tests: "Writes (sets back) the limit of MinHeatSetpointLimit to MinHeatSetpointLimit attribute" command: "writeAttribute" - attribute: "min heat setpoint limit" + attribute: "MinHeatSetpointLimit" PICS: A_MINHEATSETPOINTLIMIT arguments: value: 700 @@ -480,7 +480,7 @@ tests: "Writes (sets back) the limit of MaxHeatSetpointLimit to MinHeatSetpointLimit attribute" command: "writeAttribute" - attribute: "min heat setpoint limit" + attribute: "MinHeatSetpointLimit" PICS: A_MINHEATSETPOINTLIMIT arguments: value: 3000 @@ -489,7 +489,7 @@ tests: "Writes (sets back) the limit of MinHeatSetpointLimit to MaxHeatSetpointLimit attribute" command: "writeAttribute" - attribute: "max heat setpoint limit" + attribute: "MaxHeatSetpointLimit" PICS: A_MINHEATSETPOINTLIMIT arguments: value: 700 @@ -498,7 +498,7 @@ tests: "Writes (sets back) the limit of MaxHeatSetpointLimit to MaxHeatSetpointLimit attribute" command: "writeAttribute" - attribute: "max heat setpoint limit" + attribute: "MaxHeatSetpointLimit" PICS: A_MINHEATSETPOINTLIMIT arguments: value: 3000 @@ -508,7 +508,7 @@ tests: MinCoolSetpointLimit attribute" optional: true command: "writeAttribute" - attribute: "min cool setpoint limit" + attribute: "MinCoolSetpointLimit" PICS: A_MINCOOLSETPOINTLIMIT arguments: value: 1600 @@ -518,7 +518,7 @@ tests: MinCoolSetpointLimit attribute" optional: true command: "writeAttribute" - attribute: "min cool setpoint limit" + attribute: "MinCoolSetpointLimit" PICS: A_MINCOOLSETPOINTLIMIT arguments: value: 3200 @@ -528,7 +528,7 @@ tests: MaxCoolSetpointLimit attribute" optional: true command: "writeAttribute" - attribute: "max cool setpoint limit" + attribute: "MaxCoolSetpointLimit" PICS: A_MAXCOOLSETPOINTLIMIT arguments: value: 1600 @@ -538,7 +538,7 @@ tests: MaxCoolSetpointLimit attribute" optional: true command: "writeAttribute" - attribute: "max cool setpoint limit" + attribute: "MaxCoolSetpointLimit" PICS: A_MAXCOOLSETPOINTLIMIT arguments: value: 3200 @@ -547,7 +547,7 @@ tests: "Reads ControlSequenceOfOperation from Server DUT and verifies that the value is valid" command: "readAttribute" - attribute: "control sequence of operation" + attribute: "ControlSequenceOfOperation" PICS: A_CONTROLSEQUENCEOFOPERATION response: value: 4 @@ -560,21 +560,21 @@ tests: "Write Attribute command for ControlSequenceOfOperation with a new valid value" command: "writeAttribute" - attribute: "control sequence of operation" + attribute: "ControlSequenceOfOperation" PICS: A_CONTROLSEQUENCEOFOPERATION arguments: value: 2 - label: "Read it back again to confirm the successful write" command: "readAttribute" - attribute: "control sequence of operation" + attribute: "ControlSequenceOfOperation" PICS: A_CONTROLSEQUENCEOFOPERATION response: value: 2 - label: "Sets OccupiedHeatingSetpoint to default value" command: "writeAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT arguments: value: 2000 @@ -596,14 +596,14 @@ tests: write" disabled: true command: "readAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT response: value: -30 - label: "Sets OccupiedHeatingSetpoint to default value" command: "writeAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT arguments: value: 2000 @@ -625,7 +625,7 @@ tests: write" disabled: true command: "readAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT response: value: 30 @@ -633,7 +633,7 @@ tests: - label: "Sets OccupiedCoolingSetpoint to default value" optional: true command: "writeAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT arguments: value: 2600 @@ -655,7 +655,7 @@ tests: write" disabled: true command: "readAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT response: value: -30 @@ -663,7 +663,7 @@ tests: - label: "Sets OccupiedCoolingSetpoint to default value" optional: true command: "writeAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT arguments: value: 2600 @@ -685,7 +685,7 @@ tests: write" disabled: true command: "readAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT response: value: 30 @@ -693,14 +693,14 @@ tests: - label: "Sets OccupiedCoolingSetpoint to default value" optional: true command: "writeAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT arguments: value: 2600 - label: "Sets OccupiedHeatingSetpoint to default value" command: "writeAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT arguments: value: 2000 @@ -722,7 +722,7 @@ tests: write" disabled: true command: "readAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT response: value: -30 @@ -732,7 +732,7 @@ tests: write" disabled: true command: "readAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT response: value: -30 @@ -740,14 +740,14 @@ tests: - label: "Sets OccupiedCoolingSetpoint to default value" optional: true command: "writeAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT arguments: value: 2600 - label: "Sets OccupiedHeatingSetpoint to default value" command: "writeAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT arguments: value: 2000 @@ -769,7 +769,7 @@ tests: write" disabled: true command: "readAttribute" - attribute: "occupied cooling setpoint" + attribute: "OccupiedCoolingSetpoint" PICS: A_OCCUPIEDCOOLINGSETPOINT response: value: 30 @@ -779,7 +779,7 @@ tests: write" disabled: true command: "readAttribute" - attribute: "occupied heating setpoint" + attribute: "OccupiedHeatingSetpoint" PICS: A_OCCUPIEDHEATINGSETPOINT response: value: 30 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 index 88121611ccbee6..63080bd9572d6a 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml @@ -24,129 +24,147 @@ limitations under the License. THERMOSTAT_CLUSTER true true - - local temperature - outdoor temperature - occupancy + + LocalTemperature + OutdoorTemperature + Occupancy - abs min heat setpoint limit - abs max heat setpoint limit - abs min cool setpoint limit - abs max cool setpoint limit - pi cooling demand - pi heating demand + AbsMinHeatSetpointLimit + AbsMaxHeatSetpointLimit + AbsMinCoolSetpointLimit + AbsMaxCoolSetpointLimit + PICoolingDemand + PIHeatingDemand - HVAC system type configuration + HVACSystemTypeConfiguration - local temperature calibration + LocalTemperatureCalibration - occupied cooling setpoint - occupied heating setpoint - unoccupied cooling setpoint - unoccupied heating setpoint - - min heat setpoint limit + OccupiedCoolingSetpoint + OccupiedHeatingSetpoint + UnoccupiedCoolingSetpoint + UnoccupiedHeatingSetpoint + + MinHeatSetpointLimit - - max heat setpoint limit + + MaxHeatSetpointLimit - - min cool setpoint limit + + MinCoolSetpointLimit - - max cool setpoint limit + + MaxCoolSetpointLimit - - min setpoint dead band + + MinSetpointDeadBand - remote sensing + RemoteSensing - control sequence of operation + ControlSequenceOfOperation - system mode + SystemMode - alarm mask - - thermostat running mode - start of week - number of weekly transitions - number of daily transitions + AlarmMask + ThermostatRunningMode + StartOfWeek + NumberOfWeeklyTransitions + NumberOfDailyTransitions - temperature setpoint hold + TemperatureSetpointHold - - temperature setpoint hold duration + + TemperatureSetpointHoldDuration - - thermostat programming operation mode + + ThermostatProgrammingOperationMode + + + + ThermostatRunningState + SetpointChangeSource + SetpointChangeAmount + SetpointChangeSourceTimestamp + + OccupiedSetback + + + + OccupiedSetbackMin + OccupiedSetbackMax + + UnoccupiedSetback + + + + UnoccupiedSetbackMin + UnoccupiedSetbackMax + + EmergencyHeatDelta - thermostat running state - setpoint change source - setpoint change amount - setpoint change source timestamp - ac type + ACType - ac capacity + ACCapacity - ac refrigerant type + ACRefrigerantType - ac compressor type + ACCompressorType - ac error code + ACErrorCode - ac louver position + ACLouverPosition - ac coil temperature + ACCoilTemperature - ac capacity format + ACCapacityformat @@ -154,25 +172,25 @@ limitations under the License. Command description for SetpointRaiseLower - - + + Command description for SetWeeklySchedule - - - - + + + + Command description for GetWeeklySchedule - - + + @@ -189,21 +207,21 @@ limitations under the License. The Current Weekly Schedule Command is sent from the server in response to the Get Weekly Schedule Command. - - - - + + + + This command is sent from the thermostat cluster server in response to the Get Relay Status Log. - - - - - - + + + + + + @@ -217,4 +235,12 @@ limitations under the License. + + + + + + + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index d67cb119647ded..ed781a27b23c14 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3809,7 +3809,13 @@ client cluster Thermostat = 513 { kAutomode = 0x20; } - readonly attribute int16s localTemperature = 0; + struct ThermostatScheduleTransition { + int16u transitionTime = 0; + nullable int16s heatSetpoint = 1; + nullable int16s coolSetpoint = 2; + } + + readonly attribute nullable int16s localTemperature = 0; readonly attribute int16s absMinHeatSetpointLimit = 3; readonly attribute int16s absMaxHeatSetpointLimit = 4; readonly attribute int16s absMinCoolSetpointLimit = 5; @@ -3836,10 +3842,10 @@ client cluster Thermostat = 513 { } request struct SetWeeklyScheduleRequest { - ENUM8 numberOfTransitionsForSequence = 0; + INT8U numberOfTransitionsForSequence = 0; DayOfWeek dayOfWeekForSequence = 1; ModeForSequence modeForSequence = 2; - INT8U payload[] = 3; + ThermostatScheduleTransition transitions[] = 3; } request struct GetWeeklyScheduleRequest { @@ -3848,15 +3854,15 @@ client cluster Thermostat = 513 { } response struct GetWeeklyScheduleResponse = 0 { - ENUM8 numberOfTransitionsForSequence = 0; + INT8U numberOfTransitionsForSequence = 0; DayOfWeek dayOfWeekForSequence = 1; ModeForSequence modeForSequence = 2; - INT8U payload[] = 3; + ThermostatScheduleTransition transitions[] = 3; } response struct GetRelayStatusLogResponse = 1 { INT16U timeOfDay = 0; - BITMAP16 relayStatus = 1; + BITMAP8 relayStatus = 1; INT16S localTemperature = 2; INT8U humidityInPercentage = 3; INT16S setpoint = 4; diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index e7a65cae93a5e4..a4cbbed53f645f 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -14863,10 +14863,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return nullptr; } jobject value; - std::string valueClassName = "java/lang/Integer"; - std::string valueCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), - cppValue, value); + if (cppValue.IsNull()) + { + value = nullptr; + } + else + { + std::string valueClassName = "java/lang/Integer"; + std::string valueCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), + cppValue.Value(), value); + } return value; } case Attributes::AbsMinHeatSetpointLimit::Id: { diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index db5660b5cc5c7e..d6cb0356af0ffe 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -4304,40 +4304,40 @@ void CHIPThermostatClusterGetRelayStatusLogResponseCallback::CallbackFn( &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject timeOfDay; - std::string timeOfDayClassName = "java/lang/Integer"; - std::string timeOfDayCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(timeOfDayClassName.c_str(), timeOfDayCtorSignature.c_str(), - dataResponse.timeOfDay, timeOfDay); - jobject relayStatus; - std::string relayStatusClassName = "java/lang/Integer"; - std::string relayStatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(relayStatusClassName.c_str(), relayStatusCtorSignature.c_str(), - dataResponse.relayStatus, relayStatus); - jobject localTemperature; - std::string localTemperatureClassName = "java/lang/Integer"; - std::string localTemperatureCtorSignature = "(I)V"; + jobject TimeOfDay; + std::string TimeOfDayClassName = "java/lang/Integer"; + std::string TimeOfDayCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(TimeOfDayClassName.c_str(), TimeOfDayCtorSignature.c_str(), + dataResponse.timeOfDay, TimeOfDay); + jobject RelayStatus; + std::string RelayStatusClassName = "java/lang/Integer"; + std::string RelayStatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(RelayStatusClassName.c_str(), RelayStatusCtorSignature.c_str(), + dataResponse.relayStatus, RelayStatus); + jobject LocalTemperature; + std::string LocalTemperatureClassName = "java/lang/Integer"; + std::string LocalTemperatureCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - localTemperatureClassName.c_str(), localTemperatureCtorSignature.c_str(), dataResponse.localTemperature, localTemperature); - jobject humidityInPercentage; - std::string humidityInPercentageClassName = "java/lang/Integer"; - std::string humidityInPercentageCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(humidityInPercentageClassName.c_str(), - humidityInPercentageCtorSignature.c_str(), - dataResponse.humidityInPercentage, humidityInPercentage); - jobject setpoint; - std::string setpointClassName = "java/lang/Integer"; - std::string setpointCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(setpointClassName.c_str(), setpointCtorSignature.c_str(), - dataResponse.setpoint, setpoint); - jobject unreadEntries; - std::string unreadEntriesClassName = "java/lang/Integer"; - std::string unreadEntriesCtorSignature = "(I)V"; + LocalTemperatureClassName.c_str(), LocalTemperatureCtorSignature.c_str(), dataResponse.localTemperature, LocalTemperature); + jobject HumidityInPercentage; + std::string HumidityInPercentageClassName = "java/lang/Integer"; + std::string HumidityInPercentageCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(HumidityInPercentageClassName.c_str(), + HumidityInPercentageCtorSignature.c_str(), + dataResponse.humidityInPercentage, HumidityInPercentage); + jobject Setpoint; + std::string SetpointClassName = "java/lang/Integer"; + std::string SetpointCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(SetpointClassName.c_str(), SetpointCtorSignature.c_str(), + dataResponse.setpoint, Setpoint); + jobject UnreadEntries; + std::string UnreadEntriesClassName = "java/lang/Integer"; + std::string UnreadEntriesCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - unreadEntriesClassName.c_str(), unreadEntriesCtorSignature.c_str(), dataResponse.unreadEntries, unreadEntries); + UnreadEntriesClassName.c_str(), UnreadEntriesCtorSignature.c_str(), dataResponse.unreadEntries, UnreadEntries); - env->CallVoidMethod(javaCallbackRef, javaMethod, timeOfDay, relayStatus, localTemperature, humidityInPercentage, setpoint, - unreadEntries); + env->CallVoidMethod(javaCallbackRef, javaMethod, TimeOfDay, RelayStatus, LocalTemperature, HumidityInPercentage, Setpoint, + UnreadEntries); } CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CHIPThermostatClusterGetWeeklyScheduleResponseCallback( jobject javaCallback) : @@ -4394,40 +4394,88 @@ void CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CallbackFn( &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject numberOfTransitionsForSequence; - std::string numberOfTransitionsForSequenceClassName = "java/lang/Integer"; - std::string numberOfTransitionsForSequenceCtorSignature = "(I)V"; + jobject NumberOfTransitionsForSequence; + std::string NumberOfTransitionsForSequenceClassName = "java/lang/Integer"; + std::string NumberOfTransitionsForSequenceCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - numberOfTransitionsForSequenceClassName.c_str(), numberOfTransitionsForSequenceCtorSignature.c_str(), - dataResponse.numberOfTransitionsForSequence, numberOfTransitionsForSequence); - jobject dayOfWeekForSequence; - std::string dayOfWeekForSequenceClassName = "java/lang/Integer"; - std::string dayOfWeekForSequenceCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(dayOfWeekForSequenceClassName.c_str(), - dayOfWeekForSequenceCtorSignature.c_str(), - dataResponse.dayOfWeekForSequence.Raw(), dayOfWeekForSequence); - jobject modeForSequence; - std::string modeForSequenceClassName = "java/lang/Integer"; - std::string modeForSequenceCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(modeForSequenceClassName.c_str(), - modeForSequenceCtorSignature.c_str(), - dataResponse.modeForSequence.Raw(), modeForSequence); - jobject payload; - chip::JniReferences::GetInstance().CreateArrayList(payload); - - auto iter_payload_0 = dataResponse.payload.begin(); - while (iter_payload_0.Next()) - { - auto & entry_0 = iter_payload_0.GetValue(); + NumberOfTransitionsForSequenceClassName.c_str(), NumberOfTransitionsForSequenceCtorSignature.c_str(), + dataResponse.numberOfTransitionsForSequence, NumberOfTransitionsForSequence); + jobject DayOfWeekForSequence; + std::string DayOfWeekForSequenceClassName = "java/lang/Integer"; + std::string DayOfWeekForSequenceCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(DayOfWeekForSequenceClassName.c_str(), + DayOfWeekForSequenceCtorSignature.c_str(), + dataResponse.dayOfWeekForSequence.Raw(), DayOfWeekForSequence); + jobject ModeForSequence; + std::string ModeForSequenceClassName = "java/lang/Integer"; + std::string ModeForSequenceCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(ModeForSequenceClassName.c_str(), + ModeForSequenceCtorSignature.c_str(), + dataResponse.modeForSequence.Raw(), ModeForSequence); + jobject Transitions; + chip::JniReferences::GetInstance().CreateArrayList(Transitions); + + auto iter_Transitions_0 = dataResponse.transitions.begin(); + while (iter_Transitions_0.Next()) + { + auto & entry_0 = iter_Transitions_0.GetValue(); jobject newElement_0; - std::string newElement_0ClassName = "java/lang/Integer"; - std::string newElement_0CtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0ClassName.c_str(), - newElement_0CtorSignature.c_str(), entry_0, newElement_0); - chip::JniReferences::GetInstance().AddToList(payload, newElement_0); + jobject newElement_0_transitionTime; + std::string newElement_0_transitionTimeClassName = "java/lang/Integer"; + std::string newElement_0_transitionTimeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_transitionTimeClassName.c_str(), + newElement_0_transitionTimeCtorSignature.c_str(), + entry_0.transitionTime, newElement_0_transitionTime); + jobject newElement_0_heatSetpoint; + if (entry_0.heatSetpoint.IsNull()) + { + newElement_0_heatSetpoint = nullptr; + } + else + { + std::string newElement_0_heatSetpointClassName = "java/lang/Integer"; + std::string newElement_0_heatSetpointCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_heatSetpointClassName.c_str(), + newElement_0_heatSetpointCtorSignature.c_str(), + entry_0.heatSetpoint.Value(), newElement_0_heatSetpoint); + } + jobject newElement_0_coolSetpoint; + if (entry_0.coolSetpoint.IsNull()) + { + newElement_0_coolSetpoint = nullptr; + } + else + { + std::string newElement_0_coolSetpointClassName = "java/lang/Integer"; + std::string newElement_0_coolSetpointCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_coolSetpointClassName.c_str(), + newElement_0_coolSetpointCtorSignature.c_str(), + entry_0.coolSetpoint.Value(), newElement_0_coolSetpoint); + } + + jclass thermostatScheduleTransitionStructClass; + err = chip::JniReferences::GetInstance().GetClassRef( + env, "chip/devicecontroller/ChipStructs$ThermostatClusterThermostatScheduleTransition", + thermostatScheduleTransitionStructClass); + if (err != CHIP_NO_ERROR) + { + ChipLogError(Zcl, "Could not find class ChipStructs$ThermostatClusterThermostatScheduleTransition"); + return; + } + jmethodID thermostatScheduleTransitionStructCtor = env->GetMethodID( + thermostatScheduleTransitionStructClass, "", "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V"); + if (thermostatScheduleTransitionStructCtor == nullptr) + { + ChipLogError(Zcl, "Could not find ChipStructs$ThermostatClusterThermostatScheduleTransition constructor"); + return; + } + + newElement_0 = env->NewObject(thermostatScheduleTransitionStructClass, thermostatScheduleTransitionStructCtor, + newElement_0_transitionTime, newElement_0_heatSetpoint, newElement_0_coolSetpoint); + chip::JniReferences::GetInstance().AddToList(Transitions, newElement_0); } - env->CallVoidMethod(javaCallbackRef, javaMethod, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, - payload); + env->CallVoidMethod(javaCallbackRef, javaMethod, NumberOfTransitionsForSequence, DayOfWeekForSequence, ModeForSequence, + Transitions); } } // namespace chip diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index d1d8d267654410..d76dc23fe21cbe 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -22718,6 +22718,73 @@ void CHIPTestClusterAttributeListAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } +CHIPThermostatLocalTemperatureAttributeCallback::CHIPThermostatLocalTemperatureAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), + keepAlive(keepAlive) +{ + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + return; + } + + javaCallbackRef = env->NewGlobalRef(javaCallback); + if (javaCallbackRef == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + } +} + +CHIPThermostatLocalTemperatureAttributeCallback::~CHIPThermostatLocalTemperatureAttributeCallback() +{ + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not delete global reference for Java callback"); + return; + } + env->DeleteGlobalRef(javaCallbackRef); +} + +void CHIPThermostatLocalTemperatureAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::Nullable & value) +{ + chip::DeviceLayer::StackUnlock unlock; + CHIP_ERROR err = CHIP_NO_ERROR; + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + jobject javaCallbackRef; + + VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); + + // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. + javaCallbackRef = cppCallback.get()->javaCallbackRef; + VerifyOrReturn(javaCallbackRef != nullptr, + ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); + + jmethodID javaMethod; + err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); + VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); + + jobject javaValue; + if (value.IsNull()) + { + javaValue = nullptr; + } + else + { + std::string javaValueClassName = "java/lang/Integer"; + std::string javaValueCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), + value.Value(), javaValue); + } + + env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); +} + CHIPThermostatAttributeListAttributeCallback::CHIPThermostatAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index 7bfea744f3a36a..e8cdd218dde4dc 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -9300,6 +9300,36 @@ class CHIPTestClusterAttributeListAttributeCallback bool keepAlive; }; +class CHIPThermostatLocalTemperatureAttributeCallback + : public chip::Callback::Callback +{ +public: + CHIPThermostatLocalTemperatureAttributeCallback(jobject javaCallback, bool keepAlive = false); + + ~CHIPThermostatLocalTemperatureAttributeCallback(); + + static void maybeDestroy(CHIPThermostatLocalTemperatureAttributeCallback * callback) + { + if (!callback->keepAlive) + { + callback->Cancel(); + chip::Platform::Delete(callback); + } + } + + static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value); + static void OnSubscriptionEstablished(void * context) + { + CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( + reinterpret_cast(context)->javaCallbackRef); + VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); + }; + +private: + jobject javaCallbackRef; + bool keepAlive; +}; + class CHIPThermostatAttributeListAttributeCallback : public chip::Callback::Callback { diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index fde65ad2335174..0fec772a0c7f1f 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -19980,14 +19980,14 @@ public void setWeeklySchedule( Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, - ArrayList payload) { + ArrayList transitions) { setWeeklySchedule( chipClusterPtr, callback, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, - payload, + transitions, null); } @@ -19996,7 +19996,7 @@ public void setWeeklySchedule( Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, - ArrayList payload, + ArrayList transitions, int timedInvokeTimeoutMs) { setWeeklySchedule( chipClusterPtr, @@ -20004,7 +20004,7 @@ public void setWeeklySchedule( numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, - payload, + transitions, timedInvokeTimeoutMs); } @@ -20040,7 +20040,7 @@ private native void setWeeklySchedule( Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, - ArrayList payload, + ArrayList transitions, @Nullable Integer timedInvokeTimeoutMs); private native void setpointRaiseLower( @@ -20067,11 +20067,19 @@ void onSuccess( Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, - ArrayList payload); + ArrayList transitions); void onError(Exception error); } + public interface LocalTemperatureAttributeCallback { + void onSuccess(@Nullable Integer value); + + void onError(Exception ex); + + default void onSubscriptionEstablished() {} + } + public interface AttributeListAttributeCallback { void onSuccess(List valueList); @@ -20080,12 +20088,12 @@ public interface AttributeListAttributeCallback { default void onSubscriptionEstablished() {} } - public void readLocalTemperatureAttribute(IntegerAttributeCallback callback) { + public void readLocalTemperatureAttribute(LocalTemperatureAttributeCallback callback) { readLocalTemperatureAttribute(chipClusterPtr, callback); } public void subscribeLocalTemperatureAttribute( - IntegerAttributeCallback callback, int minInterval, int maxInterval) { + LocalTemperatureAttributeCallback callback, int minInterval, int maxInterval) { subscribeLocalTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval); } @@ -20349,10 +20357,13 @@ public void subscribeClusterRevisionAttribute( } private native void readLocalTemperatureAttribute( - long chipClusterPtr, IntegerAttributeCallback callback); + long chipClusterPtr, LocalTemperatureAttributeCallback callback); private native void subscribeLocalTemperatureAttribute( - long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); + long chipClusterPtr, + LocalTemperatureAttributeCallback callback, + int minInterval, + int maxInterval); private native void readAbsMinHeatSetpointLimitAttribute( long chipClusterPtr, IntegerAttributeCallback callback); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index 332635c2e1cb69..889a1b030e375e 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1844,6 +1844,36 @@ public String toString() { } } + public static class ThermostatClusterThermostatScheduleTransition { + public Integer transitionTime; + public @Nullable Integer heatSetpoint; + public @Nullable Integer coolSetpoint; + + public ThermostatClusterThermostatScheduleTransition( + Integer transitionTime, @Nullable Integer heatSetpoint, @Nullable Integer coolSetpoint) { + this.transitionTime = transitionTime; + this.heatSetpoint = heatSetpoint; + this.coolSetpoint = coolSetpoint; + } + + @Override + public String toString() { + StringBuilder output = new StringBuilder(); + output.append("ThermostatClusterThermostatScheduleTransition {\n"); + output.append("\ttransitionTime: "); + output.append(transitionTime); + output.append("\n"); + output.append("\theatSetpoint: "); + output.append(heatSetpoint); + output.append("\n"); + output.append("\tcoolSetpoint: "); + output.append(coolSetpoint); + output.append("\n"); + output.append("}\n"); + return output.toString(); + } + } + public static class ThreadNetworkDiagnosticsClusterNeighborTable { public Long extAddress; public Long age; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 2f3dc7c8e89019..53e0eaef9f1a01 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -6419,29 +6419,29 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Integer timeOfDay, - Integer relayStatus, - Integer localTemperature, - Integer humidityInPercentage, - Integer setpoint, - Integer unreadEntries) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo timeOfDayResponseValue = new CommandResponseInfo("timeOfDay", "Integer"); - responseValues.put(timeOfDayResponseValue, timeOfDay); - CommandResponseInfo relayStatusResponseValue = - new CommandResponseInfo("relayStatus", "Integer"); - responseValues.put(relayStatusResponseValue, relayStatus); - CommandResponseInfo localTemperatureResponseValue = - new CommandResponseInfo("localTemperature", "Integer"); - responseValues.put(localTemperatureResponseValue, localTemperature); - CommandResponseInfo humidityInPercentageResponseValue = - new CommandResponseInfo("humidityInPercentage", "Integer"); - responseValues.put(humidityInPercentageResponseValue, humidityInPercentage); - CommandResponseInfo setpointResponseValue = new CommandResponseInfo("setpoint", "Integer"); - responseValues.put(setpointResponseValue, setpoint); - CommandResponseInfo unreadEntriesResponseValue = - new CommandResponseInfo("unreadEntries", "Integer"); - responseValues.put(unreadEntriesResponseValue, unreadEntries); + Integer TimeOfDay, + Integer RelayStatus, + Integer LocalTemperature, + Integer HumidityInPercentage, + Integer Setpoint, + Integer UnreadEntries) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo TimeOfDayResponseValue = new CommandResponseInfo("TimeOfDay", "Integer"); + responseValues.put(TimeOfDayResponseValue, TimeOfDay); + CommandResponseInfo RelayStatusResponseValue = + new CommandResponseInfo("RelayStatus", "Integer"); + responseValues.put(RelayStatusResponseValue, RelayStatus); + CommandResponseInfo LocalTemperatureResponseValue = + new CommandResponseInfo("LocalTemperature", "Integer"); + responseValues.put(LocalTemperatureResponseValue, LocalTemperature); + CommandResponseInfo HumidityInPercentageResponseValue = + new CommandResponseInfo("HumidityInPercentage", "Integer"); + responseValues.put(HumidityInPercentageResponseValue, HumidityInPercentage); + CommandResponseInfo SetpointResponseValue = new CommandResponseInfo("Setpoint", "Integer"); + responseValues.put(SetpointResponseValue, Setpoint); + CommandResponseInfo UnreadEntriesResponseValue = + new CommandResponseInfo("UnreadEntries", "Integer"); + responseValues.put(UnreadEntriesResponseValue, UnreadEntries); callback.onSuccess(responseValues); } @@ -6463,22 +6463,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - Integer numberOfTransitionsForSequence, - Integer dayOfWeekForSequence, - Integer modeForSequence, - ArrayList payload) { + Integer NumberOfTransitionsForSequence, + Integer DayOfWeekForSequence, + Integer ModeForSequence, + ArrayList Transitions) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo numberOfTransitionsForSequenceResponseValue = - new CommandResponseInfo("numberOfTransitionsForSequence", "Integer"); + CommandResponseInfo NumberOfTransitionsForSequenceResponseValue = + new CommandResponseInfo("NumberOfTransitionsForSequence", "Integer"); responseValues.put( - numberOfTransitionsForSequenceResponseValue, numberOfTransitionsForSequence); - CommandResponseInfo dayOfWeekForSequenceResponseValue = - new CommandResponseInfo("dayOfWeekForSequence", "Integer"); - responseValues.put(dayOfWeekForSequenceResponseValue, dayOfWeekForSequence); - CommandResponseInfo modeForSequenceResponseValue = - new CommandResponseInfo("modeForSequence", "Integer"); - responseValues.put(modeForSequenceResponseValue, modeForSequence); - // payload: /* TYPE WARNING: array array defaults to */ uint8_t * + NumberOfTransitionsForSequenceResponseValue, NumberOfTransitionsForSequence); + CommandResponseInfo DayOfWeekForSequenceResponseValue = + new CommandResponseInfo("DayOfWeekForSequence", "Integer"); + responseValues.put(DayOfWeekForSequenceResponseValue, DayOfWeekForSequence); + CommandResponseInfo ModeForSequenceResponseValue = + new CommandResponseInfo("ModeForSequence", "Integer"); + responseValues.put(ModeForSequenceResponseValue, ModeForSequence); + // Transitions: /* TYPE WARNING: array array defaults to */ uint8_t * // Conversion from this type to Java is not properly implemented yet callback.onSuccess(responseValues); } @@ -11824,11 +11824,6 @@ public Map> getCommandMap() { thermostatsetWeeklyScheduleCommandParams.put( "modeForSequence", thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo); - CommandParameterInfo thermostatsetWeeklySchedulepayloadCommandParameterInfo = - new CommandParameterInfo("payload", ArrayList.class); - thermostatsetWeeklyScheduleCommandParams.put( - "payload", thermostatsetWeeklySchedulepayloadCommandParameterInfo); - InteractionInfo thermostatsetWeeklyScheduleInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { @@ -11838,7 +11833,8 @@ public Map> getCommandMap() { (Integer) commandArguments.get("numberOfTransitionsForSequence"), (Integer) commandArguments.get("dayOfWeekForSequence"), (Integer) commandArguments.get("modeForSequence"), - (ArrayList) commandArguments.get("payload")); + (ArrayList) + commandArguments.get("transitions")); }, () -> new DelegatedDefaultClusterCallback(), thermostatsetWeeklyScheduleCommandParams); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java index 4e894545a5830f..f985ad3810f436 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java @@ -9234,7 +9234,8 @@ public Map> getReadAttributeMap() { new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ThermostatCluster) cluster) - .readLocalTemperatureAttribute((ChipClusters.IntegerAttributeCallback) callback); + .readLocalTemperatureAttribute( + (ChipClusters.ThermostatCluster.LocalTemperatureAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatLocalTemperatureCommandParams); diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index ec80df70789e22..f669a3df89c943 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -5958,7 +5958,9 @@ class ChipClusters: "numberOfTransitionsForSequence": "int", "dayOfWeekForSequence": "int", "modeForSequence": "int", - "payload": "int", + "transitionTime": "int", + "heatSetpoint": "int", + "coolSetpoint": "int", }, }, 0x00000000: { diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 0df7378ceb3c96..6fce95229b31c0 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -20105,19 +20105,19 @@ class Thermostat(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="localTemperature", Tag=0x00000000, Type=int), - ClusterObjectFieldDescriptor(Label="outdoorTemperature", Tag=0x00000001, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="localTemperature", Tag=0x00000000, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="outdoorTemperature", Tag=0x00000001, Type=typing.Union[None, Nullable, int]), ClusterObjectFieldDescriptor(Label="occupancy", Tag=0x00000002, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="absMinHeatSetpointLimit", Tag=0x00000003, Type=typing.Optional[int]), ClusterObjectFieldDescriptor(Label="absMaxHeatSetpointLimit", Tag=0x00000004, Type=typing.Optional[int]), ClusterObjectFieldDescriptor(Label="absMinCoolSetpointLimit", Tag=0x00000005, Type=typing.Optional[int]), ClusterObjectFieldDescriptor(Label="absMaxCoolSetpointLimit", Tag=0x00000006, Type=typing.Optional[int]), - ClusterObjectFieldDescriptor(Label="piCoolingDemand", Tag=0x00000007, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="piHeatingDemand", Tag=0x00000008, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="hvacSystemTypeConfiguration", Tag=0x00000009, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="PICoolingDemand", Tag=0x00000007, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="PIHeatingDemand", Tag=0x00000008, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="HVACSystemTypeConfiguration", Tag=0x00000009, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="localTemperatureCalibration", Tag=0x00000010, Type=typing.Optional[int]), - ClusterObjectFieldDescriptor(Label="occupiedCoolingSetpoint", Tag=0x00000011, Type=int), - ClusterObjectFieldDescriptor(Label="occupiedHeatingSetpoint", Tag=0x00000012, Type=int), + ClusterObjectFieldDescriptor(Label="occupiedCoolingSetpoint", Tag=0x00000011, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="occupiedHeatingSetpoint", Tag=0x00000012, Type=typing.Optional[int]), ClusterObjectFieldDescriptor(Label="unoccupiedCoolingSetpoint", Tag=0x00000013, Type=typing.Optional[int]), ClusterObjectFieldDescriptor(Label="unoccupiedHeatingSetpoint", Tag=0x00000014, Type=typing.Optional[int]), ClusterObjectFieldDescriptor(Label="minHeatSetpointLimit", Tag=0x00000015, Type=typing.Optional[int]), @@ -20134,20 +20134,27 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="numberOfWeeklyTransitions", Tag=0x00000021, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="numberOfDailyTransitions", Tag=0x00000022, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="temperatureSetpointHold", Tag=0x00000023, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="temperatureSetpointHoldDuration", Tag=0x00000024, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="temperatureSetpointHoldDuration", Tag=0x00000024, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="thermostatProgrammingOperationMode", Tag=0x00000025, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="thermostatRunningState", Tag=0x00000029, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="setpointChangeSource", Tag=0x00000030, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="setpointChangeAmount", Tag=0x00000031, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="setpointChangeAmount", Tag=0x00000031, Type=typing.Union[None, Nullable, int]), ClusterObjectFieldDescriptor(Label="setpointChangeSourceTimestamp", Tag=0x00000032, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="acType", Tag=0x00000040, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="acCapacity", Tag=0x00000041, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="acRefrigerantType", Tag=0x00000042, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="acCompressorType", Tag=0x00000043, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="acErrorCode", Tag=0x00000044, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="acLouverPosition", Tag=0x00000045, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="acCoilTemperature", Tag=0x00000046, Type=typing.Optional[int]), - ClusterObjectFieldDescriptor(Label="acCapacityFormat", Tag=0x00000047, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="occupiedSetback", Tag=0x00000034, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="occupiedSetbackMin", Tag=0x00000035, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="occupiedSetbackMax", Tag=0x00000036, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="unoccupiedSetback", Tag=0x00000037, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="unoccupiedSetbackMin", Tag=0x00000038, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="unoccupiedSetbackMax", Tag=0x00000039, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="emergencyHeatDelta", Tag=0x0000003A, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="ACType", Tag=0x00000040, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="ACCapacity", Tag=0x00000041, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="ACRefrigerantType", Tag=0x00000042, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="ACCompressorType", Tag=0x00000043, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="ACErrorCode", Tag=0x00000044, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="ACLouverPosition", Tag=0x00000045, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="ACCoilTemperature", Tag=0x00000046, Type=typing.Union[None, Nullable, int]), + ClusterObjectFieldDescriptor(Label="ACCapacityformat", Tag=0x00000047, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), @@ -20155,19 +20162,19 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - localTemperature: 'int' = None - outdoorTemperature: 'typing.Optional[int]' = None + localTemperature: 'typing.Union[Nullable, int]' = None + outdoorTemperature: 'typing.Union[None, Nullable, int]' = None occupancy: 'typing.Optional[uint]' = None absMinHeatSetpointLimit: 'typing.Optional[int]' = None absMaxHeatSetpointLimit: 'typing.Optional[int]' = None absMinCoolSetpointLimit: 'typing.Optional[int]' = None absMaxCoolSetpointLimit: 'typing.Optional[int]' = None - piCoolingDemand: 'typing.Optional[uint]' = None - piHeatingDemand: 'typing.Optional[uint]' = None - hvacSystemTypeConfiguration: 'typing.Optional[uint]' = None + PICoolingDemand: 'typing.Optional[uint]' = None + PIHeatingDemand: 'typing.Optional[uint]' = None + HVACSystemTypeConfiguration: 'typing.Optional[uint]' = None localTemperatureCalibration: 'typing.Optional[int]' = None - occupiedCoolingSetpoint: 'int' = None - occupiedHeatingSetpoint: 'int' = None + occupiedCoolingSetpoint: 'typing.Optional[int]' = None + occupiedHeatingSetpoint: 'typing.Optional[int]' = None unoccupiedCoolingSetpoint: 'typing.Optional[int]' = None unoccupiedHeatingSetpoint: 'typing.Optional[int]' = None minHeatSetpointLimit: 'typing.Optional[int]' = None @@ -20184,20 +20191,27 @@ def descriptor(cls) -> ClusterObjectDescriptor: numberOfWeeklyTransitions: 'typing.Optional[uint]' = None numberOfDailyTransitions: 'typing.Optional[uint]' = None temperatureSetpointHold: 'typing.Optional[uint]' = None - temperatureSetpointHoldDuration: 'typing.Optional[uint]' = None + temperatureSetpointHoldDuration: 'typing.Union[None, Nullable, uint]' = None thermostatProgrammingOperationMode: 'typing.Optional[uint]' = None thermostatRunningState: 'typing.Optional[uint]' = None setpointChangeSource: 'typing.Optional[uint]' = None - setpointChangeAmount: 'typing.Optional[int]' = None + setpointChangeAmount: 'typing.Union[None, Nullable, int]' = None setpointChangeSourceTimestamp: 'typing.Optional[uint]' = None - acType: 'typing.Optional[uint]' = None - acCapacity: 'typing.Optional[uint]' = None - acRefrigerantType: 'typing.Optional[uint]' = None - acCompressorType: 'typing.Optional[uint]' = None - acErrorCode: 'typing.Optional[uint]' = None - acLouverPosition: 'typing.Optional[uint]' = None - acCoilTemperature: 'typing.Optional[int]' = None - acCapacityFormat: 'typing.Optional[uint]' = None + occupiedSetback: 'typing.Union[None, Nullable, uint]' = None + occupiedSetbackMin: 'typing.Union[None, Nullable, uint]' = None + occupiedSetbackMax: 'typing.Union[None, Nullable, uint]' = None + unoccupiedSetback: 'typing.Union[None, Nullable, uint]' = None + unoccupiedSetbackMin: 'typing.Union[None, Nullable, uint]' = None + unoccupiedSetbackMax: 'typing.Union[None, Nullable, uint]' = None + emergencyHeatDelta: 'typing.Optional[uint]' = None + ACType: 'typing.Optional[uint]' = None + ACCapacity: 'typing.Optional[uint]' = None + ACRefrigerantType: 'typing.Optional[uint]' = None + ACCompressorType: 'typing.Optional[uint]' = None + ACErrorCode: 'typing.Optional[uint]' = None + ACLouverPosition: 'typing.Optional[uint]' = None + ACCoilTemperature: 'typing.Union[None, Nullable, int]' = None + ACCapacityformat: 'typing.Optional[uint]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None attributeList: 'typing.List[uint]' = None @@ -20233,6 +20247,23 @@ class ThermostatSystemMode(IntEnum): kFanOnly = 0x07 + class Structs: + @dataclass + class ThermostatScheduleTransition(ClusterObject): + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields = [ + ClusterObjectFieldDescriptor(Label="transitionTime", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="heatSetpoint", Tag=1, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="coolSetpoint", Tag=2, Type=typing.Union[Nullable, int]), + ]) + + transitionTime: 'uint' = 0 + heatSetpoint: 'typing.Union[Nullable, int]' = NullValue + coolSetpoint: 'typing.Union[Nullable, int]' = NullValue + + class Commands: @dataclass @@ -20265,13 +20296,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="numberOfTransitionsForSequence", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="dayOfWeekForSequence", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="modeForSequence", Tag=2, Type=uint), - ClusterObjectFieldDescriptor(Label="payload", Tag=3, Type=typing.List[uint]), + ClusterObjectFieldDescriptor(Label="transitions", Tag=3, Type=typing.List[Thermostat.Structs.ThermostatScheduleTransition]), ]) numberOfTransitionsForSequence: 'uint' = 0 dayOfWeekForSequence: 'uint' = 0 modeForSequence: 'uint' = 0 - payload: 'typing.List[uint]' = field(default_factory=lambda: []) + transitions: 'typing.List[Thermostat.Structs.ThermostatScheduleTransition]' = field(default_factory=lambda: []) @dataclass class SetWeeklySchedule(ClusterCommand): @@ -20286,13 +20317,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="numberOfTransitionsForSequence", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="dayOfWeekForSequence", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="modeForSequence", Tag=2, Type=uint), - ClusterObjectFieldDescriptor(Label="payload", Tag=3, Type=typing.List[uint]), + ClusterObjectFieldDescriptor(Label="transitions", Tag=3, Type=typing.List[Thermostat.Structs.ThermostatScheduleTransition]), ]) numberOfTransitionsForSequence: 'uint' = 0 dayOfWeekForSequence: 'uint' = 0 modeForSequence: 'uint' = 0 - payload: 'typing.List[uint]' = field(default_factory=lambda: []) + transitions: 'typing.List[Thermostat.Structs.ThermostatScheduleTransition]' = field(default_factory=lambda: []) @dataclass class GetRelayStatusLogResponse(ClusterCommand): @@ -20376,9 +20407,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=int) + return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, int]) - value: 'int' = 0 + value: 'typing.Union[Nullable, int]' = NullValue @dataclass class OutdoorTemperature(ClusterAttributeDescriptor): @@ -20392,9 +20423,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[int]) + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, int]) - value: 'typing.Optional[int]' = None + value: 'typing.Union[None, Nullable, int]' = None @dataclass class Occupancy(ClusterAttributeDescriptor): @@ -20477,7 +20508,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[int]' = None @dataclass - class PiCoolingDemand(ClusterAttributeDescriptor): + class PICoolingDemand(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 @@ -20493,7 +20524,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class PiHeatingDemand(ClusterAttributeDescriptor): + class PIHeatingDemand(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 @@ -20509,7 +20540,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class HvacSystemTypeConfiguration(ClusterAttributeDescriptor): + class HVACSystemTypeConfiguration(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 @@ -20552,9 +20583,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=int) + return ClusterObjectFieldDescriptor(Type=typing.Optional[int]) - value: 'int' = 0 + value: 'typing.Optional[int]' = None @dataclass class OccupiedHeatingSetpoint(ClusterAttributeDescriptor): @@ -20568,9 +20599,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=int) + return ClusterObjectFieldDescriptor(Type=typing.Optional[int]) - value: 'int' = 0 + value: 'typing.Optional[int]' = None @dataclass class UnoccupiedCoolingSetpoint(ClusterAttributeDescriptor): @@ -20840,9 +20871,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint]) - value: 'typing.Optional[uint]' = None + value: 'typing.Union[None, Nullable, uint]' = None @dataclass class ThermostatProgrammingOperationMode(ClusterAttributeDescriptor): @@ -20904,9 +20935,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[int]) + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, int]) - value: 'typing.Optional[int]' = None + value: 'typing.Union[None, Nullable, int]' = None @dataclass class SetpointChangeSourceTimestamp(ClusterAttributeDescriptor): @@ -20925,7 +20956,119 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class AcType(ClusterAttributeDescriptor): + class OccupiedSetback(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0201 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000034 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint]) + + value: 'typing.Union[None, Nullable, uint]' = None + + @dataclass + class OccupiedSetbackMin(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0201 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000035 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint]) + + value: 'typing.Union[None, Nullable, uint]' = None + + @dataclass + class OccupiedSetbackMax(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0201 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000036 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint]) + + value: 'typing.Union[None, Nullable, uint]' = None + + @dataclass + class UnoccupiedSetback(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0201 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000037 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint]) + + value: 'typing.Union[None, Nullable, uint]' = None + + @dataclass + class UnoccupiedSetbackMin(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0201 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000038 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint]) + + value: 'typing.Union[None, Nullable, uint]' = None + + @dataclass + class UnoccupiedSetbackMax(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0201 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000039 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint]) + + value: 'typing.Union[None, Nullable, uint]' = None + + @dataclass + class EmergencyHeatDelta(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0201 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000003A + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: 'typing.Optional[uint]' = None + + @dataclass + class ACType(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 @@ -20941,7 +21084,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class AcCapacity(ClusterAttributeDescriptor): + class ACCapacity(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 @@ -20957,7 +21100,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class AcRefrigerantType(ClusterAttributeDescriptor): + class ACRefrigerantType(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 @@ -20973,7 +21116,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class AcCompressorType(ClusterAttributeDescriptor): + class ACCompressorType(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 @@ -20989,7 +21132,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class AcErrorCode(ClusterAttributeDescriptor): + class ACErrorCode(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 @@ -21005,7 +21148,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class AcLouverPosition(ClusterAttributeDescriptor): + class ACLouverPosition(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 @@ -21021,7 +21164,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class AcCoilTemperature(ClusterAttributeDescriptor): + class ACCoilTemperature(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 @@ -21032,12 +21175,12 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[int]) + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, int]) - value: 'typing.Optional[int]' = None + value: 'typing.Union[None, Nullable, int]' = None @dataclass - class AcCapacityFormat(ClusterAttributeDescriptor): + class ACCapacityformat(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index e1605d09c344a1..c100aa9e145db7 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -14257,8 +14257,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader if (*aError != CHIP_NO_ERROR) { return nil; } - NSNumber * _Nonnull value; - value = [NSNumber numberWithShort:cppValue]; + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithShort:cppValue.Value()]; + } return value; } case Attributes::OutdoorTemperature::Id: { @@ -14268,8 +14272,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader if (*aError != CHIP_NO_ERROR) { return nil; } - NSNumber * _Nonnull value; - value = [NSNumber numberWithShort:cppValue]; + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithShort:cppValue.Value()]; + } return value; } case Attributes::Occupancy::Id: { @@ -14327,8 +14335,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [NSNumber numberWithShort:cppValue]; return value; } - case Attributes::PiCoolingDemand::Id: { - using TypeInfo = Attributes::PiCoolingDemand::TypeInfo; + case Attributes::PICoolingDemand::Id: { + using TypeInfo = Attributes::PICoolingDemand::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -14338,8 +14346,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [NSNumber numberWithUnsignedChar:cppValue]; return value; } - case Attributes::PiHeatingDemand::Id: { - using TypeInfo = Attributes::PiHeatingDemand::TypeInfo; + case Attributes::PIHeatingDemand::Id: { + using TypeInfo = Attributes::PIHeatingDemand::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -14349,8 +14357,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [NSNumber numberWithUnsignedChar:cppValue]; return value; } - case Attributes::HvacSystemTypeConfiguration::Id: { - using TypeInfo = Attributes::HvacSystemTypeConfiguration::TypeInfo; + case Attributes::HVACSystemTypeConfiguration::Id: { + using TypeInfo = Attributes::HVACSystemTypeConfiguration::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -14576,8 +14584,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader if (*aError != CHIP_NO_ERROR) { return nil; } - NSNumber * _Nonnull value; - value = [NSNumber numberWithUnsignedShort:cppValue]; + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedShort:cppValue.Value()]; + } return value; } case Attributes::ThermostatProgrammingOperationMode::Id: { @@ -14620,8 +14632,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader if (*aError != CHIP_NO_ERROR) { return nil; } - NSNumber * _Nonnull value; - value = [NSNumber numberWithShort:cppValue]; + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithShort:cppValue.Value()]; + } return value; } case Attributes::SetpointChangeSourceTimestamp::Id: { @@ -14635,8 +14651,98 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [NSNumber numberWithUnsignedInt:cppValue]; return value; } - case Attributes::AcType::Id: { - using TypeInfo = Attributes::AcType::TypeInfo; + case Attributes::OccupiedSetback::Id: { + using TypeInfo = Attributes::OccupiedSetback::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedChar:cppValue.Value()]; + } + return value; + } + case Attributes::OccupiedSetbackMin::Id: { + using TypeInfo = Attributes::OccupiedSetbackMin::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedChar:cppValue.Value()]; + } + return value; + } + case Attributes::OccupiedSetbackMax::Id: { + using TypeInfo = Attributes::OccupiedSetbackMax::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedChar:cppValue.Value()]; + } + return value; + } + case Attributes::UnoccupiedSetback::Id: { + using TypeInfo = Attributes::UnoccupiedSetback::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedChar:cppValue.Value()]; + } + return value; + } + case Attributes::UnoccupiedSetbackMin::Id: { + using TypeInfo = Attributes::UnoccupiedSetbackMin::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedChar:cppValue.Value()]; + } + return value; + } + case Attributes::UnoccupiedSetbackMax::Id: { + using TypeInfo = Attributes::UnoccupiedSetbackMax::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedChar:cppValue.Value()]; + } + return value; + } + case Attributes::EmergencyHeatDelta::Id: { + using TypeInfo = Attributes::EmergencyHeatDelta::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -14646,8 +14752,19 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [NSNumber numberWithUnsignedChar:cppValue]; return value; } - case Attributes::AcCapacity::Id: { - using TypeInfo = Attributes::AcCapacity::TypeInfo; + case Attributes::ACType::Id: { + using TypeInfo = Attributes::ACType::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nonnull value; + value = [NSNumber numberWithUnsignedChar:cppValue]; + return value; + } + case Attributes::ACCapacity::Id: { + using TypeInfo = Attributes::ACCapacity::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -14657,8 +14774,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [NSNumber numberWithUnsignedShort:cppValue]; return value; } - case Attributes::AcRefrigerantType::Id: { - using TypeInfo = Attributes::AcRefrigerantType::TypeInfo; + case Attributes::ACRefrigerantType::Id: { + using TypeInfo = Attributes::ACRefrigerantType::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -14668,8 +14785,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [NSNumber numberWithUnsignedChar:cppValue]; return value; } - case Attributes::AcCompressorType::Id: { - using TypeInfo = Attributes::AcCompressorType::TypeInfo; + case Attributes::ACCompressorType::Id: { + using TypeInfo = Attributes::ACCompressorType::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -14679,8 +14796,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [NSNumber numberWithUnsignedChar:cppValue]; return value; } - case Attributes::AcErrorCode::Id: { - using TypeInfo = Attributes::AcErrorCode::TypeInfo; + case Attributes::ACErrorCode::Id: { + using TypeInfo = Attributes::ACErrorCode::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -14690,8 +14807,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [NSNumber numberWithUnsignedInt:cppValue]; return value; } - case Attributes::AcLouverPosition::Id: { - using TypeInfo = Attributes::AcLouverPosition::TypeInfo; + case Attributes::ACLouverPosition::Id: { + using TypeInfo = Attributes::ACLouverPosition::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -14701,19 +14818,23 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader value = [NSNumber numberWithUnsignedChar:cppValue]; return value; } - case Attributes::AcCoilTemperature::Id: { - using TypeInfo = Attributes::AcCoilTemperature::TypeInfo; + case Attributes::ACCoilTemperature::Id: { + using TypeInfo = Attributes::ACCoilTemperature::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { return nil; } - NSNumber * _Nonnull value; - value = [NSNumber numberWithShort:cppValue]; + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithShort:cppValue.Value()]; + } return value; } - case Attributes::AcCapacityFormat::Id: { - using TypeInfo = Attributes::AcCapacityFormat::TypeInfo; + case Attributes::ACCapacityformat::Id: { + using TypeInfo = Attributes::ACCapacityformat::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm index c5e023f5d830b4..a3436ed15a58ae 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -13506,11 +13506,22 @@ { { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; - auto iter_0 = data.payload.begin(); + auto iter_0 = data.transitions.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - NSNumber * newElement_0; - newElement_0 = [NSNumber numberWithUnsignedChar:entry_0]; + CHIPThermostatClusterThermostatScheduleTransition * newElement_0; + newElement_0 = [CHIPThermostatClusterThermostatScheduleTransition new]; + newElement_0.transitionTime = [NSNumber numberWithUnsignedShort:entry_0.transitionTime]; + if (entry_0.heatSetpoint.IsNull()) { + newElement_0.heatSetpoint = nil; + } else { + newElement_0.heatSetpoint = [NSNumber numberWithShort:entry_0.heatSetpoint.Value()]; + } + if (entry_0.coolSetpoint.IsNull()) { + newElement_0.coolSetpoint = nil; + } else { + newElement_0.coolSetpoint = [NSNumber numberWithShort:entry_0.coolSetpoint.Value()]; + } [array_0 addObject:newElement_0]; } CHIP_ERROR err = iter_0.GetStatus(); @@ -13518,7 +13529,7 @@ OnFailureFn(context, err); return; } - response.payload = array_0; + response.transitions = array_0; } } DispatchSuccess(context, response); @@ -13532,7 +13543,7 @@ response.timeOfDay = [NSNumber numberWithUnsignedShort:data.timeOfDay]; } { - response.relayStatus = [NSNumber numberWithUnsignedShort:data.relayStatus]; + response.relayStatus = [NSNumber numberWithUnsignedChar:data.relayStatus]; } { response.localTemperature = [NSNumber numberWithShort:data.localTemperature]; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h index 7a8aa27608d157..93c45f4a1e602f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h @@ -17643,61 +17643,61 @@ NS_ASSUME_NONNULL_BEGIN completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributePiCoolingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributePICoolingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributePiCoolingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributePICoolingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributePiCoolingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributePICoolingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributePiHeatingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributePIHeatingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributePiHeatingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributePIHeatingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributePiHeatingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributePIHeatingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeHvacSystemTypeConfigurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeHVACSystemTypeConfigurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)writeAttributeHvacSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeHvacSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributeHvacSystemTypeConfigurationWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished: (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributeHvacSystemTypeConfigurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeHVACSystemTypeConfigurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, @@ -18125,9 +18125,9 @@ NS_ASSUME_NONNULL_BEGIN - (void)readAttributeTemperatureSetpointHoldDurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler; /** @@ -18247,168 +18247,308 @@ NS_ASSUME_NONNULL_BEGIN completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeAcTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)writeAttributeAcTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeAcTypeWithValue:(NSNumber * _Nonnull)value +- (void)readAttributeOccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler; +- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value + params:(CHIPWriteParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler; +/** + * This API does not support setting autoResubscribe to NO in the + * CHIPSubscribeParams. + */ +- (void)subscribeAttributeOccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; ++ (void)readAttributeOccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; + +- (void)readAttributeOccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler; +/** + * This API does not support setting autoResubscribe to NO in the + * CHIPSubscribeParams. + */ +- (void)subscribeAttributeOccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; ++ (void)readAttributeOccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; + +- (void)readAttributeOccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler; +/** + * This API does not support setting autoResubscribe to NO in the + * CHIPSubscribeParams. + */ +- (void)subscribeAttributeOccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; ++ (void)readAttributeOccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; + +- (void)readAttributeUnoccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler; +- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value + params:(CHIPWriteParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler; +/** + * This API does not support setting autoResubscribe to NO in the + * CHIPSubscribeParams. + */ +- (void)subscribeAttributeUnoccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; ++ (void)readAttributeUnoccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; + +- (void)readAttributeUnoccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler; +/** + * This API does not support setting autoResubscribe to NO in the + * CHIPSubscribeParams. + */ +- (void)subscribeAttributeUnoccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished: + (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; ++ (void)readAttributeUnoccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; + +- (void)readAttributeUnoccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler; +/** + * This API does not support setting autoResubscribe to NO in the + * CHIPSubscribeParams. + */ +- (void)subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished: + (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; ++ (void)readAttributeUnoccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; + +- (void)readAttributeEmergencyHeatDeltaWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler; +- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value + params:(CHIPWriteParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler; +/** + * This API does not support setting autoResubscribe to NO in the + * CHIPSubscribeParams. + */ +- (void)subscribeAttributeEmergencyHeatDeltaWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; ++ (void)readAttributeEmergencyHeatDeltaWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; + +- (void)readAttributeACTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; +- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributeAcTypeWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributeAcTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeAcCapacityWithCompletionHandler:(void (^)( +- (void)readAttributeACCapacityWithCompletionHandler:(void (^)( NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)writeAttributeAcCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeAcCapacityWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributeAcCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributeAcCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeAcRefrigerantTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeACRefrigerantTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)writeAttributeAcRefrigerantTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeAcRefrigerantTypeWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributeAcRefrigerantTypeWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACRefrigerantTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributeAcRefrigerantTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACRefrigerantTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeAcCompressorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeACCompressorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)writeAttributeAcCompressorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeAcCompressorTypeWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributeAcCompressorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACCompressorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributeAcCompressorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACCompressorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeAcErrorCodeWithCompletionHandler:(void (^)( +- (void)readAttributeACErrorCodeWithCompletionHandler:(void (^)( NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)writeAttributeAcErrorCodeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeAcErrorCodeWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributeAcErrorCodeWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACErrorCodeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributeAcErrorCodeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACErrorCodeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeAcLouverPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeACLouverPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)writeAttributeAcLouverPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeAcLouverPositionWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributeAcLouverPositionWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACLouverPositionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributeAcLouverPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACLouverPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeAcCoilTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeACCoilTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributeAcCoilTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACCoilTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributeAcCoilTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACCoilTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeAcCapacityFormatWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeACCapacityformatWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)writeAttributeAcCapacityFormatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeAcCapacityFormatWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler; /** * This API does not support setting autoResubscribe to NO in the * CHIPSubscribeParams. */ -- (void)subscribeAttributeAcCapacityFormatWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACCapacityformatWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributeAcCapacityFormatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACCapacityformatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index 5ba22ea5618b66..bd9a597b6091b6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -68510,25 +68510,37 @@ - (void)setWeeklyScheduleWithParams:(CHIPThermostatClusterSetWeeklyScheduleParam request.modeForSequence = static_cast>(params.modeForSequence.unsignedCharValue); { - using ListType_0 = std::remove_reference_t; + using ListType_0 = std::remove_reference_t; using ListMemberType_0 = ListMemberTypeGetter::Type; - if (params.payload.count != 0) { - auto * listHolder_0 = new ListHolder(params.payload.count); + if (params.transitions.count != 0) { + auto * listHolder_0 = new ListHolder(params.transitions.count); if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) { return; } listFreer.add(listHolder_0); - for (size_t i_0 = 0; i_0 < params.payload.count; ++i_0) { - if (![params.payload[i_0] isKindOfClass:[NSNumber class]]) { + for (size_t i_0 = 0; i_0 < params.transitions.count; ++i_0) { + if (![params.transitions[i_0] isKindOfClass:[CHIPThermostatClusterThermostatScheduleTransition class]]) { // Wrong kind of value. return; } - auto element_0 = (NSNumber *) params.payload[i_0]; - listHolder_0->mList[i_0] = element_0.unsignedCharValue; + auto element_0 = (CHIPThermostatClusterThermostatScheduleTransition *) params.transitions[i_0]; + listHolder_0->mList[i_0].transitionTime = element_0.transitionTime.unsignedShortValue; + if (element_0.heatSetpoint == nil) { + listHolder_0->mList[i_0].heatSetpoint.SetNull(); + } else { + auto & nonNullValue_2 = listHolder_0->mList[i_0].heatSetpoint.SetNonNull(); + nonNullValue_2 = element_0.heatSetpoint.shortValue; + } + if (element_0.coolSetpoint == nil) { + listHolder_0->mList[i_0].coolSetpoint.SetNull(); + } else { + auto & nonNullValue_2 = listHolder_0->mList[i_0].coolSetpoint.SetNonNull(); + nonNullValue_2 = element_0.coolSetpoint.shortValue; + } } - request.payload = ListType_0(listHolder_0->mList, params.payload.count); + request.transitions = ListType_0(listHolder_0->mList, params.transitions.count); } else { - request.payload = ListType_0(); + request.transitions = ListType_0(); } } @@ -68630,12 +68642,13 @@ new CHIPThermostatClusterGetRelayStatusLogResponseCallbackBridge( - (void)readAttributeLocalTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); + new CHIPNullableInt16sAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); } - (void)subscribeAttributeLocalTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval @@ -68645,7 +68658,7 @@ - (void)subscribeAttributeLocalTemperatureWithMinInterval:(NSNumber * _Nonnull)m reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPInt16sAttributeCallbackSubscriptionBridge( + new CHIPNullableInt16sAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { @@ -68653,11 +68666,11 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge( return CHIP_ERROR_INVALID_ARGUMENT; } using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], - CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, @@ -68670,7 +68683,7 @@ + (void)readAttributeLocalTemperatureWithAttributeCache:(CHIPAttributeCacheConta completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo; @@ -68679,7 +68692,7 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s path.mAttributeId = TypeInfo::GetAttributeId(); TypeInfo::DecodableType value; CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); if (err == CHIP_NO_ERROR) { successFn->mCall(successFn->mContext, value); } @@ -68692,12 +68705,13 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s - (void)readAttributeOutdoorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); + new CHIPNullableInt16sAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); } - (void)subscribeAttributeOutdoorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval @@ -68707,7 +68721,7 @@ - (void)subscribeAttributeOutdoorTemperatureWithMinInterval:(NSNumber * _Nonnull reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPInt16sAttributeCallbackSubscriptionBridge( + new CHIPNullableInt16sAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { @@ -68715,11 +68729,11 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge( return CHIP_ERROR_INVALID_ARGUMENT; } using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], - CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, @@ -68732,7 +68746,7 @@ + (void)readAttributeOutdoorTemperatureWithAttributeCache:(CHIPAttributeCacheCon completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo; @@ -68741,7 +68755,7 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s path.mAttributeId = TypeInfo::GetAttributeId(); TypeInfo::DecodableType value; CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); if (err == CHIP_NO_ERROR) { successFn->mCall(successFn->mContext, value); } @@ -69063,18 +69077,18 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s }); } -- (void)readAttributePiCoolingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributePICoolingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::PiCoolingDemand::TypeInfo; + using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)subscribeAttributePiCoolingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributePICoolingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler @@ -69088,7 +69102,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = Thermostat::Attributes::PiCoolingDemand::TypeInfo; + using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, @@ -69100,7 +69114,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( subscriptionEstablishedHandler); } -+ (void)readAttributePiCoolingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributePICoolingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: @@ -69109,7 +69123,7 @@ + (void)readAttributePiCoolingDemandWithAttributeCache:(CHIPAttributeCacheContai new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = Thermostat::Attributes::PiCoolingDemand::TypeInfo; + using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -69125,18 +69139,18 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su }); } -- (void)readAttributePiHeatingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributePIHeatingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::PiHeatingDemand::TypeInfo; + using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)subscribeAttributePiHeatingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributePIHeatingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler @@ -69150,7 +69164,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = Thermostat::Attributes::PiHeatingDemand::TypeInfo; + using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, @@ -69162,7 +69176,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( subscriptionEstablishedHandler); } -+ (void)readAttributePiHeatingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributePIHeatingDemandWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: @@ -69171,7 +69185,7 @@ + (void)readAttributePiHeatingDemandWithAttributeCache:(CHIPAttributeCacheContai new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = Thermostat::Attributes::PiHeatingDemand::TypeInfo; + using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -69187,25 +69201,25 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su }); } -- (void)readAttributeHvacSystemTypeConfigurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeHVACSystemTypeConfigurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::HvacSystemTypeConfiguration::TypeInfo; + using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)writeAttributeHvacSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler { - [self writeAttributeHvacSystemTypeConfigurationWithValue:(NSNumber * _Nonnull) value + [self writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; } -- (void)writeAttributeHvacSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler { @@ -69223,7 +69237,7 @@ new CHIPDefaultSuccessCallbackBridge( }, ^(Cancelable * success, Cancelable * failure) { ListFreer listFreer; - using TypeInfo = Thermostat::Attributes::HvacSystemTypeConfiguration::TypeInfo; + using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedCharValue; auto successFn = Callback::FromCancelable(success); @@ -69233,7 +69247,7 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)subscribeAttributeHvacSystemTypeConfigurationWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished: @@ -69248,7 +69262,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = Thermostat::Attributes::HvacSystemTypeConfiguration::TypeInfo; + using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, @@ -69260,7 +69274,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( subscriptionEstablishedHandler); } -+ (void)readAttributeHvacSystemTypeConfigurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeHVACSystemTypeConfigurationWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, @@ -69269,7 +69283,7 @@ + (void)readAttributeHvacSystemTypeConfigurationWithAttributeCache:(CHIPAttribut new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = Thermostat::Attributes::HvacSystemTypeConfiguration::TypeInfo; + using TypeInfo = Thermostat::Attributes::HVACSystemTypeConfiguration::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -70947,22 +70961,23 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su - (void)readAttributeTemperatureSetpointHoldDurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); + new CHIPNullableInt16uAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); } -- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler { - [self writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nonnull) value + [self writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler]; } -- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler { @@ -70982,7 +70997,12 @@ new CHIPDefaultSuccessCallbackBridge( ListFreer listFreer; using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.unsignedShortValue; + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = value.unsignedShortValue; + } auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute( @@ -70998,7 +71018,7 @@ - (void)subscribeAttributeTemperatureSetpointHoldDurationWithMinInterval:(NSNumb reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPInt16uAttributeCallbackSubscriptionBridge( + new CHIPNullableInt16uAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { @@ -71006,11 +71026,11 @@ new CHIPInt16uAttributeCallbackSubscriptionBridge( return CHIP_ERROR_INVALID_ARGUMENT; } using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], - CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + CHIPNullableInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, @@ -71023,7 +71043,7 @@ + (void)readAttributeTemperatureSetpointHoldDurationWithAttributeCache:(CHIPAttr completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; using TypeInfo = Thermostat::Attributes::TemperatureSetpointHoldDuration::TypeInfo; @@ -71032,7 +71052,7 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s path.mAttributeId = TypeInfo::GetAttributeId(); TypeInfo::DecodableType value; CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); if (err == CHIP_NO_ERROR) { successFn->mCall(successFn->mContext, value); } @@ -71269,12 +71289,13 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su - (void)readAttributeSetpointChangeAmountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); + new CHIPNullableInt16sAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); } - (void)subscribeAttributeSetpointChangeAmountWithMinInterval:(NSNumber * _Nonnull)minInterval @@ -71285,7 +71306,7 @@ - (void)subscribeAttributeSetpointChangeAmountWithMinInterval:(NSNumber * _Nonnu reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPInt16sAttributeCallbackSubscriptionBridge( + new CHIPNullableInt16sAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { @@ -71293,11 +71314,11 @@ new CHIPInt16sAttributeCallbackSubscriptionBridge( return CHIP_ERROR_INVALID_ARGUMENT; } using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], - CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, @@ -71310,7 +71331,7 @@ + (void)readAttributeSetpointChangeAmountWithAttributeCache:(CHIPAttributeCacheC completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo; @@ -71319,7 +71340,7 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s path.mAttributeId = TypeInfo::GetAttributeId(); TypeInfo::DecodableType value; CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); if (err == CHIP_NO_ERROR) { successFn->mCall(successFn->mContext, value); } @@ -71392,23 +71413,25 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s }); } -- (void)readAttributeAcTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler +- (void)readAttributeOccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler { - new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::AcType::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); + new CHIPNullableInt8uAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); } -- (void)writeAttributeAcTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler { - [self writeAttributeAcTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; + [self writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler]; } -- (void)writeAttributeAcTypeWithValue:(NSNumber * _Nonnull)value - params:(CHIPWriteParams * _Nullable)params - completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value + params:(CHIPWriteParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler { chip::Optional timedWriteTimeoutMs; if (params != nil) { @@ -71424,9 +71447,14 @@ new CHIPDefaultSuccessCallbackBridge( }, ^(Cancelable * success, Cancelable * failure) { ListFreer listFreer; - using TypeInfo = Thermostat::Attributes::AcType::TypeInfo; + using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.unsignedCharValue; + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = value.unsignedCharValue; + } auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute( @@ -71434,46 +71462,48 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)subscribeAttributeAcTypeWithMinInterval:(NSNumber * _Nonnull)minInterval - maxInterval:(NSNumber * _Nonnull)maxInterval - params:(CHIPSubscribeParams * _Nullable)params - subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler - reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +- (void)subscribeAttributeOccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPInt8uAttributeCallbackSubscriptionBridge( + new CHIPNullableInt8uAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = Thermostat::Attributes::AcType::TypeInfo; - auto successFn = Callback::FromCancelable(success); + using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo; + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], - CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, subscriptionEstablishedHandler); } -+ (void)readAttributeAcTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer - endpoint:(NSNumber *)endpoint - queue:(dispatch_queue_t)queue - completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler ++ (void)readAttributeOccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = Thermostat::Attributes::AcType::TypeInfo; + using TypeInfo = Thermostat::Attributes::OccupiedSetback::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); TypeInfo::DecodableType value; CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); if (err == CHIP_NO_ERROR) { successFn->mCall(successFn->mContext, value); } @@ -71483,89 +71513,123 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su }); } -- (void)readAttributeAcCapacityWithCompletionHandler:(void (^)( - NSNumber * _Nullable value, NSError * _Nullable error))completionHandler +- (void)readAttributeOccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler { - new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::AcCapacity::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); + new CHIPNullableInt8uAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); } -- (void)writeAttributeAcCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)subscribeAttributeOccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - [self writeAttributeAcCapacityWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; + new CHIPNullableInt8uAttributeCallbackSubscriptionBridge( + self.callbackQueue, reportHandler, + ^(Cancelable * success, Cancelable * failure) { + if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { + // We don't support disabling auto-resubscribe. + return CHIP_ERROR_INVALID_ARGUMENT; + } + using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, + [minInterval unsignedShortValue], [maxInterval unsignedShortValue], + CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], + params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); + }, + subscriptionEstablishedHandler); } -- (void)writeAttributeAcCapacityWithValue:(NSNumber * _Nonnull)value - params:(CHIPWriteParams * _Nullable)params - completionHandler:(StatusCompletion)completionHandler + ++ (void)readAttributeOccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - chip::Optional timedWriteTimeoutMs; - if (params != nil) { - if (params.timedWriteTimeoutMs != nil) { - timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue); + new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + if (attributeCacheContainer.cppAttributeCache) { + chip::app::ConcreteAttributePath path; + using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo; + path.mEndpointId = static_cast([endpoint unsignedShortValue]); + path.mClusterId = TypeInfo::GetClusterId(); + path.mAttributeId = TypeInfo::GetAttributeId(); + TypeInfo::DecodableType value; + CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); + auto successFn = Callback::FromCancelable(success); + if (err == CHIP_NO_ERROR) { + successFn->mCall(successFn->mContext, value); + } + return err; } - } + return CHIP_ERROR_NOT_FOUND; + }); +} - new CHIPDefaultSuccessCallbackBridge( - self.callbackQueue, - ^(id _Nullable ignored, NSError * _Nullable error) { - completionHandler(error); - }, - ^(Cancelable * success, Cancelable * failure) { - ListFreer listFreer; - using TypeInfo = Thermostat::Attributes::AcCapacity::TypeInfo; - TypeInfo::Type cppValue; - cppValue = value.unsignedShortValue; - auto successFn = Callback::FromCancelable(success); +- (void)readAttributeOccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler +{ + new CHIPNullableInt8uAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo; + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.WriteAttribute( - cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)subscribeAttributeAcCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval - maxInterval:(NSNumber * _Nonnull)maxInterval - params:(CHIPSubscribeParams * _Nullable)params - subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler - reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +- (void)subscribeAttributeOccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPInt16uAttributeCallbackSubscriptionBridge( + new CHIPNullableInt8uAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = Thermostat::Attributes::AcCapacity::TypeInfo; - auto successFn = Callback::FromCancelable(success); + using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo; + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], - CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, subscriptionEstablishedHandler); } -+ (void)readAttributeAcCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer - endpoint:(NSNumber *)endpoint - queue:(dispatch_queue_t)queue - completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler ++ (void)readAttributeOccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = Thermostat::Attributes::AcCapacity::TypeInfo; + using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); TypeInfo::DecodableType value; CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); if (err == CHIP_NO_ERROR) { successFn->mCall(successFn->mContext, value); } @@ -71575,22 +71639,527 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s }); } -- (void)readAttributeAcRefrigerantTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeUnoccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::AcRefrigerantType::TypeInfo; + new CHIPNullableInt8uAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + +- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler +{ + [self writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable) value params:nil completionHandler:completionHandler]; +} +- (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value + params:(CHIPWriteParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler +{ + chip::Optional timedWriteTimeoutMs; + if (params != nil) { + if (params.timedWriteTimeoutMs != nil) { + timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue); + } + } + + new CHIPDefaultSuccessCallbackBridge( + self.callbackQueue, + ^(id _Nullable ignored, NSError * _Nullable error) { + completionHandler(error); + }, + ^(Cancelable * success, Cancelable * failure) { + ListFreer listFreer; + using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo; + TypeInfo::Type cppValue; + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = value.unsignedCharValue; + } + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.WriteAttribute( + cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs); + }); +} + +- (void)subscribeAttributeUnoccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + new CHIPNullableInt8uAttributeCallbackSubscriptionBridge( + self.callbackQueue, reportHandler, + ^(Cancelable * success, Cancelable * failure) { + if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { + // We don't support disabling auto-resubscribe. + return CHIP_ERROR_INVALID_ARGUMENT; + } + using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, + [minInterval unsignedShortValue], [maxInterval unsignedShortValue], + CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], + params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); + }, + subscriptionEstablishedHandler); +} + ++ (void)readAttributeUnoccupiedSetbackWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler +{ + new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + if (attributeCacheContainer.cppAttributeCache) { + chip::app::ConcreteAttributePath path; + using TypeInfo = Thermostat::Attributes::UnoccupiedSetback::TypeInfo; + path.mEndpointId = static_cast([endpoint unsignedShortValue]); + path.mClusterId = TypeInfo::GetClusterId(); + path.mAttributeId = TypeInfo::GetAttributeId(); + TypeInfo::DecodableType value; + CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); + auto successFn = Callback::FromCancelable(success); + if (err == CHIP_NO_ERROR) { + successFn->mCall(successFn->mContext, value); + } + return err; + } + return CHIP_ERROR_NOT_FOUND; + }); +} + +- (void)readAttributeUnoccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler +{ + new CHIPNullableInt8uAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + +- (void)subscribeAttributeUnoccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished: + (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + new CHIPNullableInt8uAttributeCallbackSubscriptionBridge( + self.callbackQueue, reportHandler, + ^(Cancelable * success, Cancelable * failure) { + if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { + // We don't support disabling auto-resubscribe. + return CHIP_ERROR_INVALID_ARGUMENT; + } + using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, + [minInterval unsignedShortValue], [maxInterval unsignedShortValue], + CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], + params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); + }, + subscriptionEstablishedHandler); +} + ++ (void)readAttributeUnoccupiedSetbackMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler +{ + new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + if (attributeCacheContainer.cppAttributeCache) { + chip::app::ConcreteAttributePath path; + using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo; + path.mEndpointId = static_cast([endpoint unsignedShortValue]); + path.mClusterId = TypeInfo::GetClusterId(); + path.mAttributeId = TypeInfo::GetAttributeId(); + TypeInfo::DecodableType value; + CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); + auto successFn = Callback::FromCancelable(success); + if (err == CHIP_NO_ERROR) { + successFn->mCall(successFn->mContext, value); + } + return err; + } + return CHIP_ERROR_NOT_FOUND; + }); +} + +- (void)readAttributeUnoccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler +{ + new CHIPNullableInt8uAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + +- (void)subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished: + (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + new CHIPNullableInt8uAttributeCallbackSubscriptionBridge( + self.callbackQueue, reportHandler, + ^(Cancelable * success, Cancelable * failure) { + if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { + // We don't support disabling auto-resubscribe. + return CHIP_ERROR_INVALID_ARGUMENT; + } + using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, + [minInterval unsignedShortValue], [maxInterval unsignedShortValue], + CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], + params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); + }, + subscriptionEstablishedHandler); +} + ++ (void)readAttributeUnoccupiedSetbackMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler +{ + new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + if (attributeCacheContainer.cppAttributeCache) { + chip::app::ConcreteAttributePath path; + using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo; + path.mEndpointId = static_cast([endpoint unsignedShortValue]); + path.mClusterId = TypeInfo::GetClusterId(); + path.mAttributeId = TypeInfo::GetAttributeId(); + TypeInfo::DecodableType value; + CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); + auto successFn = Callback::FromCancelable(success); + if (err == CHIP_NO_ERROR) { + successFn->mCall(successFn->mContext, value); + } + return err; + } + return CHIP_ERROR_NOT_FOUND; + }); +} + +- (void)readAttributeEmergencyHeatDeltaWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler +{ + new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)writeAttributeAcRefrigerantTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler { - [self writeAttributeAcRefrigerantTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; + [self writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; } -- (void)writeAttributeAcRefrigerantTypeWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value + params:(CHIPWriteParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler +{ + chip::Optional timedWriteTimeoutMs; + if (params != nil) { + if (params.timedWriteTimeoutMs != nil) { + timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue); + } + } + + new CHIPDefaultSuccessCallbackBridge( + self.callbackQueue, + ^(id _Nullable ignored, NSError * _Nullable error) { + completionHandler(error); + }, + ^(Cancelable * success, Cancelable * failure) { + ListFreer listFreer; + using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo; + TypeInfo::Type cppValue; + cppValue = value.unsignedCharValue; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.WriteAttribute( + cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs); + }); +} + +- (void)subscribeAttributeEmergencyHeatDeltaWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + new CHIPInt8uAttributeCallbackSubscriptionBridge( + self.callbackQueue, reportHandler, + ^(Cancelable * success, Cancelable * failure) { + if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { + // We don't support disabling auto-resubscribe. + return CHIP_ERROR_INVALID_ARGUMENT; + } + using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, + [minInterval unsignedShortValue], [maxInterval unsignedShortValue], + CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], + params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); + }, + subscriptionEstablishedHandler); +} + ++ (void)readAttributeEmergencyHeatDeltaWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler +{ + new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + if (attributeCacheContainer.cppAttributeCache) { + chip::app::ConcreteAttributePath path; + using TypeInfo = Thermostat::Attributes::EmergencyHeatDelta::TypeInfo; + path.mEndpointId = static_cast([endpoint unsignedShortValue]); + path.mClusterId = TypeInfo::GetClusterId(); + path.mAttributeId = TypeInfo::GetAttributeId(); + TypeInfo::DecodableType value; + CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); + auto successFn = Callback::FromCancelable(success); + if (err == CHIP_NO_ERROR) { + successFn->mCall(successFn->mContext, value); + } + return err; + } + return CHIP_ERROR_NOT_FOUND; + }); +} + +- (void)readAttributeACTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler +{ + new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::ACType::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + +- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +{ + [self writeAttributeACTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; +} +- (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value + params:(CHIPWriteParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler +{ + chip::Optional timedWriteTimeoutMs; + if (params != nil) { + if (params.timedWriteTimeoutMs != nil) { + timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue); + } + } + + new CHIPDefaultSuccessCallbackBridge( + self.callbackQueue, + ^(id _Nullable ignored, NSError * _Nullable error) { + completionHandler(error); + }, + ^(Cancelable * success, Cancelable * failure) { + ListFreer listFreer; + using TypeInfo = Thermostat::Attributes::ACType::TypeInfo; + TypeInfo::Type cppValue; + cppValue = value.unsignedCharValue; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.WriteAttribute( + cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs); + }); +} + +- (void)subscribeAttributeACTypeWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + new CHIPInt8uAttributeCallbackSubscriptionBridge( + self.callbackQueue, reportHandler, + ^(Cancelable * success, Cancelable * failure) { + if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { + // We don't support disabling auto-resubscribe. + return CHIP_ERROR_INVALID_ARGUMENT; + } + using TypeInfo = Thermostat::Attributes::ACType::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, + [minInterval unsignedShortValue], [maxInterval unsignedShortValue], + CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], + params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); + }, + subscriptionEstablishedHandler); +} + ++ (void)readAttributeACTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler +{ + new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + if (attributeCacheContainer.cppAttributeCache) { + chip::app::ConcreteAttributePath path; + using TypeInfo = Thermostat::Attributes::ACType::TypeInfo; + path.mEndpointId = static_cast([endpoint unsignedShortValue]); + path.mClusterId = TypeInfo::GetClusterId(); + path.mAttributeId = TypeInfo::GetAttributeId(); + TypeInfo::DecodableType value; + CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); + auto successFn = Callback::FromCancelable(success); + if (err == CHIP_NO_ERROR) { + successFn->mCall(successFn->mContext, value); + } + return err; + } + return CHIP_ERROR_NOT_FOUND; + }); +} + +- (void)readAttributeACCapacityWithCompletionHandler:(void (^)( + NSNumber * _Nullable value, NSError * _Nullable error))completionHandler +{ + new CHIPInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + +- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +{ + [self writeAttributeACCapacityWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; +} +- (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value + params:(CHIPWriteParams * _Nullable)params + completionHandler:(StatusCompletion)completionHandler +{ + chip::Optional timedWriteTimeoutMs; + if (params != nil) { + if (params.timedWriteTimeoutMs != nil) { + timedWriteTimeoutMs.SetValue(params.timedWriteTimeoutMs.unsignedShortValue); + } + } + + new CHIPDefaultSuccessCallbackBridge( + self.callbackQueue, + ^(id _Nullable ignored, NSError * _Nullable error) { + completionHandler(error); + }, + ^(Cancelable * success, Cancelable * failure) { + ListFreer listFreer; + using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo; + TypeInfo::Type cppValue; + cppValue = value.unsignedShortValue; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.WriteAttribute( + cppValue, successFn->mContext, successFn->mCall, failureFn->mCall, timedWriteTimeoutMs); + }); +} + +- (void)subscribeAttributeACCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(CHIPSubscribeParams * _Nullable)params + subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + new CHIPInt16uAttributeCallbackSubscriptionBridge( + self.callbackQueue, reportHandler, + ^(Cancelable * success, Cancelable * failure) { + if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { + // We don't support disabling auto-resubscribe. + return CHIP_ERROR_INVALID_ARGUMENT; + } + using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, + [minInterval unsignedShortValue], [maxInterval unsignedShortValue], + CHIPInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], + params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); + }, + subscriptionEstablishedHandler); +} + ++ (void)readAttributeACCapacityWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler +{ + new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + if (attributeCacheContainer.cppAttributeCache) { + chip::app::ConcreteAttributePath path; + using TypeInfo = Thermostat::Attributes::ACCapacity::TypeInfo; + path.mEndpointId = static_cast([endpoint unsignedShortValue]); + path.mClusterId = TypeInfo::GetClusterId(); + path.mAttributeId = TypeInfo::GetAttributeId(); + TypeInfo::DecodableType value; + CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); + auto successFn = Callback::FromCancelable(success); + if (err == CHIP_NO_ERROR) { + successFn->mCall(successFn->mContext, value); + } + return err; + } + return CHIP_ERROR_NOT_FOUND; + }); +} + +- (void)readAttributeACRefrigerantTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler +{ + new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + +- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +{ + [self writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; +} +- (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler { @@ -71608,7 +72177,7 @@ new CHIPDefaultSuccessCallbackBridge( }, ^(Cancelable * success, Cancelable * failure) { ListFreer listFreer; - using TypeInfo = Thermostat::Attributes::AcRefrigerantType::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedCharValue; auto successFn = Callback::FromCancelable(success); @@ -71618,7 +72187,7 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)subscribeAttributeAcRefrigerantTypeWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACRefrigerantTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler @@ -71632,7 +72201,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = Thermostat::Attributes::AcRefrigerantType::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, @@ -71644,7 +72213,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( subscriptionEstablishedHandler); } -+ (void)readAttributeAcRefrigerantTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACRefrigerantTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: @@ -71653,7 +72222,7 @@ + (void)readAttributeAcRefrigerantTypeWithAttributeCache:(CHIPAttributeCacheCont new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = Thermostat::Attributes::AcRefrigerantType::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACRefrigerantType::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -71669,22 +72238,22 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su }); } -- (void)readAttributeAcCompressorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeACCompressorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::AcCompressorType::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)writeAttributeAcCompressorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler { - [self writeAttributeAcCompressorTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; + [self writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; } -- (void)writeAttributeAcCompressorTypeWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler { @@ -71702,7 +72271,7 @@ new CHIPDefaultSuccessCallbackBridge( }, ^(Cancelable * success, Cancelable * failure) { ListFreer listFreer; - using TypeInfo = Thermostat::Attributes::AcCompressorType::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedCharValue; auto successFn = Callback::FromCancelable(success); @@ -71712,7 +72281,7 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)subscribeAttributeAcCompressorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACCompressorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler @@ -71726,7 +72295,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = Thermostat::Attributes::AcCompressorType::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, @@ -71738,7 +72307,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( subscriptionEstablishedHandler); } -+ (void)readAttributeAcCompressorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACCompressorTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: @@ -71747,7 +72316,7 @@ + (void)readAttributeAcCompressorTypeWithAttributeCache:(CHIPAttributeCacheConta new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = Thermostat::Attributes::AcCompressorType::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACCompressorType::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -71763,22 +72332,22 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su }); } -- (void)readAttributeAcErrorCodeWithCompletionHandler:(void (^)( +- (void)readAttributeACErrorCodeWithCompletionHandler:(void (^)( NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { new CHIPInt32uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::AcErrorCode::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)writeAttributeAcErrorCodeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler { - [self writeAttributeAcErrorCodeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; + [self writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; } -- (void)writeAttributeAcErrorCodeWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler { @@ -71796,7 +72365,7 @@ new CHIPDefaultSuccessCallbackBridge( }, ^(Cancelable * success, Cancelable * failure) { ListFreer listFreer; - using TypeInfo = Thermostat::Attributes::AcErrorCode::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedIntValue; auto successFn = Callback::FromCancelable(success); @@ -71806,7 +72375,7 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)subscribeAttributeAcErrorCodeWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACErrorCodeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler @@ -71819,7 +72388,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge( // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = Thermostat::Attributes::AcErrorCode::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, @@ -71831,7 +72400,7 @@ new CHIPInt32uAttributeCallbackSubscriptionBridge( subscriptionEstablishedHandler); } -+ (void)readAttributeAcErrorCodeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACErrorCodeWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: @@ -71840,7 +72409,7 @@ + (void)readAttributeAcErrorCodeWithAttributeCache:(CHIPAttributeCacheContainer new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = Thermostat::Attributes::AcErrorCode::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACErrorCode::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -71856,22 +72425,22 @@ new CHIPInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s }); } -- (void)readAttributeAcLouverPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeACLouverPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::AcLouverPosition::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)writeAttributeAcLouverPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler { - [self writeAttributeAcLouverPositionWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; + [self writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; } -- (void)writeAttributeAcLouverPositionWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler { @@ -71889,7 +72458,7 @@ new CHIPDefaultSuccessCallbackBridge( }, ^(Cancelable * success, Cancelable * failure) { ListFreer listFreer; - using TypeInfo = Thermostat::Attributes::AcLouverPosition::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedCharValue; auto successFn = Callback::FromCancelable(success); @@ -71899,7 +72468,7 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)subscribeAttributeAcLouverPositionWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACLouverPositionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler @@ -71913,7 +72482,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = Thermostat::Attributes::AcLouverPosition::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, @@ -71925,7 +72494,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( subscriptionEstablishedHandler); } -+ (void)readAttributeAcLouverPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACLouverPositionWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: @@ -71934,7 +72503,7 @@ + (void)readAttributeAcLouverPositionWithAttributeCache:(CHIPAttributeCacheConta new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = Thermostat::Attributes::AcLouverPosition::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACLouverPosition::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -71950,59 +72519,60 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su }); } -- (void)readAttributeAcCoilTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeACCoilTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt16sAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::AcCoilTemperature::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); + new CHIPNullableInt16sAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); } -- (void)subscribeAttributeAcCoilTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACCoilTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPInt16sAttributeCallbackSubscriptionBridge( + new CHIPNullableInt16sAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = Thermostat::Attributes::AcCoilTemperature::TypeInfo; - auto successFn = Callback::FromCancelable(success); + using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo; + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], - CHIPInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + CHIPNullableInt16sAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, subscriptionEstablishedHandler); } -+ (void)readAttributeAcCoilTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACCoilTemperatureWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + new CHIPNullableInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = Thermostat::Attributes::AcCoilTemperature::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); TypeInfo::DecodableType value; CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); if (err == CHIP_NO_ERROR) { successFn->mCall(successFn->mContext, value); } @@ -72012,22 +72582,22 @@ new CHIPInt16sAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s }); } -- (void)readAttributeAcCapacityFormatWithCompletionHandler:(void (^)(NSNumber * _Nullable value, +- (void)readAttributeACCapacityformatWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = Thermostat::Attributes::AcCapacityFormat::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)writeAttributeAcCapacityFormatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler { - [self writeAttributeAcCapacityFormatWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; + [self writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler]; } -- (void)writeAttributeAcCapacityFormatWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value params:(CHIPWriteParams * _Nullable)params completionHandler:(StatusCompletion)completionHandler { @@ -72045,7 +72615,7 @@ new CHIPDefaultSuccessCallbackBridge( }, ^(Cancelable * success, Cancelable * failure) { ListFreer listFreer; - using TypeInfo = Thermostat::Attributes::AcCapacityFormat::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedCharValue; auto successFn = Callback::FromCancelable(success); @@ -72055,7 +72625,7 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)subscribeAttributeAcCapacityFormatWithMinInterval:(NSNumber * _Nonnull)minInterval +- (void)subscribeAttributeACCapacityformatWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval params:(CHIPSubscribeParams * _Nullable)params subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler @@ -72069,7 +72639,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = Thermostat::Attributes::AcCapacityFormat::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, @@ -72081,7 +72651,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( subscriptionEstablishedHandler); } -+ (void)readAttributeAcCapacityFormatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer ++ (void)readAttributeACCapacityformatWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler: @@ -72090,7 +72660,7 @@ + (void)readAttributeAcCapacityFormatWithAttributeCache:(CHIPAttributeCacheConta new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = Thermostat::Attributes::AcCapacityFormat::TypeInfo; + using TypeInfo = Thermostat::Attributes::ACCapacityformat::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h index 572c7b06c0eafb..2687d318b648ab 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h @@ -4817,7 +4817,7 @@ NS_ASSUME_NONNULL_BEGIN @property (strong, nonatomic) NSNumber * _Nonnull modeForSequence; -@property (strong, nonatomic) NSArray * _Nonnull payload; +@property (strong, nonatomic) NSArray * _Nonnull transitions; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -4844,7 +4844,7 @@ NS_ASSUME_NONNULL_BEGIN @property (strong, nonatomic) NSNumber * _Nonnull modeForSequence; -@property (strong, nonatomic) NSArray * _Nonnull payload; +@property (strong, nonatomic) NSArray * _Nonnull transitions; /** * Controls whether the command is a timed command (using Timed Invoke). * diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm index 5f698091d65588..ff7b8da77d02b6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm @@ -2776,7 +2776,7 @@ - (instancetype)init _modeForSequence = @(0); - _payload = [NSArray array]; + _transitions = [NSArray array]; _timedInvokeTimeoutMs = nil; } return self; @@ -2793,7 +2793,7 @@ - (instancetype)init _modeForSequence = @(0); - _payload = [NSArray array]; + _transitions = [NSArray array]; _timedInvokeTimeoutMs = nil; } return self; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h index 741eb55bf27393..e35ebce3aca9a3 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h @@ -574,6 +574,13 @@ NS_ASSUME_NONNULL_BEGIN @interface CHIPPumpConfigurationAndControlClusterTurbineOperationEvent : NSObject @end +@interface CHIPThermostatClusterThermostatScheduleTransition : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull transitionTime; +@property (strong, nonatomic) NSNumber * _Nullable heatSetpoint; +@property (strong, nonatomic) NSNumber * _Nullable coolSetpoint; +- (instancetype)init; +@end + @interface CHIPIasAceClusterIasAceZoneStatusResult : NSObject @property (strong, nonatomic) NSNumber * _Nonnull zoneId; @property (strong, nonatomic) NSNumber * _Nonnull zoneStatus; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm index 770622fa5145a3..dcbc75ab4a4c2b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm @@ -1321,6 +1321,21 @@ - (instancetype)init } @end +@implementation CHIPThermostatClusterThermostatScheduleTransition +- (instancetype)init +{ + if (self = [super init]) { + + _transitionTime = @(0); + + _heatSetpoint = nil; + + _coolSetpoint = nil; + } + return self; +} +@end + @implementation CHIPIasAceClusterIasAceZoneStatusResult - (instancetype)init { diff --git a/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h index 1347bbf74be4bd..8c9904fa3c8f2a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h @@ -997,9 +997,9 @@ typedef NS_ENUM(uint32_t, MatterClusterAttributeIDType) { kMatterClusterThermostatAttributeAbsMaxHeatSetpointLimitID = 0x00000004, kMatterClusterThermostatAttributeAbsMinCoolSetpointLimitID = 0x00000005, kMatterClusterThermostatAttributeAbsMaxCoolSetpointLimitID = 0x00000006, - kMatterClusterThermostatAttributePiCoolingDemandID = 0x00000007, - kMatterClusterThermostatAttributePiHeatingDemandID = 0x00000008, - kMatterClusterThermostatAttributeHvacSystemTypeConfigurationID = 0x00000009, + kMatterClusterThermostatAttributePICoolingDemandID = 0x00000007, + kMatterClusterThermostatAttributePIHeatingDemandID = 0x00000008, + kMatterClusterThermostatAttributeHVACSystemTypeConfigurationID = 0x00000009, kMatterClusterThermostatAttributeLocalTemperatureCalibrationID = 0x00000010, kMatterClusterThermostatAttributeOccupiedCoolingSetpointID = 0x00000011, kMatterClusterThermostatAttributeOccupiedHeatingSetpointID = 0x00000012, @@ -1025,14 +1025,21 @@ typedef NS_ENUM(uint32_t, MatterClusterAttributeIDType) { kMatterClusterThermostatAttributeSetpointChangeSourceID = 0x00000030, kMatterClusterThermostatAttributeSetpointChangeAmountID = 0x00000031, kMatterClusterThermostatAttributeSetpointChangeSourceTimestampID = 0x00000032, - kMatterClusterThermostatAttributeAcTypeID = 0x00000040, - kMatterClusterThermostatAttributeAcCapacityID = 0x00000041, - kMatterClusterThermostatAttributeAcRefrigerantTypeID = 0x00000042, - kMatterClusterThermostatAttributeAcCompressorTypeID = 0x00000043, - kMatterClusterThermostatAttributeAcErrorCodeID = 0x00000044, - kMatterClusterThermostatAttributeAcLouverPositionID = 0x00000045, - kMatterClusterThermostatAttributeAcCoilTemperatureID = 0x00000046, - kMatterClusterThermostatAttributeAcCapacityFormatID = 0x00000047, + kMatterClusterThermostatAttributeOccupiedSetbackID = 0x00000034, + kMatterClusterThermostatAttributeOccupiedSetbackMinID = 0x00000035, + kMatterClusterThermostatAttributeOccupiedSetbackMaxID = 0x00000036, + kMatterClusterThermostatAttributeUnoccupiedSetbackID = 0x00000037, + kMatterClusterThermostatAttributeUnoccupiedSetbackMinID = 0x00000038, + kMatterClusterThermostatAttributeUnoccupiedSetbackMaxID = 0x00000039, + kMatterClusterThermostatAttributeEmergencyHeatDeltaID = 0x0000003A, + kMatterClusterThermostatAttributeACTypeID = 0x00000040, + kMatterClusterThermostatAttributeACCapacityID = 0x00000041, + kMatterClusterThermostatAttributeACRefrigerantTypeID = 0x00000042, + kMatterClusterThermostatAttributeACCompressorTypeID = 0x00000043, + kMatterClusterThermostatAttributeACErrorCodeID = 0x00000044, + kMatterClusterThermostatAttributeACLouverPositionID = 0x00000045, + kMatterClusterThermostatAttributeACCoilTemperatureID = 0x00000046, + kMatterClusterThermostatAttributeACCapacityformatID = 0x00000047, kMatterClusterThermostatAttributeGeneratedCommandListID = kMatterClusterGlobalAttributeGeneratedCommandListID, kMatterClusterThermostatAttributeAcceptedCommandListID = kMatterClusterGlobalAttributeAcceptedCommandListID, kMatterClusterThermostatAttributeAttributeListID = kMatterClusterGlobalAttributeAttributeListID, diff --git a/zzz_generated/all-clusters-app/zap-generated/access.h b/zzz_generated/all-clusters-app/zap-generated/access.h index 90aa47805022ab..ac5dab7cd80190 100644 --- a/zzz_generated/all-clusters-app/zap-generated/access.h +++ b/zzz_generated/all-clusters-app/zap-generated/access.h @@ -77,13 +77,13 @@ /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: User Label, Attribute: label list, Privilege: view */ \ @@ -140,13 +140,13 @@ /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: User Label, Attribute: label list, Privilege: view */ \ @@ -203,13 +203,13 @@ /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: User Label, Attribute: label list, Privilege: view */ \ @@ -259,13 +259,13 @@ 512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \ 512, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ 512, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ 516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ 516, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ 65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \ @@ -313,13 +313,13 @@ 23, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \ 32, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ 33, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \ - 21, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - 22, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - 23, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - 24, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - 25, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - 27, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - 28, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + 21, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + 22, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + 23, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + 24, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + 25, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + 27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + 28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ 1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ 2, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ 0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \ @@ -367,13 +367,13 @@ kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \ diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index d03cbc150466ae..78f704ebb78f20 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -336,7 +336,7 @@ } // This is an array of EmberAfAttributeMinMaxValue structures. -#define GENERATED_MIN_MAX_DEFAULT_COUNT 44 +#define GENERATED_MIN_MAX_DEFAULT_COUNT 46 #define GENERATED_MIN_MAX_DEFAULTS \ { \ \ @@ -369,13 +369,15 @@ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x7 }, /* ControlMode */ \ \ /* Endpoint: 1, Cluster: Thermostat (server) */ \ - { (uint16_t) 0x2BC, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* min heat setpoint limit */ \ - { (uint16_t) 0xBB8, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* max heat setpoint limit */ \ - { (uint16_t) 0x640, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* min cool setpoint limit */ \ - { (uint16_t) 0xC80, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* max cool setpoint limit */ \ - { (uint16_t) 0x19, (uint16_t) 0x0, (uint16_t) 0x19 }, /* min setpoint dead band */ \ - { (uint16_t) 0x4, (uint16_t) 0x0, (uint16_t) 0x5 }, /* control sequence of operation */ \ - { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* system mode */ \ + { (uint16_t) 0xA28, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedCoolingSetpoint */ \ + { (uint16_t) 0x7D0, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedHeatingSetpoint */ \ + { (uint16_t) 0x2BC, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MinHeatSetpointLimit */ \ + { (uint16_t) 0xBB8, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MaxHeatSetpointLimit */ \ + { (uint16_t) 0x640, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MinCoolSetpointLimit */ \ + { (uint16_t) 0xC80, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MaxCoolSetpointLimit */ \ + { (uint16_t) 0x19, (uint16_t) 0x0, (uint16_t) 0x19 }, /* MinSetpointDeadBand */ \ + { (uint16_t) 0x4, (uint16_t) 0x0, (uint16_t) 0x5 }, /* ControlSequenceOfOperation */ \ + { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* SystemMode */ \ \ /* Endpoint: 1, Cluster: Fan Control (server) */ \ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 }, /* fan mode */ \ @@ -994,48 +996,48 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Thermostat (server) */ \ - { 0x00000000, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* local temperature */ \ - { 0x00000003, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x02BC) }, /* abs min heat setpoint limit */ \ - { 0x00000004, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0BB8) }, /* abs max heat setpoint limit */ \ - { 0x00000005, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0640) }, /* abs min cool setpoint limit */ \ - { 0x00000006, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0C80) }, /* abs max cool setpoint limit */ \ - { 0x00000011, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_SIMPLE_DEFAULT(0x0A28) }, /* occupied cooling setpoint */ \ - { 0x00000012, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_SIMPLE_DEFAULT(0x07D0) }, /* occupied heating setpoint */ \ + { 0x00000000, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* LocalTemperature */ \ + { 0x00000003, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x02BC) }, /* AbsMinHeatSetpointLimit */ \ + { 0x00000004, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0BB8) }, /* AbsMaxHeatSetpointLimit */ \ + { 0x00000005, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0640) }, /* AbsMinCoolSetpointLimit */ \ + { 0x00000006, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0C80) }, /* AbsMaxCoolSetpointLimit */ \ + { 0x00000011, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_MIN_MAX_DEFAULTS_INDEX(12) }, /* OccupiedCoolingSetpoint */ \ + { 0x00000012, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_MIN_MAX_DEFAULTS_INDEX(13) }, /* OccupiedHeatingSetpoint */ \ { 0x00000015, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(12) }, /* min heat setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(14) }, /* MinHeatSetpointLimit */ \ { 0x00000016, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(13) }, /* max heat setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(15) }, /* MaxHeatSetpointLimit */ \ { 0x00000017, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(14) }, /* min cool setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(16) }, /* MinCoolSetpointLimit */ \ { 0x00000018, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(15) }, /* max cool setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(17) }, /* MaxCoolSetpointLimit */ \ { 0x00000019, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(16) }, /* min setpoint dead band */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(18) }, /* MinSetpointDeadBand */ \ { 0x0000001B, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(17) }, /* control sequence of operation */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(19) }, /* ControlSequenceOfOperation */ \ { 0x0000001C, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(18) }, /* system mode */ \ - { 0x00000020, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* start of week */ \ - { 0x00000021, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(7) }, /* number of weekly transitions */ \ - { 0x00000022, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(4) }, /* number of daily transitions */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(20) }, /* SystemMode */ \ + { 0x00000020, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* StartOfWeek */ \ + { 0x00000021, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(7) }, /* NumberOfWeeklyTransitions */ \ + { 0x00000022, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(4) }, /* NumberOfDailyTransitions */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x000b) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Fan Control (server) */ \ { 0x00000000, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(19) }, /* fan mode */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(21) }, /* fan mode */ \ { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(20) }, /* fan mode sequence */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(22) }, /* fan mode sequence */ \ { 0x00000002, ZAP_TYPE(INT8U), 1, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(21) }, /* percent setting */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(23) }, /* percent setting */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* percent current */ \ { 0x00000004, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(100) }, /* speed max */ \ { 0x00000005, ZAP_TYPE(INT8U), 1, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(22) }, /* speed setting */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(24) }, /* speed setting */ \ { 0x00000006, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* speed current */ \ { 0x00000007, ZAP_TYPE(BITMAP8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* rock support */ \ { 0x00000008, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x00) }, /* rock setting */ \ @@ -1046,11 +1048,11 @@ \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ { 0x00000000, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(23) }, /* temperature display mode */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(25) }, /* temperature display mode */ \ { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(24) }, /* keypad lockout */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(26) }, /* keypad lockout */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(25) }, /* schedule programming visibility */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(27) }, /* schedule programming visibility */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Color Control (server) */ \ @@ -1085,23 +1087,23 @@ { 0x00000029, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* primary 6 y */ \ { 0x0000002A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* primary 6 intensity */ \ { 0x00000030, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(26) }, /* white point x */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(28) }, /* white point x */ \ { 0x00000031, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(27) }, /* white point y */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(29) }, /* white point y */ \ { 0x00000032, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(28) }, /* color point r x */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(30) }, /* color point r x */ \ { 0x00000033, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(29) }, /* color point r y */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(31) }, /* color point r y */ \ { 0x00000034, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* color point r intensity */ \ { 0x00000036, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(30) }, /* color point g x */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(32) }, /* color point g x */ \ { 0x00000037, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(31) }, /* color point g y */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(33) }, /* color point g y */ \ { 0x00000038, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* color point g intensity */ \ { 0x0000003A, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(32) }, /* color point b x */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(34) }, /* color point b x */ \ { 0x0000003B, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(33) }, /* color point b y */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(35) }, /* color point b y */ \ { 0x0000003C, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* color point b intensity */ \ { 0x00004000, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* enhanced current hue */ \ { 0x00004001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* enhanced color mode */ \ @@ -1115,7 +1117,7 @@ { 0x0000400C, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFEFF) }, /* color temp physical max */ \ { 0x0000400D, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* couple color temp to level min-mireds */ \ { 0x00004010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(34) }, /* start up color temperature mireds */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(36) }, /* start up color temperature mireds */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x1F) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \ \ @@ -1277,13 +1279,13 @@ { 0x00000025, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* struct_attr */ \ { 0x00000026, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(35) }, /* range_restricted_int8u */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(37) }, /* range_restricted_int8u */ \ { 0x00000027, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(36) }, /* range_restricted_int8s */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(38) }, /* range_restricted_int8s */ \ { 0x00000028, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(37) }, /* range_restricted_int16u */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(39) }, /* range_restricted_int16u */ \ { 0x00000029, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(38) }, /* range_restricted_int16s */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(40) }, /* range_restricted_int16s */ \ { 0x0000002A, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* list_long_octet_string */ \ { 0x0000002B, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ @@ -1355,16 +1357,16 @@ ZAP_EMPTY_DEFAULT() }, /* nullable_struct */ \ { 0x00004026, ZAP_TYPE(INT8U), 1, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(39) }, /* nullable_range_restricted_int8u */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(41) }, /* nullable_range_restricted_int8u */ \ { 0x00004027, ZAP_TYPE(INT8S), 1, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(40) }, /* nullable_range_restricted_int8s */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(42) }, /* nullable_range_restricted_int8s */ \ { 0x00004028, ZAP_TYPE(INT16U), 2, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(41) }, /* nullable_range_restricted_int16u */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(43) }, /* nullable_range_restricted_int16u */ \ { 0x00004029, ZAP_TYPE(INT16S), 2, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(42) }, /* nullable_range_restricted_int16s */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(44) }, /* nullable_range_restricted_int16s */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ @@ -1392,7 +1394,7 @@ { 0x00004002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0) }, /* OffWaitTime */ \ { 0x00004003, ZAP_TYPE(ENUM8), 1, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(43) }, /* StartUpOnOff */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(45) }, /* StartUpOnOff */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h index 0f84591cb6f45d..8aed0d2107d023 100644 --- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h +++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h @@ -547,6 +547,14 @@ typedef struct _TestListStructOctet chip::ByteSpan operationalCert; } TestListStructOctet; +// Struct for ThermostatScheduleTransition +typedef struct _ThermostatScheduleTransition +{ + uint16_t TransitionTime; + int16_t HeatSetpoint; + int16_t CoolSetpoint; +} ThermostatScheduleTransition; + // Struct for ThreadInterfaceScanResult typedef struct _ThreadInterfaceScanResult { diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h index 6a0f70551c9df8..9b2bea3e101d9b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h @@ -849,6 +849,13 @@ #define ZCL_SETPOINT_CHANGE_SOURCE_ATTRIBUTE_ID (0x0030) #define ZCL_SETPOINT_CHANGE_AMOUNT_ATTRIBUTE_ID (0x0031) #define ZCL_SETPOINT_CHANGE_SOURCE_TIMESTAMP_ATTRIBUTE_ID (0x0032) +#define ZCL_OCCUPIED_SETBACK_ATTRIBUTE_ID (0x0034) +#define ZCL_OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID (0x0035) +#define ZCL_OCCUPIED_SETBACK_MAX_ATTRIBUTE_ID (0x0036) +#define ZCL_UNOCCUPIED_SETBACK_ATTRIBUTE_ID (0x0037) +#define ZCL_UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID (0x0038) +#define ZCL_UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID (0x0039) +#define ZCL_EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID (0x003A) #define ZCL_AC_TYPE_ATTRIBUTE_ID (0x0040) #define ZCL_AC_CAPACITY_ATTRIBUTE_ID (0x0041) #define ZCL_AC_REFRIGERANT_TYPE_ATTRIBUTE_ID (0x0042) diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index 0a7372211653bd..c885ab82474173 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -18143,24 +18143,27 @@ namespace Attributes { namespace LocalTemperature { -EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + if (Traits::IsNullValue(temp)) { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); } - *value = Traits::StorageToWorking(temp); return status; } EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) { using Traits = NumericAttributeTraits; - if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } @@ -18170,28 +18173,50 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); } +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + } // namespace LocalTemperature namespace OutdoorTemperature { -EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + if (Traits::IsNullValue(temp)) { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); } - *value = Traits::StorageToWorking(temp); return status; } EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) { using Traits = NumericAttributeTraits; - if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } @@ -18201,6 +18226,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); } +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + } // namespace OutdoorTemperature namespace Occupancy { @@ -18358,7 +18402,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) } // namespace AbsMaxCoolSetpointLimit -namespace PiCoolingDemand { +namespace PICoolingDemand { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -18387,9 +18431,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } -} // namespace PiCoolingDemand +} // namespace PICoolingDemand -namespace PiHeatingDemand { +namespace PIHeatingDemand { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -18418,9 +18462,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } -} // namespace PiHeatingDemand +} // namespace PIHeatingDemand -namespace HvacSystemTypeConfiguration { +namespace HVACSystemTypeConfiguration { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -18449,7 +18493,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP8_ATTRIBUTE_TYPE); } -} // namespace HvacSystemTypeConfiguration +} // namespace HVACSystemTypeConfiguration namespace LocalTemperatureCalibration { @@ -19042,24 +19086,27 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) namespace TemperatureSetpointHoldDuration { -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + if (Traits::IsNullValue(temp)) { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); } - *value = Traits::StorageToWorking(temp); return status; } EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) { using Traits = NumericAttributeTraits; - if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } @@ -19069,6 +19116,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + } // namespace TemperatureSetpointHoldDuration namespace ThermostatProgrammingOperationMode { @@ -19166,24 +19232,27 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) namespace SetpointChangeAmount { -EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + if (Traits::IsNullValue(temp)) { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); } - *value = Traits::StorageToWorking(temp); return status; } EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) { using Traits = NumericAttributeTraits; - if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } @@ -19193,6 +19262,25 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); } +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + } // namespace SetpointChangeAmount namespace SetpointChangeSourceTimestamp { @@ -19226,7 +19314,356 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value) } // namespace SetpointChangeSourceTimestamp -namespace AcType { +namespace OccupiedSetback { + +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); + if (Traits::IsNullValue(temp)) + { + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); + } + return status; +} +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + +} // namespace OccupiedSetback + +namespace OccupiedSetbackMin { + +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); + if (Traits::IsNullValue(temp)) + { + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); + } + return status; +} +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + +} // namespace OccupiedSetbackMin + +namespace OccupiedSetbackMax { + +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); + if (Traits::IsNullValue(temp)) + { + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); + } + return status; +} +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + +} // namespace OccupiedSetbackMax + +namespace UnoccupiedSetback { + +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); + if (Traits::IsNullValue(temp)) + { + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); + } + return status; +} +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + +} // namespace UnoccupiedSetback + +namespace UnoccupiedSetbackMin { + +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); + if (Traits::IsNullValue(temp)) + { + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); + } + return status; +} +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + +} // namespace UnoccupiedSetbackMin + +namespace UnoccupiedSetbackMax { + +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); + if (Traits::IsNullValue(temp)) + { + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); + } + return status; +} +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + +} // namespace UnoccupiedSetbackMax + +namespace EmergencyHeatDelta { + +EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); + if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + *value = Traits::StorageToWorking(temp); + return status; +} +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); +} + +} // namespace EmergencyHeatDelta + +namespace ACType { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -19255,9 +19692,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } -} // namespace AcType +} // namespace ACType -namespace AcCapacity { +namespace ACCapacity { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -19286,9 +19723,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace AcCapacity +} // namespace ACCapacity -namespace AcRefrigerantType { +namespace ACRefrigerantType { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -19317,9 +19754,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } -} // namespace AcRefrigerantType +} // namespace ACRefrigerantType -namespace AcCompressorType { +namespace ACCompressorType { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -19348,9 +19785,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } -} // namespace AcCompressorType +} // namespace ACCompressorType -namespace AcErrorCode { +namespace ACErrorCode { EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value) { @@ -19379,9 +19816,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); } -} // namespace AcErrorCode +} // namespace ACErrorCode -namespace AcLouverPosition { +namespace ACLouverPosition { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -19410,28 +19847,31 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } -} // namespace AcLouverPosition +} // namespace ACLouverPosition -namespace AcCoilTemperature { +namespace ACCoilTemperature { -EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Thermostat::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + if (Traits::IsNullValue(temp)) { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); } - *value = Traits::StorageToWorking(temp); return status; } EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) { using Traits = NumericAttributeTraits; - if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; } @@ -19441,9 +19881,28 @@ EmberAfStatus Set(chip::EndpointId endpoint, int16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); } -} // namespace AcCoilTemperature +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_INT16S_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + +} // namespace ACCoilTemperature -namespace AcCapacityFormat { +namespace ACCapacityformat { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -19472,7 +19931,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } -} // namespace AcCapacityFormat +} // namespace ACCapacityformat namespace FeatureMap { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 263ecfd6b325a3..09ac3089835e52 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -3160,13 +3160,17 @@ namespace Thermostat { namespace Attributes { namespace LocalTemperature { -EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int16s EmberAfStatus Set(chip::EndpointId endpoint, int16_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); } // namespace LocalTemperature namespace OutdoorTemperature { -EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int16s EmberAfStatus Set(chip::EndpointId endpoint, int16_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); } // namespace OutdoorTemperature namespace Occupancy { @@ -3194,20 +3198,20 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s EmberAfStatus Set(chip::EndpointId endpoint, int16_t value); } // namespace AbsMaxCoolSetpointLimit -namespace PiCoolingDemand { +namespace PICoolingDemand { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace PiCoolingDemand +} // namespace PICoolingDemand -namespace PiHeatingDemand { +namespace PIHeatingDemand { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace PiHeatingDemand +} // namespace PIHeatingDemand -namespace HvacSystemTypeConfiguration { +namespace HVACSystemTypeConfiguration { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace HvacSystemTypeConfiguration +} // namespace HVACSystemTypeConfiguration namespace LocalTemperatureCalibration { EmberAfStatus Get(chip::EndpointId endpoint, int8_t * value); // int8s @@ -3306,8 +3310,10 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace TemperatureSetpointHold namespace TemperatureSetpointHoldDuration { -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); } // namespace TemperatureSetpointHoldDuration namespace ThermostatProgrammingOperationMode { @@ -3326,8 +3332,10 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace SetpointChangeSource namespace SetpointChangeAmount { -EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int16s EmberAfStatus Set(chip::EndpointId endpoint, int16_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); } // namespace SetpointChangeAmount namespace SetpointChangeSourceTimestamp { @@ -3335,45 +3343,94 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // epoch_s EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value); } // namespace SetpointChangeSourceTimestamp -namespace AcType { +namespace OccupiedSetback { +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int8u +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); +} // namespace OccupiedSetback + +namespace OccupiedSetbackMin { +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int8u +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); +} // namespace OccupiedSetbackMin + +namespace OccupiedSetbackMax { +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int8u +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); +} // namespace OccupiedSetbackMax + +namespace UnoccupiedSetback { +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int8u +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); +} // namespace UnoccupiedSetback + +namespace UnoccupiedSetbackMin { +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int8u +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); +} // namespace UnoccupiedSetbackMin + +namespace UnoccupiedSetbackMax { +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int8u +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); +} // namespace UnoccupiedSetbackMax + +namespace EmergencyHeatDelta { +EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +} // namespace EmergencyHeatDelta + +namespace ACType { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace AcType +} // namespace ACType -namespace AcCapacity { +namespace ACCapacity { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace AcCapacity +} // namespace ACCapacity -namespace AcRefrigerantType { +namespace ACRefrigerantType { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace AcRefrigerantType +} // namespace ACRefrigerantType -namespace AcCompressorType { +namespace ACCompressorType { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace AcCompressorType +} // namespace ACCompressorType -namespace AcErrorCode { +namespace ACErrorCode { EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32 EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value); -} // namespace AcErrorCode +} // namespace ACErrorCode -namespace AcLouverPosition { +namespace ACLouverPosition { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace AcLouverPosition +} // namespace ACLouverPosition -namespace AcCoilTemperature { -EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value); // int16s +namespace ACCoilTemperature { +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // int16s EmberAfStatus Set(chip::EndpointId endpoint, int16_t value); -} // namespace AcCoilTemperature +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); +} // namespace ACCoilTemperature -namespace AcCapacityFormat { +namespace ACCapacityformat { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace AcCapacityFormat +} // namespace ACCapacityformat namespace FeatureMap { EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32 diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index 3b3bcf77496bed..b82604017a5ce5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -13506,9 +13506,9 @@ bool emberAfThermostatClusterSetpointRaiseLowerCallback( * @brief Thermostat Cluster GetWeeklyScheduleResponse Command callback (from server) */ bool emberAfThermostatClusterGetWeeklyScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t numberOfTransitionsForSequence, uint8_t dayOfWeekForSequence, - uint8_t modeForSequence, - /* TYPE WARNING: array array defaults to */ uint8_t * payload); + uint8_t NumberOfTransitionsForSequence, uint8_t DayOfWeekForSequence, + uint8_t ModeForSequence, + /* TYPE WARNING: array array defaults to */ uint8_t * Transitions); /** * @brief Thermostat Cluster SetWeeklySchedule Command callback (from client) */ @@ -13519,9 +13519,9 @@ bool emberAfThermostatClusterSetWeeklyScheduleCallback( * @brief Thermostat Cluster GetRelayStatusLogResponse Command callback (from server) */ bool emberAfThermostatClusterGetRelayStatusLogResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint16_t timeOfDay, uint16_t relayStatus, int16_t localTemperature, - uint8_t humidityInPercentage, int16_t setpoint, - uint16_t unreadEntries); + uint16_t TimeOfDay, uint8_t RelayStatus, int16_t LocalTemperature, + uint8_t HumidityInPercentage, int16_t Setpoint, + uint16_t UnreadEntries); /** * @brief Thermostat Cluster GetWeeklySchedule Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index bcde8b630bda6a..cff8fb177c721a 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -16171,6 +16171,56 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace PumpConfigurationAndControl namespace Thermostat { +namespace Structs { +namespace ThermostatScheduleTransition { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kHeatSetpoint)), heatSetpoint)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCoolSetpoint)), coolSetpoint)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + err = reader.EnterContainer(outer); + ReturnErrorOnFailure(err); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } + switch (TLV::TagNumFromTag(reader.GetTag())) + { + case to_underlying(Fields::kTransitionTime): + ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime)); + break; + case to_underlying(Fields::kHeatSetpoint): + ReturnErrorOnFailure(DataModel::Decode(reader, heatSetpoint)); + break; + case to_underlying(Fields::kCoolSetpoint): + ReturnErrorOnFailure(DataModel::Decode(reader, coolSetpoint)); + break; + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + + return CHIP_NO_ERROR; +} + +} // namespace ThermostatScheduleTransition +} // namespace Structs namespace Commands { namespace SetpointRaiseLower { @@ -16224,7 +16274,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure( DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDayOfWeekForSequence)), dayOfWeekForSequence)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kModeForSequence)), modeForSequence)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPayload)), payload)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitions)), transitions)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -16252,8 +16302,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kModeForSequence): ReturnErrorOnFailure(DataModel::Decode(reader, modeForSequence)); break; - case to_underlying(Fields::kPayload): - ReturnErrorOnFailure(DataModel::Decode(reader, payload)); + case to_underlying(Fields::kTransitions): + ReturnErrorOnFailure(DataModel::Decode(reader, transitions)); break; default: break; @@ -16275,7 +16325,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure( DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDayOfWeekForSequence)), dayOfWeekForSequence)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kModeForSequence)), modeForSequence)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPayload)), payload)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitions)), transitions)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -16303,8 +16353,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kModeForSequence): ReturnErrorOnFailure(DataModel::Decode(reader, modeForSequence)); break; - case to_underlying(Fields::kPayload): - ReturnErrorOnFailure(DataModel::Decode(reader, payload)); + case to_underlying(Fields::kTransitions): + ReturnErrorOnFailure(DataModel::Decode(reader, transitions)); break; default: break; @@ -16509,14 +16559,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::AbsMaxCoolSetpointLimit::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, absMaxCoolSetpointLimit)); break; - case Attributes::PiCoolingDemand::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, piCoolingDemand)); + case Attributes::PICoolingDemand::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PICoolingDemand)); break; - case Attributes::PiHeatingDemand::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, piHeatingDemand)); + case Attributes::PIHeatingDemand::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, PIHeatingDemand)); break; - case Attributes::HvacSystemTypeConfiguration::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, hvacSystemTypeConfiguration)); + case Attributes::HVACSystemTypeConfiguration::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, HVACSystemTypeConfiguration)); break; case Attributes::LocalTemperatureCalibration::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, localTemperatureCalibration)); @@ -16593,29 +16643,50 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::SetpointChangeSourceTimestamp::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, setpointChangeSourceTimestamp)); break; - case Attributes::AcType::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acType)); + case Attributes::OccupiedSetback::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetback)); + break; + case Attributes::OccupiedSetbackMin::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetbackMin)); + break; + case Attributes::OccupiedSetbackMax::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, occupiedSetbackMax)); + break; + case Attributes::UnoccupiedSetback::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetback)); + break; + case Attributes::UnoccupiedSetbackMin::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetbackMin)); + break; + case Attributes::UnoccupiedSetbackMax::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, unoccupiedSetbackMax)); + break; + case Attributes::EmergencyHeatDelta::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, emergencyHeatDelta)); + break; + case Attributes::ACType::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACType)); break; - case Attributes::AcCapacity::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acCapacity)); + case Attributes::ACCapacity::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACCapacity)); break; - case Attributes::AcRefrigerantType::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acRefrigerantType)); + case Attributes::ACRefrigerantType::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACRefrigerantType)); break; - case Attributes::AcCompressorType::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acCompressorType)); + case Attributes::ACCompressorType::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACCompressorType)); break; - case Attributes::AcErrorCode::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acErrorCode)); + case Attributes::ACErrorCode::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACErrorCode)); break; - case Attributes::AcLouverPosition::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acLouverPosition)); + case Attributes::ACLouverPosition::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACLouverPosition)); break; - case Attributes::AcCoilTemperature::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acCoilTemperature)); + case Attributes::ACCoilTemperature::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACCoilTemperature)); break; - case Attributes::AcCapacityFormat::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, acCapacityFormat)); + case Attributes::ACCapacityformat::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, ACCapacityformat)); break; case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index c7e58cc72af56d..2eed32c991ecd6 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -22016,6 +22016,33 @@ struct DecodableType } // namespace Events } // namespace PumpConfigurationAndControl namespace Thermostat { +namespace Structs { +namespace ThermostatScheduleTransition { +enum class Fields +{ + kTransitionTime = 0, + kHeatSetpoint = 1, + kCoolSetpoint = 2, +}; + +struct Type +{ +public: + uint16_t transitionTime = static_cast(0); + DataModel::Nullable heatSetpoint; + DataModel::Nullable coolSetpoint; + + CHIP_ERROR Decode(TLV::TLVReader & reader); + + static constexpr bool kIsFabricScoped = false; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; +}; + +using DecodableType = Type; + +} // namespace ThermostatScheduleTransition +} // namespace Structs namespace Commands { // Forward-declarations so we can reference these later. @@ -22099,7 +22126,7 @@ enum class Fields kNumberOfTransitionsForSequence = 0, kDayOfWeekForSequence = 1, kModeForSequence = 2, - kPayload = 3, + kTransitions = 3, }; struct Type @@ -22112,7 +22139,7 @@ struct Type uint8_t numberOfTransitionsForSequence = static_cast(0); chip::BitFlags dayOfWeekForSequence = static_cast>(0); chip::BitFlags modeForSequence = static_cast>(0); - DataModel::List payload; + DataModel::List transitions; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -22130,7 +22157,7 @@ struct DecodableType uint8_t numberOfTransitionsForSequence = static_cast(0); chip::BitFlags dayOfWeekForSequence = static_cast>(0); chip::BitFlags modeForSequence = static_cast>(0); - DataModel::DecodableList payload; + DataModel::DecodableList transitions; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace GetWeeklyScheduleResponse @@ -22140,7 +22167,7 @@ enum class Fields kNumberOfTransitionsForSequence = 0, kDayOfWeekForSequence = 1, kModeForSequence = 2, - kPayload = 3, + kTransitions = 3, }; struct Type @@ -22153,7 +22180,7 @@ struct Type uint8_t numberOfTransitionsForSequence = static_cast(0); chip::BitFlags dayOfWeekForSequence = static_cast>(0); chip::BitFlags modeForSequence = static_cast>(0); - DataModel::List payload; + DataModel::List transitions; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -22171,7 +22198,7 @@ struct DecodableType uint8_t numberOfTransitionsForSequence = static_cast(0); chip::BitFlags dayOfWeekForSequence = static_cast>(0); chip::BitFlags modeForSequence = static_cast>(0); - DataModel::DecodableList payload; + DataModel::DecodableList transitions; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace SetWeeklySchedule @@ -22194,7 +22221,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } uint16_t timeOfDay = static_cast(0); - uint16_t relayStatus = static_cast(0); + uint8_t relayStatus = static_cast(0); int16_t localTemperature = static_cast(0); uint8_t humidityInPercentage = static_cast(0); int16_t setpoint = static_cast(0); @@ -22214,7 +22241,7 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } uint16_t timeOfDay = static_cast(0); - uint16_t relayStatus = static_cast(0); + uint8_t relayStatus = static_cast(0); int16_t localTemperature = static_cast(0); uint8_t humidityInPercentage = static_cast(0); int16_t setpoint = static_cast(0); @@ -22320,9 +22347,9 @@ namespace Attributes { namespace LocalTemperature { struct TypeInfo { - using Type = int16_t; - using DecodableType = int16_t; - using DecodableArgType = int16_t; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::LocalTemperature::Id; } @@ -22332,9 +22359,9 @@ struct TypeInfo namespace OutdoorTemperature { struct TypeInfo { - using Type = int16_t; - using DecodableType = int16_t; - using DecodableArgType = int16_t; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OutdoorTemperature::Id; } @@ -22401,7 +22428,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace AbsMaxCoolSetpointLimit -namespace PiCoolingDemand { +namespace PICoolingDemand { struct TypeInfo { using Type = uint8_t; @@ -22409,11 +22436,11 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::PiCoolingDemand::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::PICoolingDemand::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace PiCoolingDemand -namespace PiHeatingDemand { +} // namespace PICoolingDemand +namespace PIHeatingDemand { struct TypeInfo { using Type = uint8_t; @@ -22421,11 +22448,11 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::PiHeatingDemand::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::PIHeatingDemand::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace PiHeatingDemand -namespace HvacSystemTypeConfiguration { +} // namespace PIHeatingDemand +namespace HVACSystemTypeConfiguration { struct TypeInfo { using Type = uint8_t; @@ -22433,10 +22460,10 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::HvacSystemTypeConfiguration::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::HVACSystemTypeConfiguration::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace HvacSystemTypeConfiguration +} // namespace HVACSystemTypeConfiguration namespace LocalTemperatureCalibration { struct TypeInfo { @@ -22668,9 +22695,9 @@ struct TypeInfo namespace TemperatureSetpointHoldDuration { struct TypeInfo { - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::TemperatureSetpointHoldDuration::Id; } @@ -22716,9 +22743,9 @@ struct TypeInfo namespace SetpointChangeAmount { struct TypeInfo { - using Type = int16_t; - using DecodableType = int16_t; - using DecodableArgType = int16_t; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SetpointChangeAmount::Id; } @@ -22737,7 +22764,91 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace SetpointChangeSourceTimestamp -namespace AcType { +namespace OccupiedSetback { +struct TypeInfo +{ + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; + + static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::OccupiedSetback::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace OccupiedSetback +namespace OccupiedSetbackMin { +struct TypeInfo +{ + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; + + static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::OccupiedSetbackMin::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace OccupiedSetbackMin +namespace OccupiedSetbackMax { +struct TypeInfo +{ + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; + + static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::OccupiedSetbackMax::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace OccupiedSetbackMax +namespace UnoccupiedSetback { +struct TypeInfo +{ + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; + + static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::UnoccupiedSetback::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace UnoccupiedSetback +namespace UnoccupiedSetbackMin { +struct TypeInfo +{ + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; + + static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::UnoccupiedSetbackMin::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace UnoccupiedSetbackMin +namespace UnoccupiedSetbackMax { +struct TypeInfo +{ + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; + + static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::UnoccupiedSetbackMax::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace UnoccupiedSetbackMax +namespace EmergencyHeatDelta { +struct TypeInfo +{ + using Type = uint8_t; + using DecodableType = uint8_t; + using DecodableArgType = uint8_t; + + static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::EmergencyHeatDelta::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace EmergencyHeatDelta +namespace ACType { struct TypeInfo { using Type = uint8_t; @@ -22745,11 +22856,11 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::AcType::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ACType::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace AcType -namespace AcCapacity { +} // namespace ACType +namespace ACCapacity { struct TypeInfo { using Type = uint16_t; @@ -22757,11 +22868,11 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::AcCapacity::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ACCapacity::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace AcCapacity -namespace AcRefrigerantType { +} // namespace ACCapacity +namespace ACRefrigerantType { struct TypeInfo { using Type = uint8_t; @@ -22769,11 +22880,11 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::AcRefrigerantType::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ACRefrigerantType::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace AcRefrigerantType -namespace AcCompressorType { +} // namespace ACRefrigerantType +namespace ACCompressorType { struct TypeInfo { using Type = uint8_t; @@ -22781,11 +22892,11 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::AcCompressorType::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ACCompressorType::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace AcCompressorType -namespace AcErrorCode { +} // namespace ACCompressorType +namespace ACErrorCode { struct TypeInfo { using Type = uint32_t; @@ -22793,11 +22904,11 @@ struct TypeInfo using DecodableArgType = uint32_t; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::AcErrorCode::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ACErrorCode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace AcErrorCode -namespace AcLouverPosition { +} // namespace ACErrorCode +namespace ACLouverPosition { struct TypeInfo { using Type = uint8_t; @@ -22805,23 +22916,23 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::AcLouverPosition::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ACLouverPosition::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace AcLouverPosition -namespace AcCoilTemperature { +} // namespace ACLouverPosition +namespace ACCoilTemperature { struct TypeInfo { - using Type = int16_t; - using DecodableType = int16_t; - using DecodableArgType = int16_t; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::AcCoilTemperature::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ACCoilTemperature::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace AcCoilTemperature -namespace AcCapacityFormat { +} // namespace ACCoilTemperature +namespace ACCapacityformat { struct TypeInfo { using Type = uint8_t; @@ -22829,10 +22940,10 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::AcCapacityFormat::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ACCapacityformat::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace AcCapacityFormat +} // namespace ACCapacityformat namespace GeneratedCommandList { struct TypeInfo { @@ -22902,16 +23013,16 @@ struct TypeInfo CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - Attributes::LocalTemperature::TypeInfo::DecodableType localTemperature = static_cast(0); - Attributes::OutdoorTemperature::TypeInfo::DecodableType outdoorTemperature = static_cast(0); + Attributes::LocalTemperature::TypeInfo::DecodableType localTemperature; + Attributes::OutdoorTemperature::TypeInfo::DecodableType outdoorTemperature; Attributes::Occupancy::TypeInfo::DecodableType occupancy = static_cast(0); Attributes::AbsMinHeatSetpointLimit::TypeInfo::DecodableType absMinHeatSetpointLimit = static_cast(0); Attributes::AbsMaxHeatSetpointLimit::TypeInfo::DecodableType absMaxHeatSetpointLimit = static_cast(0); Attributes::AbsMinCoolSetpointLimit::TypeInfo::DecodableType absMinCoolSetpointLimit = static_cast(0); Attributes::AbsMaxCoolSetpointLimit::TypeInfo::DecodableType absMaxCoolSetpointLimit = static_cast(0); - Attributes::PiCoolingDemand::TypeInfo::DecodableType piCoolingDemand = static_cast(0); - Attributes::PiHeatingDemand::TypeInfo::DecodableType piHeatingDemand = static_cast(0); - Attributes::HvacSystemTypeConfiguration::TypeInfo::DecodableType hvacSystemTypeConfiguration = static_cast(0); + Attributes::PICoolingDemand::TypeInfo::DecodableType PICoolingDemand = static_cast(0); + Attributes::PIHeatingDemand::TypeInfo::DecodableType PIHeatingDemand = static_cast(0); + Attributes::HVACSystemTypeConfiguration::TypeInfo::DecodableType HVACSystemTypeConfiguration = static_cast(0); Attributes::LocalTemperatureCalibration::TypeInfo::DecodableType localTemperatureCalibration = static_cast(0); Attributes::OccupiedCoolingSetpoint::TypeInfo::DecodableType occupiedCoolingSetpoint = static_cast(0); Attributes::OccupiedHeatingSetpoint::TypeInfo::DecodableType occupiedHeatingSetpoint = static_cast(0); @@ -22932,22 +23043,28 @@ struct TypeInfo Attributes::NumberOfWeeklyTransitions::TypeInfo::DecodableType numberOfWeeklyTransitions = static_cast(0); Attributes::NumberOfDailyTransitions::TypeInfo::DecodableType numberOfDailyTransitions = static_cast(0); Attributes::TemperatureSetpointHold::TypeInfo::DecodableType temperatureSetpointHold = static_cast(0); - Attributes::TemperatureSetpointHoldDuration::TypeInfo::DecodableType temperatureSetpointHoldDuration = - static_cast(0); + Attributes::TemperatureSetpointHoldDuration::TypeInfo::DecodableType temperatureSetpointHoldDuration; Attributes::ThermostatProgrammingOperationMode::TypeInfo::DecodableType thermostatProgrammingOperationMode = static_cast(0); - Attributes::ThermostatRunningState::TypeInfo::DecodableType thermostatRunningState = static_cast(0); - Attributes::SetpointChangeSource::TypeInfo::DecodableType setpointChangeSource = static_cast(0); - Attributes::SetpointChangeAmount::TypeInfo::DecodableType setpointChangeAmount = static_cast(0); + Attributes::ThermostatRunningState::TypeInfo::DecodableType thermostatRunningState = static_cast(0); + Attributes::SetpointChangeSource::TypeInfo::DecodableType setpointChangeSource = static_cast(0); + Attributes::SetpointChangeAmount::TypeInfo::DecodableType setpointChangeAmount; Attributes::SetpointChangeSourceTimestamp::TypeInfo::DecodableType setpointChangeSourceTimestamp = static_cast(0); - Attributes::AcType::TypeInfo::DecodableType acType = static_cast(0); - Attributes::AcCapacity::TypeInfo::DecodableType acCapacity = static_cast(0); - Attributes::AcRefrigerantType::TypeInfo::DecodableType acRefrigerantType = static_cast(0); - Attributes::AcCompressorType::TypeInfo::DecodableType acCompressorType = static_cast(0); - Attributes::AcErrorCode::TypeInfo::DecodableType acErrorCode = static_cast(0); - Attributes::AcLouverPosition::TypeInfo::DecodableType acLouverPosition = static_cast(0); - Attributes::AcCoilTemperature::TypeInfo::DecodableType acCoilTemperature = static_cast(0); - Attributes::AcCapacityFormat::TypeInfo::DecodableType acCapacityFormat = static_cast(0); + Attributes::OccupiedSetback::TypeInfo::DecodableType occupiedSetback; + Attributes::OccupiedSetbackMin::TypeInfo::DecodableType occupiedSetbackMin; + Attributes::OccupiedSetbackMax::TypeInfo::DecodableType occupiedSetbackMax; + Attributes::UnoccupiedSetback::TypeInfo::DecodableType unoccupiedSetback; + Attributes::UnoccupiedSetbackMin::TypeInfo::DecodableType unoccupiedSetbackMin; + Attributes::UnoccupiedSetbackMax::TypeInfo::DecodableType unoccupiedSetbackMax; + Attributes::EmergencyHeatDelta::TypeInfo::DecodableType emergencyHeatDelta = static_cast(0); + Attributes::ACType::TypeInfo::DecodableType ACType = static_cast(0); + Attributes::ACCapacity::TypeInfo::DecodableType ACCapacity = static_cast(0); + Attributes::ACRefrigerantType::TypeInfo::DecodableType ACRefrigerantType = static_cast(0); + Attributes::ACCompressorType::TypeInfo::DecodableType ACCompressorType = static_cast(0); + Attributes::ACErrorCode::TypeInfo::DecodableType ACErrorCode = static_cast(0); + Attributes::ACLouverPosition::TypeInfo::DecodableType ACLouverPosition = static_cast(0); + Attributes::ACCoilTemperature::TypeInfo::DecodableType ACCoilTemperature; + Attributes::ACCapacityformat::TypeInfo::DecodableType ACCapacityformat = static_cast(0); Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; Attributes::AttributeList::TypeInfo::DecodableType attributeList; diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index 728c87f398a015..54db8ab85349d5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -3308,17 +3308,17 @@ namespace AbsMaxCoolSetpointLimit { static constexpr AttributeId Id = 0x00000006; } // namespace AbsMaxCoolSetpointLimit -namespace PiCoolingDemand { +namespace PICoolingDemand { static constexpr AttributeId Id = 0x00000007; -} // namespace PiCoolingDemand +} // namespace PICoolingDemand -namespace PiHeatingDemand { +namespace PIHeatingDemand { static constexpr AttributeId Id = 0x00000008; -} // namespace PiHeatingDemand +} // namespace PIHeatingDemand -namespace HvacSystemTypeConfiguration { +namespace HVACSystemTypeConfiguration { static constexpr AttributeId Id = 0x00000009; -} // namespace HvacSystemTypeConfiguration +} // namespace HVACSystemTypeConfiguration namespace LocalTemperatureCalibration { static constexpr AttributeId Id = 0x00000010; @@ -3420,37 +3420,65 @@ namespace SetpointChangeSourceTimestamp { static constexpr AttributeId Id = 0x00000032; } // namespace SetpointChangeSourceTimestamp -namespace AcType { +namespace OccupiedSetback { +static constexpr AttributeId Id = 0x00000034; +} // namespace OccupiedSetback + +namespace OccupiedSetbackMin { +static constexpr AttributeId Id = 0x00000035; +} // namespace OccupiedSetbackMin + +namespace OccupiedSetbackMax { +static constexpr AttributeId Id = 0x00000036; +} // namespace OccupiedSetbackMax + +namespace UnoccupiedSetback { +static constexpr AttributeId Id = 0x00000037; +} // namespace UnoccupiedSetback + +namespace UnoccupiedSetbackMin { +static constexpr AttributeId Id = 0x00000038; +} // namespace UnoccupiedSetbackMin + +namespace UnoccupiedSetbackMax { +static constexpr AttributeId Id = 0x00000039; +} // namespace UnoccupiedSetbackMax + +namespace EmergencyHeatDelta { +static constexpr AttributeId Id = 0x0000003A; +} // namespace EmergencyHeatDelta + +namespace ACType { static constexpr AttributeId Id = 0x00000040; -} // namespace AcType +} // namespace ACType -namespace AcCapacity { +namespace ACCapacity { static constexpr AttributeId Id = 0x00000041; -} // namespace AcCapacity +} // namespace ACCapacity -namespace AcRefrigerantType { +namespace ACRefrigerantType { static constexpr AttributeId Id = 0x00000042; -} // namespace AcRefrigerantType +} // namespace ACRefrigerantType -namespace AcCompressorType { +namespace ACCompressorType { static constexpr AttributeId Id = 0x00000043; -} // namespace AcCompressorType +} // namespace ACCompressorType -namespace AcErrorCode { +namespace ACErrorCode { static constexpr AttributeId Id = 0x00000044; -} // namespace AcErrorCode +} // namespace ACErrorCode -namespace AcLouverPosition { +namespace ACLouverPosition { static constexpr AttributeId Id = 0x00000045; -} // namespace AcLouverPosition +} // namespace ACLouverPosition -namespace AcCoilTemperature { +namespace ACCoilTemperature { static constexpr AttributeId Id = 0x00000046; -} // namespace AcCoilTemperature +} // namespace ACCoilTemperature -namespace AcCapacityFormat { +namespace ACCapacityformat { static constexpr AttributeId Id = 0x00000047; -} // namespace AcCapacityFormat +} // namespace ACCapacityformat namespace GeneratedCommandList { static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id; diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.h b/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.h index fc8ac6bab30262..86846914478e9c 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.h +++ b/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.h @@ -1313,8 +1313,8 @@ NS_ASSUME_NONNULL_BEGIN */ @interface CHIPTestThermostat : CHIPThermostat -- (void)writeAttributeLocalTemperatureWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeOutdoorTemperatureWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeLocalTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeOutdoorTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeOccupancyWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeAbsMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; @@ -1324,8 +1324,8 @@ NS_ASSUME_NONNULL_BEGIN completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeAbsMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributePiCoolingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributePiHeatingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributePICoolingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributePIHeatingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeAlarmMaskWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeThermostatRunningModeWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; @@ -1338,11 +1338,17 @@ NS_ASSUME_NONNULL_BEGIN completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeSetpointChangeSourceWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeSetpointChangeAmountWithValue:(NSNumber * _Nonnull)value +- (void)writeAttributeSetpointChangeAmountWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeSetpointChangeSourceTimestampWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; -- (void)writeAttributeAcCoilTemperatureWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeOccupiedSetbackMinWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeOccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeUnoccupiedSetbackMinWithValue:(NSNumber * _Nullable)value + completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeUnoccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value + completionHandler:(StatusCompletion)completionHandler; +- (void)writeAttributeACCoilTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeGeneratedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeAcceptedCommandListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; - (void)writeAttributeAttributeListWithValue:(NSArray * _Nonnull)value completionHandler:(StatusCompletion)completionHandler; diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm b/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm index 46a56891e3bcd4..d22aafbc35b7a6 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm +++ b/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm @@ -17801,7 +17801,7 @@ @implementation CHIPTestThermostat return &_cppCluster; } -- (void)writeAttributeLocalTemperatureWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeLocalTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler { new CHIPDefaultSuccessCallbackBridge( self.callbackQueue, @@ -17812,14 +17812,19 @@ new CHIPDefaultSuccessCallbackBridge( ListFreer listFreer; using TypeInfo = Thermostat::Attributes::LocalTemperature::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.shortValue; + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = value.shortValue; + } auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); }); } -- (void)writeAttributeOutdoorTemperatureWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeOutdoorTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler { new CHIPDefaultSuccessCallbackBridge( self.callbackQueue, @@ -17830,7 +17835,12 @@ new CHIPDefaultSuccessCallbackBridge( ListFreer listFreer; using TypeInfo = Thermostat::Attributes::OutdoorTemperature::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.shortValue; + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = value.shortValue; + } auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); @@ -17931,7 +17941,7 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)writeAttributePiCoolingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributePICoolingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler { new CHIPDefaultSuccessCallbackBridge( self.callbackQueue, @@ -17940,7 +17950,7 @@ new CHIPDefaultSuccessCallbackBridge( }, ^(Cancelable * success, Cancelable * failure) { ListFreer listFreer; - using TypeInfo = Thermostat::Attributes::PiCoolingDemand::TypeInfo; + using TypeInfo = Thermostat::Attributes::PICoolingDemand::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedCharValue; auto successFn = Callback::FromCancelable(success); @@ -17949,7 +17959,7 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)writeAttributePiHeatingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributePIHeatingDemandWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler { new CHIPDefaultSuccessCallbackBridge( self.callbackQueue, @@ -17958,7 +17968,7 @@ new CHIPDefaultSuccessCallbackBridge( }, ^(Cancelable * success, Cancelable * failure) { ListFreer listFreer; - using TypeInfo = Thermostat::Attributes::PiHeatingDemand::TypeInfo; + using TypeInfo = Thermostat::Attributes::PIHeatingDemand::TypeInfo; TypeInfo::Type cppValue; cppValue = value.unsignedCharValue; auto successFn = Callback::FromCancelable(success); @@ -18097,7 +18107,8 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)writeAttributeSetpointChangeAmountWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeSetpointChangeAmountWithValue:(NSNumber * _Nullable)value + completionHandler:(StatusCompletion)completionHandler { new CHIPDefaultSuccessCallbackBridge( self.callbackQueue, @@ -18108,7 +18119,12 @@ new CHIPDefaultSuccessCallbackBridge( ListFreer listFreer; using TypeInfo = Thermostat::Attributes::SetpointChangeAmount::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.shortValue; + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = value.shortValue; + } auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); @@ -18134,7 +18150,7 @@ new CHIPDefaultSuccessCallbackBridge( }); } -- (void)writeAttributeAcCoilTemperatureWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler +- (void)writeAttributeOccupiedSetbackMinWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler { new CHIPDefaultSuccessCallbackBridge( self.callbackQueue, @@ -18143,9 +18159,108 @@ new CHIPDefaultSuccessCallbackBridge( }, ^(Cancelable * success, Cancelable * failure) { ListFreer listFreer; - using TypeInfo = Thermostat::Attributes::AcCoilTemperature::TypeInfo; + using TypeInfo = Thermostat::Attributes::OccupiedSetbackMin::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.shortValue; + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = value.unsignedCharValue; + } + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + +- (void)writeAttributeOccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler +{ + new CHIPDefaultSuccessCallbackBridge( + self.callbackQueue, + ^(id _Nullable ignored, NSError * _Nullable error) { + completionHandler(error); + }, + ^(Cancelable * success, Cancelable * failure) { + ListFreer listFreer; + using TypeInfo = Thermostat::Attributes::OccupiedSetbackMax::TypeInfo; + TypeInfo::Type cppValue; + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = value.unsignedCharValue; + } + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + +- (void)writeAttributeUnoccupiedSetbackMinWithValue:(NSNumber * _Nullable)value + completionHandler:(StatusCompletion)completionHandler +{ + new CHIPDefaultSuccessCallbackBridge( + self.callbackQueue, + ^(id _Nullable ignored, NSError * _Nullable error) { + completionHandler(error); + }, + ^(Cancelable * success, Cancelable * failure) { + ListFreer listFreer; + using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMin::TypeInfo; + TypeInfo::Type cppValue; + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = value.unsignedCharValue; + } + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + +- (void)writeAttributeUnoccupiedSetbackMaxWithValue:(NSNumber * _Nullable)value + completionHandler:(StatusCompletion)completionHandler +{ + new CHIPDefaultSuccessCallbackBridge( + self.callbackQueue, + ^(id _Nullable ignored, NSError * _Nullable error) { + completionHandler(error); + }, + ^(Cancelable * success, Cancelable * failure) { + ListFreer listFreer; + using TypeInfo = Thermostat::Attributes::UnoccupiedSetbackMax::TypeInfo; + TypeInfo::Type cppValue; + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = value.unsignedCharValue; + } + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); + }); +} + +- (void)writeAttributeACCoilTemperatureWithValue:(NSNumber * _Nullable)value completionHandler:(StatusCompletion)completionHandler +{ + new CHIPDefaultSuccessCallbackBridge( + self.callbackQueue, + ^(id _Nullable ignored, NSError * _Nullable error) { + completionHandler(error); + }, + ^(Cancelable * success, Cancelable * failure) { + ListFreer listFreer; + using TypeInfo = Thermostat::Attributes::ACCoilTemperature::TypeInfo; + TypeInfo::Type cppValue; + if (value == nil) { + cppValue.SetNull(); + } else { + auto & nonNullValue_0 = cppValue.SetNonNull(); + nonNullValue_0 = value.shortValue; + } auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h index b0ebc755ed2fc6..0933783768d2b1 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h @@ -80490,9 +80490,9 @@ class SubscribeAttributeTestClusterClusterRevision : public SubscribeAttribute { | * AbsMaxHeatSetpointLimit | 0x0004 | | * AbsMinCoolSetpointLimit | 0x0005 | | * AbsMaxCoolSetpointLimit | 0x0006 | -| * PiCoolingDemand | 0x0007 | -| * PiHeatingDemand | 0x0008 | -| * HvacSystemTypeConfiguration | 0x0009 | +| * PICoolingDemand | 0x0007 | +| * PIHeatingDemand | 0x0008 | +| * HVACSystemTypeConfiguration | 0x0009 | | * LocalTemperatureCalibration | 0x0010 | | * OccupiedCoolingSetpoint | 0x0011 | | * OccupiedHeatingSetpoint | 0x0012 | @@ -80518,14 +80518,21 @@ class SubscribeAttributeTestClusterClusterRevision : public SubscribeAttribute { | * SetpointChangeSource | 0x0030 | | * SetpointChangeAmount | 0x0031 | | * SetpointChangeSourceTimestamp | 0x0032 | -| * AcType | 0x0040 | -| * AcCapacity | 0x0041 | -| * AcRefrigerantType | 0x0042 | -| * AcCompressorType | 0x0043 | -| * AcErrorCode | 0x0044 | -| * AcLouverPosition | 0x0045 | -| * AcCoilTemperature | 0x0046 | -| * AcCapacityFormat | 0x0047 | +| * OccupiedSetback | 0x0034 | +| * OccupiedSetbackMin | 0x0035 | +| * OccupiedSetbackMax | 0x0036 | +| * UnoccupiedSetback | 0x0037 | +| * UnoccupiedSetbackMin | 0x0038 | +| * UnoccupiedSetbackMax | 0x0039 | +| * EmergencyHeatDelta | 0x003A | +| * ACType | 0x0040 | +| * ACCapacity | 0x0041 | +| * ACRefrigerantType | 0x0042 | +| * ACCompressorType | 0x0043 | +| * ACErrorCode | 0x0044 | +| * ACLouverPosition | 0x0045 | +| * ACCoilTemperature | 0x0046 | +| * ACCapacityformat | 0x0047 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * AttributeList | 0xFFFB | @@ -80588,12 +80595,12 @@ class ThermostatSetWeeklySchedule : public ClusterCommand { public: ThermostatSetWeeklySchedule() : ClusterCommand("set-weekly-schedule") - , mComplex_Payload(&mRequest.payload) + , mComplex_Transitions(&mRequest.transitions) { AddArgument("NumberOfTransitionsForSequence", 0, UINT8_MAX, &mRequest.numberOfTransitionsForSequence); AddArgument("DayOfWeekForSequence", 0, UINT8_MAX, &mRequest.dayOfWeekForSequence); AddArgument("ModeForSequence", 0, UINT8_MAX, &mRequest.modeForSequence); - AddArgument("Payload", &mComplex_Payload); + AddArgument("Transitions", &mComplex_Transitions); ClusterCommand::AddArguments(); } @@ -80611,12 +80618,23 @@ class ThermostatSetWeeklySchedule : public ClusterCommand { params.modeForSequence = [NSNumber numberWithUnsignedChar:mRequest.modeForSequence.Raw()]; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; - for (auto & entry_0 : mRequest.payload) { - NSNumber * newElement_0; - newElement_0 = [NSNumber numberWithUnsignedChar:entry_0]; + for (auto & entry_0 : mRequest.transitions) { + CHIPThermostatClusterThermostatScheduleTransition * newElement_0; + newElement_0 = [CHIPThermostatClusterThermostatScheduleTransition new]; + newElement_0.transitionTime = [NSNumber numberWithUnsignedShort:entry_0.transitionTime]; + if (entry_0.heatSetpoint.IsNull()) { + newElement_0.heatSetpoint = nil; + } else { + newElement_0.heatSetpoint = [NSNumber numberWithShort:entry_0.heatSetpoint.Value()]; + } + if (entry_0.coolSetpoint.IsNull()) { + newElement_0.coolSetpoint = nil; + } else { + newElement_0.coolSetpoint = [NSNumber numberWithShort:entry_0.coolSetpoint.Value()]; + } [array_0 addObject:newElement_0]; } - params.payload = array_0; + params.transitions = array_0; } uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; @@ -80638,7 +80656,9 @@ class ThermostatSetWeeklySchedule : public ClusterCommand { private: chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::Type mRequest; - TypedComplexArgument> mComplex_Payload; + TypedComplexArgument< + chip::app::DataModel::List> + mComplex_Transitions; }; /* @@ -81249,16 +81269,16 @@ class SubscribeAttributeThermostatAbsMaxCoolSetpointLimit : public SubscribeAttr }; /* - * Attribute PiCoolingDemand + * Attribute PICoolingDemand */ -class ReadThermostatPiCoolingDemand : public ReadAttribute { +class ReadThermostatPICoolingDemand : public ReadAttribute { public: - ReadThermostatPiCoolingDemand() - : ReadAttribute("pi-cooling-demand") + ReadThermostatPICoolingDemand() + : ReadAttribute("picooling-demand") { } - ~ReadThermostatPiCoolingDemand() {} + ~ReadThermostatPICoolingDemand() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -81266,10 +81286,10 @@ class ReadThermostatPiCoolingDemand : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributePiCoolingDemandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.PiCoolingDemand response %@", [value description]); + [cluster readAttributePICoolingDemandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.PICoolingDemand response %@", [value description]); if (error != nil) { - LogNSError("Thermostat PiCoolingDemand read Error", error); + LogNSError("Thermostat PICoolingDemand read Error", error); } SetCommandExitStatus(error); }]; @@ -81277,14 +81297,14 @@ class ReadThermostatPiCoolingDemand : public ReadAttribute { } }; -class SubscribeAttributeThermostatPiCoolingDemand : public SubscribeAttribute { +class SubscribeAttributeThermostatPICoolingDemand : public SubscribeAttribute { public: - SubscribeAttributeThermostatPiCoolingDemand() - : SubscribeAttribute("pi-cooling-demand") + SubscribeAttributeThermostatPICoolingDemand() + : SubscribeAttribute("picooling-demand") { } - ~SubscribeAttributeThermostatPiCoolingDemand() {} + ~SubscribeAttributeThermostatPICoolingDemand() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -81295,12 +81315,12 @@ class SubscribeAttributeThermostatPiCoolingDemand : public SubscribeAttribute { params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributePiCoolingDemandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + [cluster subscribeAttributePICoolingDemandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.PiCoolingDemand response %@", [value description]); + NSLog(@"Thermostat.PICoolingDemand response %@", [value description]); if (error || !mWait) { SetCommandExitStatus(error); } @@ -81316,16 +81336,16 @@ class SubscribeAttributeThermostatPiCoolingDemand : public SubscribeAttribute { }; /* - * Attribute PiHeatingDemand + * Attribute PIHeatingDemand */ -class ReadThermostatPiHeatingDemand : public ReadAttribute { +class ReadThermostatPIHeatingDemand : public ReadAttribute { public: - ReadThermostatPiHeatingDemand() - : ReadAttribute("pi-heating-demand") + ReadThermostatPIHeatingDemand() + : ReadAttribute("piheating-demand") { } - ~ReadThermostatPiHeatingDemand() {} + ~ReadThermostatPIHeatingDemand() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -81333,10 +81353,10 @@ class ReadThermostatPiHeatingDemand : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributePiHeatingDemandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.PiHeatingDemand response %@", [value description]); + [cluster readAttributePIHeatingDemandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.PIHeatingDemand response %@", [value description]); if (error != nil) { - LogNSError("Thermostat PiHeatingDemand read Error", error); + LogNSError("Thermostat PIHeatingDemand read Error", error); } SetCommandExitStatus(error); }]; @@ -81344,14 +81364,14 @@ class ReadThermostatPiHeatingDemand : public ReadAttribute { } }; -class SubscribeAttributeThermostatPiHeatingDemand : public SubscribeAttribute { +class SubscribeAttributeThermostatPIHeatingDemand : public SubscribeAttribute { public: - SubscribeAttributeThermostatPiHeatingDemand() - : SubscribeAttribute("pi-heating-demand") + SubscribeAttributeThermostatPIHeatingDemand() + : SubscribeAttribute("piheating-demand") { } - ~SubscribeAttributeThermostatPiHeatingDemand() {} + ~SubscribeAttributeThermostatPIHeatingDemand() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -81362,12 +81382,12 @@ class SubscribeAttributeThermostatPiHeatingDemand : public SubscribeAttribute { params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributePiHeatingDemandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + [cluster subscribeAttributePIHeatingDemandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.PiHeatingDemand response %@", [value description]); + NSLog(@"Thermostat.PIHeatingDemand response %@", [value description]); if (error || !mWait) { SetCommandExitStatus(error); } @@ -81383,16 +81403,16 @@ class SubscribeAttributeThermostatPiHeatingDemand : public SubscribeAttribute { }; /* - * Attribute HvacSystemTypeConfiguration + * Attribute HVACSystemTypeConfiguration */ -class ReadThermostatHvacSystemTypeConfiguration : public ReadAttribute { +class ReadThermostatHVACSystemTypeConfiguration : public ReadAttribute { public: - ReadThermostatHvacSystemTypeConfiguration() - : ReadAttribute("hvac-system-type-configuration") + ReadThermostatHVACSystemTypeConfiguration() + : ReadAttribute("hvacsystem-type-configuration") { } - ~ReadThermostatHvacSystemTypeConfiguration() {} + ~ReadThermostatHVACSystemTypeConfiguration() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -81401,10 +81421,10 @@ class ReadThermostatHvacSystemTypeConfiguration : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; [cluster - readAttributeHvacSystemTypeConfigurationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.HvacSystemTypeConfiguration response %@", [value description]); + readAttributeHVACSystemTypeConfigurationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.HVACSystemTypeConfiguration response %@", [value description]); if (error != nil) { - LogNSError("Thermostat HvacSystemTypeConfiguration read Error", error); + LogNSError("Thermostat HVACSystemTypeConfiguration read Error", error); } SetCommandExitStatus(error); }]; @@ -81412,17 +81432,17 @@ class ReadThermostatHvacSystemTypeConfiguration : public ReadAttribute { } }; -class WriteThermostatHvacSystemTypeConfiguration : public WriteAttribute { +class WriteThermostatHVACSystemTypeConfiguration : public WriteAttribute { public: - WriteThermostatHvacSystemTypeConfiguration() - : WriteAttribute("hvac-system-type-configuration") + WriteThermostatHVACSystemTypeConfiguration() + : WriteAttribute("hvacsystem-type-configuration") { - AddArgument("attr-name", "hvac-system-type-configuration"); + AddArgument("attr-name", "hvacsystem-type-configuration"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatHvacSystemTypeConfiguration() {} + ~WriteThermostatHVACSystemTypeConfiguration() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -81435,11 +81455,11 @@ class WriteThermostatHvacSystemTypeConfiguration : public WriteAttribute { params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; - [cluster writeAttributeHvacSystemTypeConfigurationWithValue:value + [cluster writeAttributeHVACSystemTypeConfigurationWithValue:value params:params completionHandler:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("Thermostat HvacSystemTypeConfiguration write Error", error); + LogNSError("Thermostat HVACSystemTypeConfiguration write Error", error); } SetCommandExitStatus(error); }]; @@ -81450,14 +81470,14 @@ class WriteThermostatHvacSystemTypeConfiguration : public WriteAttribute { uint8_t mValue; }; -class SubscribeAttributeThermostatHvacSystemTypeConfiguration : public SubscribeAttribute { +class SubscribeAttributeThermostatHVACSystemTypeConfiguration : public SubscribeAttribute { public: - SubscribeAttributeThermostatHvacSystemTypeConfiguration() - : SubscribeAttribute("hvac-system-type-configuration") + SubscribeAttributeThermostatHVACSystemTypeConfiguration() + : SubscribeAttribute("hvacsystem-type-configuration") { } - ~SubscribeAttributeThermostatHvacSystemTypeConfiguration() {} + ~SubscribeAttributeThermostatHVACSystemTypeConfiguration() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -81469,12 +81489,12 @@ class SubscribeAttributeThermostatHvacSystemTypeConfiguration : public Subscribe = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster - subscribeAttributeHvacSystemTypeConfigurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.HvacSystemTypeConfiguration response %@", + NSLog(@"Thermostat.HVACSystemTypeConfiguration response %@", [value description]); if (error || !mWait) { SetCommandExitStatus(error); @@ -83376,7 +83396,7 @@ class WriteThermostatTemperatureSetpointHoldDuration : public WriteAttribute { params.timedWriteTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; - NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; + NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeTemperatureSetpointHoldDurationWithValue:value params:params @@ -83821,16 +83841,601 @@ class SubscribeAttributeThermostatSetpointChangeSourceTimestamp : public Subscri }; /* - * Attribute AcType + * Attribute OccupiedSetback + */ +class ReadThermostatOccupiedSetback : public ReadAttribute { +public: + ReadThermostatOccupiedSetback() + : ReadAttribute("occupied-setback") + { + } + + ~ReadThermostatOccupiedSetback() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000034) on endpoint %u", endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + [cluster readAttributeOccupiedSetbackWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.OccupiedSetback response %@", [value description]); + if (error != nil) { + LogNSError("Thermostat OccupiedSetback read Error", error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class WriteThermostatOccupiedSetback : public WriteAttribute { +public: + WriteThermostatOccupiedSetback() + : WriteAttribute("occupied-setback") + { + AddArgument("attr-name", "occupied-setback"); + AddArgument("attr-value", 0, UINT8_MAX, &mValue); + WriteAttribute::AddArguments(); + } + + ~WriteThermostatOccupiedSetback() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000034) on endpoint %u", endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; + params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; + NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; + + [cluster writeAttributeOccupiedSetbackWithValue:value + params:params + completionHandler:^(NSError * _Nullable error) { + if (error != nil) { + LogNSError("Thermostat OccupiedSetback write Error", error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } + +private: + uint8_t mValue; +}; + +class SubscribeAttributeThermostatOccupiedSetback : public SubscribeAttribute { +public: + SubscribeAttributeThermostatOccupiedSetback() + : SubscribeAttribute("occupied-setback") + { + } + + ~SubscribeAttributeThermostatOccupiedSetback() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000034) on endpoint %u", endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.keepPreviousSubscriptions + = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; + [cluster subscribeAttributeOccupiedSetbackWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] + params:params + subscriptionEstablished:nullptr + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.OccupiedSetback response %@", [value description]); + if (error || !mWait) { + SetCommandExitStatus(error); + } + }]; + + return CHIP_NO_ERROR; + } + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); + } +}; + +/* + * Attribute OccupiedSetbackMin + */ +class ReadThermostatOccupiedSetbackMin : public ReadAttribute { +public: + ReadThermostatOccupiedSetbackMin() + : ReadAttribute("occupied-setback-min") + { + } + + ~ReadThermostatOccupiedSetbackMin() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000035) on endpoint %u", endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + [cluster readAttributeOccupiedSetbackMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.OccupiedSetbackMin response %@", [value description]); + if (error != nil) { + LogNSError("Thermostat OccupiedSetbackMin read Error", error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeThermostatOccupiedSetbackMin : public SubscribeAttribute { +public: + SubscribeAttributeThermostatOccupiedSetbackMin() + : SubscribeAttribute("occupied-setback-min") + { + } + + ~SubscribeAttributeThermostatOccupiedSetbackMin() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000035) on endpoint %u", endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.keepPreviousSubscriptions + = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; + [cluster subscribeAttributeOccupiedSetbackMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] + params:params + subscriptionEstablished:nullptr + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.OccupiedSetbackMin response %@", [value description]); + if (error || !mWait) { + SetCommandExitStatus(error); + } + }]; + + return CHIP_NO_ERROR; + } + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); + } +}; + +/* + * Attribute OccupiedSetbackMax + */ +class ReadThermostatOccupiedSetbackMax : public ReadAttribute { +public: + ReadThermostatOccupiedSetbackMax() + : ReadAttribute("occupied-setback-max") + { + } + + ~ReadThermostatOccupiedSetbackMax() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000036) on endpoint %u", endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + [cluster readAttributeOccupiedSetbackMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.OccupiedSetbackMax response %@", [value description]); + if (error != nil) { + LogNSError("Thermostat OccupiedSetbackMax read Error", error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeThermostatOccupiedSetbackMax : public SubscribeAttribute { +public: + SubscribeAttributeThermostatOccupiedSetbackMax() + : SubscribeAttribute("occupied-setback-max") + { + } + + ~SubscribeAttributeThermostatOccupiedSetbackMax() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000036) on endpoint %u", endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.keepPreviousSubscriptions + = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; + [cluster subscribeAttributeOccupiedSetbackMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] + params:params + subscriptionEstablished:nullptr + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.OccupiedSetbackMax response %@", [value description]); + if (error || !mWait) { + SetCommandExitStatus(error); + } + }]; + + return CHIP_NO_ERROR; + } + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); + } +}; + +/* + * Attribute UnoccupiedSetback + */ +class ReadThermostatUnoccupiedSetback : public ReadAttribute { +public: + ReadThermostatUnoccupiedSetback() + : ReadAttribute("unoccupied-setback") + { + } + + ~ReadThermostatUnoccupiedSetback() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000037) on endpoint %u", endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + [cluster readAttributeUnoccupiedSetbackWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.UnoccupiedSetback response %@", [value description]); + if (error != nil) { + LogNSError("Thermostat UnoccupiedSetback read Error", error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class WriteThermostatUnoccupiedSetback : public WriteAttribute { +public: + WriteThermostatUnoccupiedSetback() + : WriteAttribute("unoccupied-setback") + { + AddArgument("attr-name", "unoccupied-setback"); + AddArgument("attr-value", 0, UINT8_MAX, &mValue); + WriteAttribute::AddArguments(); + } + + ~WriteThermostatUnoccupiedSetback() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x00000037) on endpoint %u", endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; + params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; + NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; + + [cluster writeAttributeUnoccupiedSetbackWithValue:value + params:params + completionHandler:^(NSError * _Nullable error) { + if (error != nil) { + LogNSError("Thermostat UnoccupiedSetback write Error", error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } + +private: + uint8_t mValue; +}; + +class SubscribeAttributeThermostatUnoccupiedSetback : public SubscribeAttribute { +public: + SubscribeAttributeThermostatUnoccupiedSetback() + : SubscribeAttribute("unoccupied-setback") + { + } + + ~SubscribeAttributeThermostatUnoccupiedSetback() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000037) on endpoint %u", endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.keepPreviousSubscriptions + = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; + [cluster subscribeAttributeUnoccupiedSetbackWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] + params:params + subscriptionEstablished:nullptr + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.UnoccupiedSetback response %@", [value description]); + if (error || !mWait) { + SetCommandExitStatus(error); + } + }]; + + return CHIP_NO_ERROR; + } + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); + } +}; + +/* + * Attribute UnoccupiedSetbackMin + */ +class ReadThermostatUnoccupiedSetbackMin : public ReadAttribute { +public: + ReadThermostatUnoccupiedSetbackMin() + : ReadAttribute("unoccupied-setback-min") + { + } + + ~ReadThermostatUnoccupiedSetbackMin() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000038) on endpoint %u", endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + [cluster readAttributeUnoccupiedSetbackMinWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.UnoccupiedSetbackMin response %@", [value description]); + if (error != nil) { + LogNSError("Thermostat UnoccupiedSetbackMin read Error", error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeThermostatUnoccupiedSetbackMin : public SubscribeAttribute { +public: + SubscribeAttributeThermostatUnoccupiedSetbackMin() + : SubscribeAttribute("unoccupied-setback-min") + { + } + + ~SubscribeAttributeThermostatUnoccupiedSetbackMin() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000038) on endpoint %u", endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.keepPreviousSubscriptions + = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; + [cluster + subscribeAttributeUnoccupiedSetbackMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] + params:params + subscriptionEstablished:nullptr + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.UnoccupiedSetbackMin response %@", [value description]); + if (error || !mWait) { + SetCommandExitStatus(error); + } + }]; + + return CHIP_NO_ERROR; + } + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); + } +}; + +/* + * Attribute UnoccupiedSetbackMax + */ +class ReadThermostatUnoccupiedSetbackMax : public ReadAttribute { +public: + ReadThermostatUnoccupiedSetbackMax() + : ReadAttribute("unoccupied-setback-max") + { + } + + ~ReadThermostatUnoccupiedSetbackMax() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x00000039) on endpoint %u", endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + [cluster readAttributeUnoccupiedSetbackMaxWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.UnoccupiedSetbackMax response %@", [value description]); + if (error != nil) { + LogNSError("Thermostat UnoccupiedSetbackMax read Error", error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeThermostatUnoccupiedSetbackMax : public SubscribeAttribute { +public: + SubscribeAttributeThermostatUnoccupiedSetbackMax() + : SubscribeAttribute("unoccupied-setback-max") + { + } + + ~SubscribeAttributeThermostatUnoccupiedSetbackMax() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x00000039) on endpoint %u", endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.keepPreviousSubscriptions + = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; + [cluster + subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] + params:params + subscriptionEstablished:nullptr + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.UnoccupiedSetbackMax response %@", [value description]); + if (error || !mWait) { + SetCommandExitStatus(error); + } + }]; + + return CHIP_NO_ERROR; + } + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); + } +}; + +/* + * Attribute EmergencyHeatDelta + */ +class ReadThermostatEmergencyHeatDelta : public ReadAttribute { +public: + ReadThermostatEmergencyHeatDelta() + : ReadAttribute("emergency-heat-delta") + { + } + + ~ReadThermostatEmergencyHeatDelta() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReadAttribute (0x0000003A) on endpoint %u", endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + [cluster readAttributeEmergencyHeatDeltaWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.EmergencyHeatDelta response %@", [value description]); + if (error != nil) { + LogNSError("Thermostat EmergencyHeatDelta read Error", error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class WriteThermostatEmergencyHeatDelta : public WriteAttribute { +public: + WriteThermostatEmergencyHeatDelta() + : WriteAttribute("emergency-heat-delta") + { + AddArgument("attr-name", "emergency-heat-delta"); + AddArgument("attr-value", 0, UINT8_MAX, &mValue); + WriteAttribute::AddArguments(); + } + + ~WriteThermostatEmergencyHeatDelta() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) WriteAttribute (0x0000003A) on endpoint %u", endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; + params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; + NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; + + [cluster writeAttributeEmergencyHeatDeltaWithValue:value + params:params + completionHandler:^(NSError * _Nullable error) { + if (error != nil) { + LogNSError("Thermostat EmergencyHeatDelta write Error", error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } + +private: + uint8_t mValue; +}; + +class SubscribeAttributeThermostatEmergencyHeatDelta : public SubscribeAttribute { +public: + SubscribeAttributeThermostatEmergencyHeatDelta() + : SubscribeAttribute("emergency-heat-delta") + { + } + + ~SubscribeAttributeThermostatEmergencyHeatDelta() {} + + CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000201) ReportAttribute (0x0000003A) on endpoint %u", endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; + CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.keepPreviousSubscriptions + = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; + [cluster subscribeAttributeEmergencyHeatDeltaWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] + params:params + subscriptionEstablished:nullptr + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.EmergencyHeatDelta response %@", [value description]); + if (error || !mWait) { + SetCommandExitStatus(error); + } + }]; + + return CHIP_NO_ERROR; + } + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mWait ? UINT16_MAX : 10); + } +}; + +/* + * Attribute ACType */ -class ReadThermostatAcType : public ReadAttribute { +class ReadThermostatACType : public ReadAttribute { public: - ReadThermostatAcType() - : ReadAttribute("ac-type") + ReadThermostatACType() + : ReadAttribute("actype") { } - ~ReadThermostatAcType() {} + ~ReadThermostatACType() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -83838,10 +84443,10 @@ class ReadThermostatAcType : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributeAcTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcType response %@", [value description]); + [cluster readAttributeACTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.ACType response %@", [value description]); if (error != nil) { - LogNSError("Thermostat AcType read Error", error); + LogNSError("Thermostat ACType read Error", error); } SetCommandExitStatus(error); }]; @@ -83849,17 +84454,17 @@ class ReadThermostatAcType : public ReadAttribute { } }; -class WriteThermostatAcType : public WriteAttribute { +class WriteThermostatACType : public WriteAttribute { public: - WriteThermostatAcType() - : WriteAttribute("ac-type") + WriteThermostatACType() + : WriteAttribute("actype") { - AddArgument("attr-name", "ac-type"); + AddArgument("attr-name", "actype"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcType() {} + ~WriteThermostatACType() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -83872,11 +84477,11 @@ class WriteThermostatAcType : public WriteAttribute { params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; - [cluster writeAttributeAcTypeWithValue:value + [cluster writeAttributeACTypeWithValue:value params:params completionHandler:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("Thermostat AcType write Error", error); + LogNSError("Thermostat ACType write Error", error); } SetCommandExitStatus(error); }]; @@ -83887,14 +84492,14 @@ class WriteThermostatAcType : public WriteAttribute { uint8_t mValue; }; -class SubscribeAttributeThermostatAcType : public SubscribeAttribute { +class SubscribeAttributeThermostatACType : public SubscribeAttribute { public: - SubscribeAttributeThermostatAcType() - : SubscribeAttribute("ac-type") + SubscribeAttributeThermostatACType() + : SubscribeAttribute("actype") { } - ~SubscribeAttributeThermostatAcType() {} + ~SubscribeAttributeThermostatACType() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -83905,12 +84510,12 @@ class SubscribeAttributeThermostatAcType : public SubscribeAttribute { params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributeAcTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + [cluster subscribeAttributeACTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcType response %@", [value description]); + NSLog(@"Thermostat.ACType response %@", [value description]); if (error || !mWait) { SetCommandExitStatus(error); } @@ -83926,16 +84531,16 @@ class SubscribeAttributeThermostatAcType : public SubscribeAttribute { }; /* - * Attribute AcCapacity + * Attribute ACCapacity */ -class ReadThermostatAcCapacity : public ReadAttribute { +class ReadThermostatACCapacity : public ReadAttribute { public: - ReadThermostatAcCapacity() - : ReadAttribute("ac-capacity") + ReadThermostatACCapacity() + : ReadAttribute("accapacity") { } - ~ReadThermostatAcCapacity() {} + ~ReadThermostatACCapacity() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -83943,10 +84548,10 @@ class ReadThermostatAcCapacity : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributeAcCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcCapacity response %@", [value description]); + [cluster readAttributeACCapacityWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.ACCapacity response %@", [value description]); if (error != nil) { - LogNSError("Thermostat AcCapacity read Error", error); + LogNSError("Thermostat ACCapacity read Error", error); } SetCommandExitStatus(error); }]; @@ -83954,17 +84559,17 @@ class ReadThermostatAcCapacity : public ReadAttribute { } }; -class WriteThermostatAcCapacity : public WriteAttribute { +class WriteThermostatACCapacity : public WriteAttribute { public: - WriteThermostatAcCapacity() - : WriteAttribute("ac-capacity") + WriteThermostatACCapacity() + : WriteAttribute("accapacity") { - AddArgument("attr-name", "ac-capacity"); + AddArgument("attr-name", "accapacity"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcCapacity() {} + ~WriteThermostatACCapacity() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -83977,11 +84582,11 @@ class WriteThermostatAcCapacity : public WriteAttribute { params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; - [cluster writeAttributeAcCapacityWithValue:value + [cluster writeAttributeACCapacityWithValue:value params:params completionHandler:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("Thermostat AcCapacity write Error", error); + LogNSError("Thermostat ACCapacity write Error", error); } SetCommandExitStatus(error); }]; @@ -83992,14 +84597,14 @@ class WriteThermostatAcCapacity : public WriteAttribute { uint16_t mValue; }; -class SubscribeAttributeThermostatAcCapacity : public SubscribeAttribute { +class SubscribeAttributeThermostatACCapacity : public SubscribeAttribute { public: - SubscribeAttributeThermostatAcCapacity() - : SubscribeAttribute("ac-capacity") + SubscribeAttributeThermostatACCapacity() + : SubscribeAttribute("accapacity") { } - ~SubscribeAttributeThermostatAcCapacity() {} + ~SubscribeAttributeThermostatACCapacity() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84010,12 +84615,12 @@ class SubscribeAttributeThermostatAcCapacity : public SubscribeAttribute { params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributeAcCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + [cluster subscribeAttributeACCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcCapacity response %@", [value description]); + NSLog(@"Thermostat.ACCapacity response %@", [value description]); if (error || !mWait) { SetCommandExitStatus(error); } @@ -84031,16 +84636,16 @@ class SubscribeAttributeThermostatAcCapacity : public SubscribeAttribute { }; /* - * Attribute AcRefrigerantType + * Attribute ACRefrigerantType */ -class ReadThermostatAcRefrigerantType : public ReadAttribute { +class ReadThermostatACRefrigerantType : public ReadAttribute { public: - ReadThermostatAcRefrigerantType() - : ReadAttribute("ac-refrigerant-type") + ReadThermostatACRefrigerantType() + : ReadAttribute("acrefrigerant-type") { } - ~ReadThermostatAcRefrigerantType() {} + ~ReadThermostatACRefrigerantType() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84048,10 +84653,10 @@ class ReadThermostatAcRefrigerantType : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributeAcRefrigerantTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcRefrigerantType response %@", [value description]); + [cluster readAttributeACRefrigerantTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.ACRefrigerantType response %@", [value description]); if (error != nil) { - LogNSError("Thermostat AcRefrigerantType read Error", error); + LogNSError("Thermostat ACRefrigerantType read Error", error); } SetCommandExitStatus(error); }]; @@ -84059,17 +84664,17 @@ class ReadThermostatAcRefrigerantType : public ReadAttribute { } }; -class WriteThermostatAcRefrigerantType : public WriteAttribute { +class WriteThermostatACRefrigerantType : public WriteAttribute { public: - WriteThermostatAcRefrigerantType() - : WriteAttribute("ac-refrigerant-type") + WriteThermostatACRefrigerantType() + : WriteAttribute("acrefrigerant-type") { - AddArgument("attr-name", "ac-refrigerant-type"); + AddArgument("attr-name", "acrefrigerant-type"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcRefrigerantType() {} + ~WriteThermostatACRefrigerantType() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84082,11 +84687,11 @@ class WriteThermostatAcRefrigerantType : public WriteAttribute { params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; - [cluster writeAttributeAcRefrigerantTypeWithValue:value + [cluster writeAttributeACRefrigerantTypeWithValue:value params:params completionHandler:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("Thermostat AcRefrigerantType write Error", error); + LogNSError("Thermostat ACRefrigerantType write Error", error); } SetCommandExitStatus(error); }]; @@ -84097,14 +84702,14 @@ class WriteThermostatAcRefrigerantType : public WriteAttribute { uint8_t mValue; }; -class SubscribeAttributeThermostatAcRefrigerantType : public SubscribeAttribute { +class SubscribeAttributeThermostatACRefrigerantType : public SubscribeAttribute { public: - SubscribeAttributeThermostatAcRefrigerantType() - : SubscribeAttribute("ac-refrigerant-type") + SubscribeAttributeThermostatACRefrigerantType() + : SubscribeAttribute("acrefrigerant-type") { } - ~SubscribeAttributeThermostatAcRefrigerantType() {} + ~SubscribeAttributeThermostatACRefrigerantType() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84115,12 +84720,12 @@ class SubscribeAttributeThermostatAcRefrigerantType : public SubscribeAttribute params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributeAcRefrigerantTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + [cluster subscribeAttributeACRefrigerantTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcRefrigerantType response %@", [value description]); + NSLog(@"Thermostat.ACRefrigerantType response %@", [value description]); if (error || !mWait) { SetCommandExitStatus(error); } @@ -84136,16 +84741,16 @@ class SubscribeAttributeThermostatAcRefrigerantType : public SubscribeAttribute }; /* - * Attribute AcCompressorType + * Attribute ACCompressorType */ -class ReadThermostatAcCompressorType : public ReadAttribute { +class ReadThermostatACCompressorType : public ReadAttribute { public: - ReadThermostatAcCompressorType() - : ReadAttribute("ac-compressor-type") + ReadThermostatACCompressorType() + : ReadAttribute("accompressor-type") { } - ~ReadThermostatAcCompressorType() {} + ~ReadThermostatACCompressorType() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84153,10 +84758,10 @@ class ReadThermostatAcCompressorType : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributeAcCompressorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcCompressorType response %@", [value description]); + [cluster readAttributeACCompressorTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.ACCompressorType response %@", [value description]); if (error != nil) { - LogNSError("Thermostat AcCompressorType read Error", error); + LogNSError("Thermostat ACCompressorType read Error", error); } SetCommandExitStatus(error); }]; @@ -84164,17 +84769,17 @@ class ReadThermostatAcCompressorType : public ReadAttribute { } }; -class WriteThermostatAcCompressorType : public WriteAttribute { +class WriteThermostatACCompressorType : public WriteAttribute { public: - WriteThermostatAcCompressorType() - : WriteAttribute("ac-compressor-type") + WriteThermostatACCompressorType() + : WriteAttribute("accompressor-type") { - AddArgument("attr-name", "ac-compressor-type"); + AddArgument("attr-name", "accompressor-type"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcCompressorType() {} + ~WriteThermostatACCompressorType() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84187,11 +84792,11 @@ class WriteThermostatAcCompressorType : public WriteAttribute { params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; - [cluster writeAttributeAcCompressorTypeWithValue:value + [cluster writeAttributeACCompressorTypeWithValue:value params:params completionHandler:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("Thermostat AcCompressorType write Error", error); + LogNSError("Thermostat ACCompressorType write Error", error); } SetCommandExitStatus(error); }]; @@ -84202,14 +84807,14 @@ class WriteThermostatAcCompressorType : public WriteAttribute { uint8_t mValue; }; -class SubscribeAttributeThermostatAcCompressorType : public SubscribeAttribute { +class SubscribeAttributeThermostatACCompressorType : public SubscribeAttribute { public: - SubscribeAttributeThermostatAcCompressorType() - : SubscribeAttribute("ac-compressor-type") + SubscribeAttributeThermostatACCompressorType() + : SubscribeAttribute("accompressor-type") { } - ~SubscribeAttributeThermostatAcCompressorType() {} + ~SubscribeAttributeThermostatACCompressorType() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84220,12 +84825,12 @@ class SubscribeAttributeThermostatAcCompressorType : public SubscribeAttribute { params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributeAcCompressorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + [cluster subscribeAttributeACCompressorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcCompressorType response %@", [value description]); + NSLog(@"Thermostat.ACCompressorType response %@", [value description]); if (error || !mWait) { SetCommandExitStatus(error); } @@ -84241,16 +84846,16 @@ class SubscribeAttributeThermostatAcCompressorType : public SubscribeAttribute { }; /* - * Attribute AcErrorCode + * Attribute ACErrorCode */ -class ReadThermostatAcErrorCode : public ReadAttribute { +class ReadThermostatACErrorCode : public ReadAttribute { public: - ReadThermostatAcErrorCode() - : ReadAttribute("ac-error-code") + ReadThermostatACErrorCode() + : ReadAttribute("acerror-code") { } - ~ReadThermostatAcErrorCode() {} + ~ReadThermostatACErrorCode() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84258,10 +84863,10 @@ class ReadThermostatAcErrorCode : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributeAcErrorCodeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcErrorCode response %@", [value description]); + [cluster readAttributeACErrorCodeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.ACErrorCode response %@", [value description]); if (error != nil) { - LogNSError("Thermostat AcErrorCode read Error", error); + LogNSError("Thermostat ACErrorCode read Error", error); } SetCommandExitStatus(error); }]; @@ -84269,17 +84874,17 @@ class ReadThermostatAcErrorCode : public ReadAttribute { } }; -class WriteThermostatAcErrorCode : public WriteAttribute { +class WriteThermostatACErrorCode : public WriteAttribute { public: - WriteThermostatAcErrorCode() - : WriteAttribute("ac-error-code") + WriteThermostatACErrorCode() + : WriteAttribute("acerror-code") { - AddArgument("attr-name", "ac-error-code"); + AddArgument("attr-name", "acerror-code"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcErrorCode() {} + ~WriteThermostatACErrorCode() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84292,11 +84897,11 @@ class WriteThermostatAcErrorCode : public WriteAttribute { params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue]; - [cluster writeAttributeAcErrorCodeWithValue:value + [cluster writeAttributeACErrorCodeWithValue:value params:params completionHandler:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("Thermostat AcErrorCode write Error", error); + LogNSError("Thermostat ACErrorCode write Error", error); } SetCommandExitStatus(error); }]; @@ -84307,14 +84912,14 @@ class WriteThermostatAcErrorCode : public WriteAttribute { uint32_t mValue; }; -class SubscribeAttributeThermostatAcErrorCode : public SubscribeAttribute { +class SubscribeAttributeThermostatACErrorCode : public SubscribeAttribute { public: - SubscribeAttributeThermostatAcErrorCode() - : SubscribeAttribute("ac-error-code") + SubscribeAttributeThermostatACErrorCode() + : SubscribeAttribute("acerror-code") { } - ~SubscribeAttributeThermostatAcErrorCode() {} + ~SubscribeAttributeThermostatACErrorCode() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84325,12 +84930,12 @@ class SubscribeAttributeThermostatAcErrorCode : public SubscribeAttribute { params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributeAcErrorCodeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + [cluster subscribeAttributeACErrorCodeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcErrorCode response %@", [value description]); + NSLog(@"Thermostat.ACErrorCode response %@", [value description]); if (error || !mWait) { SetCommandExitStatus(error); } @@ -84346,16 +84951,16 @@ class SubscribeAttributeThermostatAcErrorCode : public SubscribeAttribute { }; /* - * Attribute AcLouverPosition + * Attribute ACLouverPosition */ -class ReadThermostatAcLouverPosition : public ReadAttribute { +class ReadThermostatACLouverPosition : public ReadAttribute { public: - ReadThermostatAcLouverPosition() - : ReadAttribute("ac-louver-position") + ReadThermostatACLouverPosition() + : ReadAttribute("aclouver-position") { } - ~ReadThermostatAcLouverPosition() {} + ~ReadThermostatACLouverPosition() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84363,10 +84968,10 @@ class ReadThermostatAcLouverPosition : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributeAcLouverPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcLouverPosition response %@", [value description]); + [cluster readAttributeACLouverPositionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.ACLouverPosition response %@", [value description]); if (error != nil) { - LogNSError("Thermostat AcLouverPosition read Error", error); + LogNSError("Thermostat ACLouverPosition read Error", error); } SetCommandExitStatus(error); }]; @@ -84374,17 +84979,17 @@ class ReadThermostatAcLouverPosition : public ReadAttribute { } }; -class WriteThermostatAcLouverPosition : public WriteAttribute { +class WriteThermostatACLouverPosition : public WriteAttribute { public: - WriteThermostatAcLouverPosition() - : WriteAttribute("ac-louver-position") + WriteThermostatACLouverPosition() + : WriteAttribute("aclouver-position") { - AddArgument("attr-name", "ac-louver-position"); + AddArgument("attr-name", "aclouver-position"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcLouverPosition() {} + ~WriteThermostatACLouverPosition() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84397,11 +85002,11 @@ class WriteThermostatAcLouverPosition : public WriteAttribute { params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; - [cluster writeAttributeAcLouverPositionWithValue:value + [cluster writeAttributeACLouverPositionWithValue:value params:params completionHandler:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("Thermostat AcLouverPosition write Error", error); + LogNSError("Thermostat ACLouverPosition write Error", error); } SetCommandExitStatus(error); }]; @@ -84412,14 +85017,14 @@ class WriteThermostatAcLouverPosition : public WriteAttribute { uint8_t mValue; }; -class SubscribeAttributeThermostatAcLouverPosition : public SubscribeAttribute { +class SubscribeAttributeThermostatACLouverPosition : public SubscribeAttribute { public: - SubscribeAttributeThermostatAcLouverPosition() - : SubscribeAttribute("ac-louver-position") + SubscribeAttributeThermostatACLouverPosition() + : SubscribeAttribute("aclouver-position") { } - ~SubscribeAttributeThermostatAcLouverPosition() {} + ~SubscribeAttributeThermostatACLouverPosition() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84430,12 +85035,12 @@ class SubscribeAttributeThermostatAcLouverPosition : public SubscribeAttribute { params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributeAcLouverPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + [cluster subscribeAttributeACLouverPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcLouverPosition response %@", [value description]); + NSLog(@"Thermostat.ACLouverPosition response %@", [value description]); if (error || !mWait) { SetCommandExitStatus(error); } @@ -84451,16 +85056,16 @@ class SubscribeAttributeThermostatAcLouverPosition : public SubscribeAttribute { }; /* - * Attribute AcCoilTemperature + * Attribute ACCoilTemperature */ -class ReadThermostatAcCoilTemperature : public ReadAttribute { +class ReadThermostatACCoilTemperature : public ReadAttribute { public: - ReadThermostatAcCoilTemperature() - : ReadAttribute("ac-coil-temperature") + ReadThermostatACCoilTemperature() + : ReadAttribute("accoil-temperature") { } - ~ReadThermostatAcCoilTemperature() {} + ~ReadThermostatACCoilTemperature() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84468,10 +85073,10 @@ class ReadThermostatAcCoilTemperature : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributeAcCoilTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcCoilTemperature response %@", [value description]); + [cluster readAttributeACCoilTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.ACCoilTemperature response %@", [value description]); if (error != nil) { - LogNSError("Thermostat AcCoilTemperature read Error", error); + LogNSError("Thermostat ACCoilTemperature read Error", error); } SetCommandExitStatus(error); }]; @@ -84479,14 +85084,14 @@ class ReadThermostatAcCoilTemperature : public ReadAttribute { } }; -class SubscribeAttributeThermostatAcCoilTemperature : public SubscribeAttribute { +class SubscribeAttributeThermostatACCoilTemperature : public SubscribeAttribute { public: - SubscribeAttributeThermostatAcCoilTemperature() - : SubscribeAttribute("ac-coil-temperature") + SubscribeAttributeThermostatACCoilTemperature() + : SubscribeAttribute("accoil-temperature") { } - ~SubscribeAttributeThermostatAcCoilTemperature() {} + ~SubscribeAttributeThermostatACCoilTemperature() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84497,12 +85102,12 @@ class SubscribeAttributeThermostatAcCoilTemperature : public SubscribeAttribute params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributeAcCoilTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + [cluster subscribeAttributeACCoilTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcCoilTemperature response %@", [value description]); + NSLog(@"Thermostat.ACCoilTemperature response %@", [value description]); if (error || !mWait) { SetCommandExitStatus(error); } @@ -84518,16 +85123,16 @@ class SubscribeAttributeThermostatAcCoilTemperature : public SubscribeAttribute }; /* - * Attribute AcCapacityFormat + * Attribute ACCapacityformat */ -class ReadThermostatAcCapacityFormat : public ReadAttribute { +class ReadThermostatACCapacityformat : public ReadAttribute { public: - ReadThermostatAcCapacityFormat() - : ReadAttribute("ac-capacity-format") + ReadThermostatACCapacityformat() + : ReadAttribute("accapacityformat") { } - ~ReadThermostatAcCapacityFormat() {} + ~ReadThermostatACCapacityformat() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84535,10 +85140,10 @@ class ReadThermostatAcCapacityFormat : public ReadAttribute { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributeAcCapacityFormatWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcCapacityFormat response %@", [value description]); + [cluster readAttributeACCapacityformatWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"Thermostat.ACCapacityformat response %@", [value description]); if (error != nil) { - LogNSError("Thermostat AcCapacityFormat read Error", error); + LogNSError("Thermostat ACCapacityformat read Error", error); } SetCommandExitStatus(error); }]; @@ -84546,17 +85151,17 @@ class ReadThermostatAcCapacityFormat : public ReadAttribute { } }; -class WriteThermostatAcCapacityFormat : public WriteAttribute { +class WriteThermostatACCapacityformat : public WriteAttribute { public: - WriteThermostatAcCapacityFormat() - : WriteAttribute("ac-capacity-format") + WriteThermostatACCapacityformat() + : WriteAttribute("accapacityformat") { - AddArgument("attr-name", "ac-capacity-format"); + AddArgument("attr-name", "accapacityformat"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcCapacityFormat() {} + ~WriteThermostatACCapacityformat() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84569,11 +85174,11 @@ class WriteThermostatAcCapacityFormat : public WriteAttribute { params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; - [cluster writeAttributeAcCapacityFormatWithValue:value + [cluster writeAttributeACCapacityformatWithValue:value params:params completionHandler:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("Thermostat AcCapacityFormat write Error", error); + LogNSError("Thermostat ACCapacityformat write Error", error); } SetCommandExitStatus(error); }]; @@ -84584,14 +85189,14 @@ class WriteThermostatAcCapacityFormat : public WriteAttribute { uint8_t mValue; }; -class SubscribeAttributeThermostatAcCapacityFormat : public SubscribeAttribute { +class SubscribeAttributeThermostatACCapacityformat : public SubscribeAttribute { public: - SubscribeAttributeThermostatAcCapacityFormat() - : SubscribeAttribute("ac-capacity-format") + SubscribeAttributeThermostatACCapacityformat() + : SubscribeAttribute("accapacityformat") { } - ~SubscribeAttributeThermostatAcCapacityFormat() {} + ~SubscribeAttributeThermostatACCapacityformat() {} CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { @@ -84602,12 +85207,12 @@ class SubscribeAttributeThermostatAcCapacityFormat : public SubscribeAttribute { params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributeAcCapacityFormatWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + [cluster subscribeAttributeACCapacityformatWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:nullptr reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"Thermostat.AcCapacityFormat response %@", [value description]); + NSLog(@"Thermostat.ACCapacityformat response %@", [value description]); if (error || !mWait) { SetCommandExitStatus(error); } @@ -99320,13 +99925,13 @@ void registerClusterThermostat(Commands & commands) make_unique(), // make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // @@ -99393,29 +99998,46 @@ void registerClusterThermostat(Commands & commands) make_unique(), // make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // diff --git a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h b/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h index 195b1c60afc6b1..1b5163dde509a5 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h @@ -51409,7 +51409,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("occupied cooling setpoint", actualValue, 2600)); + VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2600)); } VerifyOrReturn(CheckConstraintType("occupiedCoolingSetpoint", "", "int16")); @@ -51471,7 +51471,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("occupied cooling setpoint", actualValue, 2000)); + VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2000)); } NextTest(); @@ -51548,7 +51548,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("occupied heating setpoint", actualValue, 2000)); + VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 2000)); } VerifyOrReturn(CheckConstraintType("occupiedHeatingSetpoint", "", "int16")); @@ -51600,7 +51600,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("occupied heating setpoint", actualValue, 2100)); + VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 2100)); } NextTest(); @@ -51667,7 +51667,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("min heat setpoint limit", actualValue, 700)); + VerifyOrReturn(CheckValue("MinHeatSetpointLimit", actualValue, 700)); } VerifyOrReturn(CheckConstraintType("minHeatSetpointLimit", "", "int16")); @@ -51719,7 +51719,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("min heat setpoint limit", actualValue, 2000)); + VerifyOrReturn(CheckValue("MinHeatSetpointLimit", actualValue, 2000)); } NextTest(); @@ -51786,7 +51786,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("max heat setpoint limit", actualValue, 3000)); + VerifyOrReturn(CheckValue("MaxHeatSetpointLimit", actualValue, 3000)); } VerifyOrReturn(CheckConstraintType("maxHeatSetpointLimit", "", "int16")); @@ -51838,7 +51838,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("max heat setpoint limit", actualValue, 2000)); + VerifyOrReturn(CheckValue("MaxHeatSetpointLimit", actualValue, 2000)); } NextTest(); @@ -51910,7 +51910,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("min cool setpoint limit", actualValue, 1600)); + VerifyOrReturn(CheckValue("MinCoolSetpointLimit", actualValue, 1600)); } VerifyOrReturn(CheckConstraintType("minCoolSetpointLimit", "", "int16")); @@ -51972,7 +51972,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("min cool setpoint limit", actualValue, 2000)); + VerifyOrReturn(CheckValue("MinCoolSetpointLimit", actualValue, 2000)); } NextTest(); @@ -52054,7 +52054,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("max cool setpoint limit", actualValue, 3200)); + VerifyOrReturn(CheckValue("MaxCoolSetpointLimit", actualValue, 3200)); } VerifyOrReturn(CheckConstraintType("maxCoolSetpointLimit", "", "int16")); @@ -52116,7 +52116,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("max cool setpoint limit", actualValue, 2000)); + VerifyOrReturn(CheckValue("MaxCoolSetpointLimit", actualValue, 2000)); } NextTest(); @@ -52389,7 +52389,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("control sequence of operation", actualValue, 4)); + VerifyOrReturn(CheckValue("ControlSequenceOfOperation", actualValue, 4)); } VerifyOrReturn(CheckConstraintType("controlSequenceOfOperation", "", "enum8")); @@ -52442,7 +52442,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("control sequence of operation", actualValue, 2)); + VerifyOrReturn(CheckValue("ControlSequenceOfOperation", actualValue, 2)); } NextTest(); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 414871832b7e08..106a32b6c185c9 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -9864,9 +9864,9 @@ class WritePumpConfigurationAndControlControlMode : public WriteAttribute | * AbsMaxHeatSetpointLimit | 0x0004 | | * AbsMinCoolSetpointLimit | 0x0005 | | * AbsMaxCoolSetpointLimit | 0x0006 | -| * PiCoolingDemand | 0x0007 | -| * PiHeatingDemand | 0x0008 | -| * HvacSystemTypeConfiguration | 0x0009 | +| * PICoolingDemand | 0x0007 | +| * PIHeatingDemand | 0x0008 | +| * HVACSystemTypeConfiguration | 0x0009 | | * LocalTemperatureCalibration | 0x0010 | | * OccupiedCoolingSetpoint | 0x0011 | | * OccupiedHeatingSetpoint | 0x0012 | @@ -9892,14 +9892,21 @@ class WritePumpConfigurationAndControlControlMode : public WriteAttribute | * SetpointChangeSource | 0x0030 | | * SetpointChangeAmount | 0x0031 | | * SetpointChangeSourceTimestamp | 0x0032 | -| * AcType | 0x0040 | -| * AcCapacity | 0x0041 | -| * AcRefrigerantType | 0x0042 | -| * AcCompressorType | 0x0043 | -| * AcErrorCode | 0x0044 | -| * AcLouverPosition | 0x0045 | -| * AcCoilTemperature | 0x0046 | -| * AcCapacityFormat | 0x0047 | +| * OccupiedSetback | 0x0034 | +| * OccupiedSetbackMin | 0x0035 | +| * OccupiedSetbackMax | 0x0036 | +| * UnoccupiedSetback | 0x0037 | +| * UnoccupiedSetbackMin | 0x0038 | +| * UnoccupiedSetbackMax | 0x0039 | +| * EmergencyHeatDelta | 0x003A | +| * ACType | 0x0040 | +| * ACCapacity | 0x0041 | +| * ACRefrigerantType | 0x0042 | +| * ACCompressorType | 0x0043 | +| * ACErrorCode | 0x0044 | +| * ACLouverPosition | 0x0045 | +| * ACCoilTemperature | 0x0046 | +| * ACCapacityformat | 0x0047 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * AttributeList | 0xFFFB | @@ -9948,12 +9955,12 @@ class ThermostatSetWeeklySchedule : public ClusterCommand { public: ThermostatSetWeeklySchedule(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("set-weekly-schedule", credsIssuerConfig), mComplex_Payload(&mRequest.payload) + ClusterCommand("set-weekly-schedule", credsIssuerConfig), mComplex_Transitions(&mRequest.transitions) { AddArgument("NumberOfTransitionsForSequence", 0, UINT8_MAX, &mRequest.numberOfTransitionsForSequence); AddArgument("DayOfWeekForSequence", 0, UINT8_MAX, &mRequest.dayOfWeekForSequence); AddArgument("ModeForSequence", 0, UINT8_MAX, &mRequest.modeForSequence); - AddArgument("Payload", &mComplex_Payload); + AddArgument("Transitions", &mComplex_Transitions); ClusterCommand::AddArguments(); } @@ -9973,7 +9980,9 @@ class ThermostatSetWeeklySchedule : public ClusterCommand private: chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::Type mRequest; - TypedComplexArgument> mComplex_Payload; + TypedComplexArgument< + chip::app::DataModel::List> + mComplex_Transitions; }; /* @@ -10068,18 +10077,18 @@ class ThermostatGetRelayStatusLog : public ClusterCommand chip::app::Clusters::Thermostat::Commands::GetRelayStatusLog::Type mRequest; }; -class WriteThermostatHvacSystemTypeConfiguration : public WriteAttribute +class WriteThermostatHVACSystemTypeConfiguration : public WriteAttribute { public: - WriteThermostatHvacSystemTypeConfiguration(CredentialIssuerCommands * credsIssuerConfig) : - WriteAttribute("HvacSystemTypeConfiguration", credsIssuerConfig) + WriteThermostatHVACSystemTypeConfiguration(CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute("HVACSystemTypeConfiguration", credsIssuerConfig) { - AddArgument("attr-name", "hvac-system-type-configuration"); + AddArgument("attr-name", "hvacsystem-type-configuration"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatHvacSystemTypeConfiguration() {} + ~WriteThermostatHVACSystemTypeConfiguration() {} CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override { @@ -10495,7 +10504,7 @@ class WriteThermostatTemperatureSetpointHoldDuration : public WriteAttribute } private: - uint16_t mValue; + chip::app::DataModel::Nullable mValue; }; class WriteThermostatThermostatProgrammingOperationMode : public WriteAttribute @@ -10525,17 +10534,98 @@ class WriteThermostatThermostatProgrammingOperationMode : public WriteAttribute uint8_t mValue; }; -class WriteThermostatAcType : public WriteAttribute +class WriteThermostatOccupiedSetback : public WriteAttribute +{ +public: + WriteThermostatOccupiedSetback(CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute("OccupiedSetback", credsIssuerConfig) + { + AddArgument("attr-name", "occupied-setback"); + AddArgument("attr-value", 0, UINT8_MAX, &mValue); + WriteAttribute::AddArguments(); + } + + ~WriteThermostatOccupiedSetback() {} + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000201, 0x00000034, mValue); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000201, 0x00000034, mValue); + } + +private: + chip::app::DataModel::Nullable mValue; +}; + +class WriteThermostatUnoccupiedSetback : public WriteAttribute +{ +public: + WriteThermostatUnoccupiedSetback(CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute("UnoccupiedSetback", credsIssuerConfig) + { + AddArgument("attr-name", "unoccupied-setback"); + AddArgument("attr-value", 0, UINT8_MAX, &mValue); + WriteAttribute::AddArguments(); + } + + ~WriteThermostatUnoccupiedSetback() {} + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000201, 0x00000037, mValue); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000201, 0x00000037, mValue); + } + +private: + chip::app::DataModel::Nullable mValue; +}; + +class WriteThermostatEmergencyHeatDelta : public WriteAttribute +{ +public: + WriteThermostatEmergencyHeatDelta(CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute("EmergencyHeatDelta", credsIssuerConfig) + { + AddArgument("attr-name", "emergency-heat-delta"); + AddArgument("attr-value", 0, UINT8_MAX, &mValue); + WriteAttribute::AddArguments(); + } + + ~WriteThermostatEmergencyHeatDelta() {} + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x00000201, 0x0000003A, mValue); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x00000201, 0x0000003A, mValue); + } + +private: + uint8_t mValue; +}; + +class WriteThermostatACType : public WriteAttribute { public: - WriteThermostatAcType(CredentialIssuerCommands * credsIssuerConfig) : WriteAttribute("AcType", credsIssuerConfig) + WriteThermostatACType(CredentialIssuerCommands * credsIssuerConfig) : WriteAttribute("ACType", credsIssuerConfig) { - AddArgument("attr-name", "ac-type"); + AddArgument("attr-name", "actype"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcType() {} + ~WriteThermostatACType() {} CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override { @@ -10551,17 +10641,17 @@ class WriteThermostatAcType : public WriteAttribute uint8_t mValue; }; -class WriteThermostatAcCapacity : public WriteAttribute +class WriteThermostatACCapacity : public WriteAttribute { public: - WriteThermostatAcCapacity(CredentialIssuerCommands * credsIssuerConfig) : WriteAttribute("AcCapacity", credsIssuerConfig) + WriteThermostatACCapacity(CredentialIssuerCommands * credsIssuerConfig) : WriteAttribute("ACCapacity", credsIssuerConfig) { - AddArgument("attr-name", "ac-capacity"); + AddArgument("attr-name", "accapacity"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcCapacity() {} + ~WriteThermostatACCapacity() {} CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override { @@ -10577,18 +10667,18 @@ class WriteThermostatAcCapacity : public WriteAttribute uint16_t mValue; }; -class WriteThermostatAcRefrigerantType : public WriteAttribute +class WriteThermostatACRefrigerantType : public WriteAttribute { public: - WriteThermostatAcRefrigerantType(CredentialIssuerCommands * credsIssuerConfig) : - WriteAttribute("AcRefrigerantType", credsIssuerConfig) + WriteThermostatACRefrigerantType(CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute("ACRefrigerantType", credsIssuerConfig) { - AddArgument("attr-name", "ac-refrigerant-type"); + AddArgument("attr-name", "acrefrigerant-type"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcRefrigerantType() {} + ~WriteThermostatACRefrigerantType() {} CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override { @@ -10604,18 +10694,18 @@ class WriteThermostatAcRefrigerantType : public WriteAttribute uint8_t mValue; }; -class WriteThermostatAcCompressorType : public WriteAttribute +class WriteThermostatACCompressorType : public WriteAttribute { public: - WriteThermostatAcCompressorType(CredentialIssuerCommands * credsIssuerConfig) : - WriteAttribute("AcCompressorType", credsIssuerConfig) + WriteThermostatACCompressorType(CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute("ACCompressorType", credsIssuerConfig) { - AddArgument("attr-name", "ac-compressor-type"); + AddArgument("attr-name", "accompressor-type"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcCompressorType() {} + ~WriteThermostatACCompressorType() {} CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override { @@ -10631,17 +10721,17 @@ class WriteThermostatAcCompressorType : public WriteAttribute uint8_t mValue; }; -class WriteThermostatAcErrorCode : public WriteAttribute +class WriteThermostatACErrorCode : public WriteAttribute { public: - WriteThermostatAcErrorCode(CredentialIssuerCommands * credsIssuerConfig) : WriteAttribute("AcErrorCode", credsIssuerConfig) + WriteThermostatACErrorCode(CredentialIssuerCommands * credsIssuerConfig) : WriteAttribute("ACErrorCode", credsIssuerConfig) { - AddArgument("attr-name", "ac-error-code"); + AddArgument("attr-name", "acerror-code"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcErrorCode() {} + ~WriteThermostatACErrorCode() {} CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override { @@ -10657,18 +10747,18 @@ class WriteThermostatAcErrorCode : public WriteAttribute uint32_t mValue; }; -class WriteThermostatAcLouverPosition : public WriteAttribute +class WriteThermostatACLouverPosition : public WriteAttribute { public: - WriteThermostatAcLouverPosition(CredentialIssuerCommands * credsIssuerConfig) : - WriteAttribute("AcLouverPosition", credsIssuerConfig) + WriteThermostatACLouverPosition(CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute("ACLouverPosition", credsIssuerConfig) { - AddArgument("attr-name", "ac-louver-position"); + AddArgument("attr-name", "aclouver-position"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcLouverPosition() {} + ~WriteThermostatACLouverPosition() {} CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override { @@ -10684,18 +10774,18 @@ class WriteThermostatAcLouverPosition : public WriteAttribute uint8_t mValue; }; -class WriteThermostatAcCapacityFormat : public WriteAttribute +class WriteThermostatACCapacityformat : public WriteAttribute { public: - WriteThermostatAcCapacityFormat(CredentialIssuerCommands * credsIssuerConfig) : - WriteAttribute("AcCapacityFormat", credsIssuerConfig) + WriteThermostatACCapacityformat(CredentialIssuerCommands * credsIssuerConfig) : + WriteAttribute("ACCapacityformat", credsIssuerConfig) { - AddArgument("attr-name", "ac-capacity-format"); + AddArgument("attr-name", "accapacityformat"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); WriteAttribute::AddArguments(); } - ~WriteThermostatAcCapacityFormat() {} + ~WriteThermostatACCapacityformat() {} CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override { @@ -22599,10 +22689,10 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c make_unique(Id, "abs-min-cool-setpoint-limit", Attributes::AbsMinCoolSetpointLimit::Id, credsIssuerConfig), // make_unique(Id, "abs-max-cool-setpoint-limit", Attributes::AbsMaxCoolSetpointLimit::Id, - credsIssuerConfig), // - make_unique(Id, "pi-cooling-demand", Attributes::PiCoolingDemand::Id, credsIssuerConfig), // - make_unique(Id, "pi-heating-demand", Attributes::PiHeatingDemand::Id, credsIssuerConfig), // - make_unique(Id, "hvac-system-type-configuration", Attributes::HvacSystemTypeConfiguration::Id, + credsIssuerConfig), // + make_unique(Id, "picooling-demand", Attributes::PICoolingDemand::Id, credsIssuerConfig), // + make_unique(Id, "piheating-demand", Attributes::PIHeatingDemand::Id, credsIssuerConfig), // + make_unique(Id, "hvacsystem-type-configuration", Attributes::HVACSystemTypeConfiguration::Id, credsIssuerConfig), // make_unique(Id, "local-temperature-calibration", Attributes::LocalTemperatureCalibration::Id, credsIssuerConfig), // @@ -22638,21 +22728,28 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c make_unique(Id, "setpoint-change-amount", Attributes::SetpointChangeAmount::Id, credsIssuerConfig), // make_unique(Id, "setpoint-change-source-timestamp", Attributes::SetpointChangeSourceTimestamp::Id, credsIssuerConfig), // - make_unique(Id, "ac-type", Attributes::AcType::Id, credsIssuerConfig), // - make_unique(Id, "ac-capacity", Attributes::AcCapacity::Id, credsIssuerConfig), // - make_unique(Id, "ac-refrigerant-type", Attributes::AcRefrigerantType::Id, credsIssuerConfig), // - make_unique(Id, "ac-compressor-type", Attributes::AcCompressorType::Id, credsIssuerConfig), // - make_unique(Id, "ac-error-code", Attributes::AcErrorCode::Id, credsIssuerConfig), // - make_unique(Id, "ac-louver-position", Attributes::AcLouverPosition::Id, credsIssuerConfig), // - make_unique(Id, "ac-coil-temperature", Attributes::AcCoilTemperature::Id, credsIssuerConfig), // - make_unique(Id, "ac-capacity-format", Attributes::AcCapacityFormat::Id, credsIssuerConfig), // + make_unique(Id, "occupied-setback", Attributes::OccupiedSetback::Id, credsIssuerConfig), // + make_unique(Id, "occupied-setback-min", Attributes::OccupiedSetbackMin::Id, credsIssuerConfig), // + make_unique(Id, "occupied-setback-max", Attributes::OccupiedSetbackMax::Id, credsIssuerConfig), // + make_unique(Id, "unoccupied-setback", Attributes::UnoccupiedSetback::Id, credsIssuerConfig), // + make_unique(Id, "unoccupied-setback-min", Attributes::UnoccupiedSetbackMin::Id, credsIssuerConfig), // + make_unique(Id, "unoccupied-setback-max", Attributes::UnoccupiedSetbackMax::Id, credsIssuerConfig), // + make_unique(Id, "emergency-heat-delta", Attributes::EmergencyHeatDelta::Id, credsIssuerConfig), // + make_unique(Id, "actype", Attributes::ACType::Id, credsIssuerConfig), // + make_unique(Id, "accapacity", Attributes::ACCapacity::Id, credsIssuerConfig), // + make_unique(Id, "acrefrigerant-type", Attributes::ACRefrigerantType::Id, credsIssuerConfig), // + make_unique(Id, "accompressor-type", Attributes::ACCompressorType::Id, credsIssuerConfig), // + make_unique(Id, "acerror-code", Attributes::ACErrorCode::Id, credsIssuerConfig), // + make_unique(Id, "aclouver-position", Attributes::ACLouverPosition::Id, credsIssuerConfig), // + make_unique(Id, "accoil-temperature", Attributes::ACCoilTemperature::Id, credsIssuerConfig), // + make_unique(Id, "accapacityformat", Attributes::ACCapacityformat::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // make_unique(credsIssuerConfig), // make_unique(credsIssuerConfig), // make_unique(credsIssuerConfig), // @@ -22669,13 +22766,16 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c make_unique(credsIssuerConfig), // make_unique(credsIssuerConfig), // make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "local-temperature", Attributes::LocalTemperature::Id, credsIssuerConfig), // make_unique(Id, "outdoor-temperature", Attributes::OutdoorTemperature::Id, credsIssuerConfig), // @@ -22687,10 +22787,10 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c make_unique(Id, "abs-min-cool-setpoint-limit", Attributes::AbsMinCoolSetpointLimit::Id, credsIssuerConfig), // make_unique(Id, "abs-max-cool-setpoint-limit", Attributes::AbsMaxCoolSetpointLimit::Id, - credsIssuerConfig), // - make_unique(Id, "pi-cooling-demand", Attributes::PiCoolingDemand::Id, credsIssuerConfig), // - make_unique(Id, "pi-heating-demand", Attributes::PiHeatingDemand::Id, credsIssuerConfig), // - make_unique(Id, "hvac-system-type-configuration", Attributes::HvacSystemTypeConfiguration::Id, + credsIssuerConfig), // + make_unique(Id, "picooling-demand", Attributes::PICoolingDemand::Id, credsIssuerConfig), // + make_unique(Id, "piheating-demand", Attributes::PIHeatingDemand::Id, credsIssuerConfig), // + make_unique(Id, "hvacsystem-type-configuration", Attributes::HVACSystemTypeConfiguration::Id, credsIssuerConfig), // make_unique(Id, "local-temperature-calibration", Attributes::LocalTemperatureCalibration::Id, credsIssuerConfig), // @@ -22730,14 +22830,21 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c make_unique(Id, "setpoint-change-amount", Attributes::SetpointChangeAmount::Id, credsIssuerConfig), // make_unique(Id, "setpoint-change-source-timestamp", Attributes::SetpointChangeSourceTimestamp::Id, credsIssuerConfig), // - make_unique(Id, "ac-type", Attributes::AcType::Id, credsIssuerConfig), // - make_unique(Id, "ac-capacity", Attributes::AcCapacity::Id, credsIssuerConfig), // - make_unique(Id, "ac-refrigerant-type", Attributes::AcRefrigerantType::Id, credsIssuerConfig), // - make_unique(Id, "ac-compressor-type", Attributes::AcCompressorType::Id, credsIssuerConfig), // - make_unique(Id, "ac-error-code", Attributes::AcErrorCode::Id, credsIssuerConfig), // - make_unique(Id, "ac-louver-position", Attributes::AcLouverPosition::Id, credsIssuerConfig), // - make_unique(Id, "ac-coil-temperature", Attributes::AcCoilTemperature::Id, credsIssuerConfig), // - make_unique(Id, "ac-capacity-format", Attributes::AcCapacityFormat::Id, credsIssuerConfig), // + make_unique(Id, "occupied-setback", Attributes::OccupiedSetback::Id, credsIssuerConfig), // + make_unique(Id, "occupied-setback-min", Attributes::OccupiedSetbackMin::Id, credsIssuerConfig), // + make_unique(Id, "occupied-setback-max", Attributes::OccupiedSetbackMax::Id, credsIssuerConfig), // + make_unique(Id, "unoccupied-setback", Attributes::UnoccupiedSetback::Id, credsIssuerConfig), // + make_unique(Id, "unoccupied-setback-min", Attributes::UnoccupiedSetbackMin::Id, credsIssuerConfig), // + make_unique(Id, "unoccupied-setback-max", Attributes::UnoccupiedSetbackMax::Id, credsIssuerConfig), // + make_unique(Id, "emergency-heat-delta", Attributes::EmergencyHeatDelta::Id, credsIssuerConfig), // + make_unique(Id, "actype", Attributes::ACType::Id, credsIssuerConfig), // + make_unique(Id, "accapacity", Attributes::ACCapacity::Id, credsIssuerConfig), // + make_unique(Id, "acrefrigerant-type", Attributes::ACRefrigerantType::Id, credsIssuerConfig), // + make_unique(Id, "accompressor-type", Attributes::ACCompressorType::Id, credsIssuerConfig), // + make_unique(Id, "acerror-code", Attributes::ACErrorCode::Id, credsIssuerConfig), // + make_unique(Id, "aclouver-position", Attributes::ACLouverPosition::Id, credsIssuerConfig), // + make_unique(Id, "accoil-temperature", Attributes::ACCoilTemperature::Id, credsIssuerConfig), // + make_unique(Id, "accapacityformat", Attributes::ACCapacityformat::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index d92f28b83be5ee..b24c809a4a5c3d 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -2082,6 +2082,38 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::TestCluster::Structs:: ComplexArgumentParser::Finalize(request.fabricIndex); ComplexArgumentParser::Finalize(request.operationalCert); } +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::Type & request, + Json::Value & value) +{ + VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); + + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThermostatScheduleTransition.transitionTime", "transitionTime", + value.isMember("transitionTime"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThermostatScheduleTransition.heatSetpoint", "heatSetpoint", + value.isMember("heatSetpoint"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ThermostatScheduleTransition.coolSetpoint", "coolSetpoint", + value.isMember("coolSetpoint"))); + + char labelWithMember[kMaxLabelLength]; + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "transitionTime"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.transitionTime, value["transitionTime"])); + + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "heatSetpoint"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.heatSetpoint, value["heatSetpoint"])); + + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "coolSetpoint"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.coolSetpoint, value["coolSetpoint"])); + + return CHIP_NO_ERROR; +} + +void ComplexArgumentParser::Finalize(chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::Type & request) +{ + ComplexArgumentParser::Finalize(request.transitionTime); + ComplexArgumentParser::Finalize(request.heatSetpoint); + ComplexArgumentParser::Finalize(request.coolSetpoint); +} CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::Type & request, diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index 18e989c65bbb18..643a3a013d1eac 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -239,6 +239,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::TestCluster::St Json::Value & value); static void Finalize(chip::app::Clusters::TestCluster::Structs::TestListStructOctet::Type & request); +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::Type & request, + Json::Value & value); + +static void Finalize(chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::Type & request, Json::Value & value); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index a6d85323586bae..1d9792d1b8a3fa 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -2222,6 +2222,39 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::DecodableType & value) +{ + DataModelLogger::LogString(label, indent, "{"); + { + CHIP_ERROR err = LogValue("TransitionTime", indent + 1, value.transitionTime); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'TransitionTime'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("HeatSetpoint", indent + 1, value.heatSetpoint); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'HeatSetpoint'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("CoolSetpoint", indent + 1, value.coolSetpoint); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CoolSetpoint'"); + return err; + } + } + DataModelLogger::LogString(indent, "}"); + + return CHIP_NO_ERROR; +} CHIP_ERROR DataModelLogger::LogValue( const char * label, size_t indent, const chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::DecodableType & value) @@ -4264,7 +4297,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, DataModelLogger::LogValue("numberOfTransitionsForSequence", indent + 1, value.numberOfTransitionsForSequence)); ReturnErrorOnFailure(DataModelLogger::LogValue("dayOfWeekForSequence", indent + 1, value.dayOfWeekForSequence)); ReturnErrorOnFailure(DataModelLogger::LogValue("modeForSequence", indent + 1, value.modeForSequence)); - ReturnErrorOnFailure(DataModelLogger::LogValue("payload", indent + 1, value.payload)); + ReturnErrorOnFailure(DataModelLogger::LogValue("transitions", indent + 1, value.transitions)); DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } @@ -9015,219 +9048,254 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP switch (path.mAttributeId) { case Thermostat::Attributes::LocalTemperature::Id: { - int16_t value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("local temperature", 1, value); + return DataModelLogger::LogValue("LocalTemperature", 1, value); } case Thermostat::Attributes::OutdoorTemperature::Id: { - int16_t value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("outdoor temperature", 1, value); + return DataModelLogger::LogValue("OutdoorTemperature", 1, value); } case Thermostat::Attributes::Occupancy::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("occupancy", 1, value); + return DataModelLogger::LogValue("Occupancy", 1, value); } case Thermostat::Attributes::AbsMinHeatSetpointLimit::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("abs min heat setpoint limit", 1, value); + return DataModelLogger::LogValue("AbsMinHeatSetpointLimit", 1, value); } case Thermostat::Attributes::AbsMaxHeatSetpointLimit::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("abs max heat setpoint limit", 1, value); + return DataModelLogger::LogValue("AbsMaxHeatSetpointLimit", 1, value); } case Thermostat::Attributes::AbsMinCoolSetpointLimit::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("abs min cool setpoint limit", 1, value); + return DataModelLogger::LogValue("AbsMinCoolSetpointLimit", 1, value); } case Thermostat::Attributes::AbsMaxCoolSetpointLimit::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("abs max cool setpoint limit", 1, value); + return DataModelLogger::LogValue("AbsMaxCoolSetpointLimit", 1, value); } - case Thermostat::Attributes::PiCoolingDemand::Id: { + case Thermostat::Attributes::PICoolingDemand::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("pi cooling demand", 1, value); + return DataModelLogger::LogValue("PICoolingDemand", 1, value); } - case Thermostat::Attributes::PiHeatingDemand::Id: { + case Thermostat::Attributes::PIHeatingDemand::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("pi heating demand", 1, value); + return DataModelLogger::LogValue("PIHeatingDemand", 1, value); } - case Thermostat::Attributes::HvacSystemTypeConfiguration::Id: { + case Thermostat::Attributes::HVACSystemTypeConfiguration::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("HVAC system type configuration", 1, value); + return DataModelLogger::LogValue("HVACSystemTypeConfiguration", 1, value); } case Thermostat::Attributes::LocalTemperatureCalibration::Id: { int8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("local temperature calibration", 1, value); + return DataModelLogger::LogValue("LocalTemperatureCalibration", 1, value); } case Thermostat::Attributes::OccupiedCoolingSetpoint::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("occupied cooling setpoint", 1, value); + return DataModelLogger::LogValue("OccupiedCoolingSetpoint", 1, value); } case Thermostat::Attributes::OccupiedHeatingSetpoint::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("occupied heating setpoint", 1, value); + return DataModelLogger::LogValue("OccupiedHeatingSetpoint", 1, value); } case Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("unoccupied cooling setpoint", 1, value); + return DataModelLogger::LogValue("UnoccupiedCoolingSetpoint", 1, value); } case Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("unoccupied heating setpoint", 1, value); + return DataModelLogger::LogValue("UnoccupiedHeatingSetpoint", 1, value); } case Thermostat::Attributes::MinHeatSetpointLimit::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("min heat setpoint limit", 1, value); + return DataModelLogger::LogValue("MinHeatSetpointLimit", 1, value); } case Thermostat::Attributes::MaxHeatSetpointLimit::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("max heat setpoint limit", 1, value); + return DataModelLogger::LogValue("MaxHeatSetpointLimit", 1, value); } case Thermostat::Attributes::MinCoolSetpointLimit::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("min cool setpoint limit", 1, value); + return DataModelLogger::LogValue("MinCoolSetpointLimit", 1, value); } case Thermostat::Attributes::MaxCoolSetpointLimit::Id: { int16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("max cool setpoint limit", 1, value); + return DataModelLogger::LogValue("MaxCoolSetpointLimit", 1, value); } case Thermostat::Attributes::MinSetpointDeadBand::Id: { int8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("min setpoint dead band", 1, value); + return DataModelLogger::LogValue("MinSetpointDeadBand", 1, value); } case Thermostat::Attributes::RemoteSensing::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("remote sensing", 1, value); + return DataModelLogger::LogValue("RemoteSensing", 1, value); } case Thermostat::Attributes::ControlSequenceOfOperation::Id: { chip::app::Clusters::Thermostat::ThermostatControlSequence value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("control sequence of operation", 1, value); + return DataModelLogger::LogValue("ControlSequenceOfOperation", 1, value); } case Thermostat::Attributes::SystemMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("system mode", 1, value); + return DataModelLogger::LogValue("SystemMode", 1, value); } case Thermostat::Attributes::AlarmMask::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("alarm mask", 1, value); + return DataModelLogger::LogValue("AlarmMask", 1, value); } case Thermostat::Attributes::ThermostatRunningMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("thermostat running mode", 1, value); + return DataModelLogger::LogValue("ThermostatRunningMode", 1, value); } case Thermostat::Attributes::StartOfWeek::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("start of week", 1, value); + return DataModelLogger::LogValue("StartOfWeek", 1, value); } case Thermostat::Attributes::NumberOfWeeklyTransitions::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("number of weekly transitions", 1, value); + return DataModelLogger::LogValue("NumberOfWeeklyTransitions", 1, value); } case Thermostat::Attributes::NumberOfDailyTransitions::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("number of daily transitions", 1, value); + return DataModelLogger::LogValue("NumberOfDailyTransitions", 1, value); } case Thermostat::Attributes::TemperatureSetpointHold::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("temperature setpoint hold", 1, value); + return DataModelLogger::LogValue("TemperatureSetpointHold", 1, value); } case Thermostat::Attributes::TemperatureSetpointHoldDuration::Id: { - uint16_t value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("temperature setpoint hold duration", 1, value); + return DataModelLogger::LogValue("TemperatureSetpointHoldDuration", 1, value); } case Thermostat::Attributes::ThermostatProgrammingOperationMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("thermostat programming operation mode", 1, value); + return DataModelLogger::LogValue("ThermostatProgrammingOperationMode", 1, value); } case Thermostat::Attributes::ThermostatRunningState::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("thermostat running state", 1, value); + return DataModelLogger::LogValue("ThermostatRunningState", 1, value); } case Thermostat::Attributes::SetpointChangeSource::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("setpoint change source", 1, value); + return DataModelLogger::LogValue("SetpointChangeSource", 1, value); } case Thermostat::Attributes::SetpointChangeAmount::Id: { - int16_t value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("setpoint change amount", 1, value); + return DataModelLogger::LogValue("SetpointChangeAmount", 1, value); } case Thermostat::Attributes::SetpointChangeSourceTimestamp::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("setpoint change source timestamp", 1, value); + return DataModelLogger::LogValue("SetpointChangeSourceTimestamp", 1, value); + } + case Thermostat::Attributes::OccupiedSetback::Id: { + chip::app::DataModel::Nullable value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("OccupiedSetback", 1, value); + } + case Thermostat::Attributes::OccupiedSetbackMin::Id: { + chip::app::DataModel::Nullable value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("OccupiedSetbackMin", 1, value); + } + case Thermostat::Attributes::OccupiedSetbackMax::Id: { + chip::app::DataModel::Nullable value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("OccupiedSetbackMax", 1, value); } - case Thermostat::Attributes::AcType::Id: { + case Thermostat::Attributes::UnoccupiedSetback::Id: { + chip::app::DataModel::Nullable value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("UnoccupiedSetback", 1, value); + } + case Thermostat::Attributes::UnoccupiedSetbackMin::Id: { + chip::app::DataModel::Nullable value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("UnoccupiedSetbackMin", 1, value); + } + case Thermostat::Attributes::UnoccupiedSetbackMax::Id: { + chip::app::DataModel::Nullable value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("UnoccupiedSetbackMax", 1, value); + } + case Thermostat::Attributes::EmergencyHeatDelta::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ac type", 1, value); + return DataModelLogger::LogValue("EmergencyHeatDelta", 1, value); } - case Thermostat::Attributes::AcCapacity::Id: { + case Thermostat::Attributes::ACType::Id: { + uint8_t value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("ACType", 1, value); + } + case Thermostat::Attributes::ACCapacity::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ac capacity", 1, value); + return DataModelLogger::LogValue("ACCapacity", 1, value); } - case Thermostat::Attributes::AcRefrigerantType::Id: { + case Thermostat::Attributes::ACRefrigerantType::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ac refrigerant type", 1, value); + return DataModelLogger::LogValue("ACRefrigerantType", 1, value); } - case Thermostat::Attributes::AcCompressorType::Id: { + case Thermostat::Attributes::ACCompressorType::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ac compressor type", 1, value); + return DataModelLogger::LogValue("ACCompressorType", 1, value); } - case Thermostat::Attributes::AcErrorCode::Id: { + case Thermostat::Attributes::ACErrorCode::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ac error code", 1, value); + return DataModelLogger::LogValue("ACErrorCode", 1, value); } - case Thermostat::Attributes::AcLouverPosition::Id: { + case Thermostat::Attributes::ACLouverPosition::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ac louver position", 1, value); + return DataModelLogger::LogValue("ACLouverPosition", 1, value); } - case Thermostat::Attributes::AcCoilTemperature::Id: { - int16_t value; + case Thermostat::Attributes::ACCoilTemperature::Id: { + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ac coil temperature", 1, value); + return DataModelLogger::LogValue("ACCoilTemperature", 1, value); } - case Thermostat::Attributes::AcCapacityFormat::Id: { + case Thermostat::Attributes::ACCapacityformat::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ac capacity format", 1, value); + return DataModelLogger::LogValue("ACCapacityformat", 1, value); } case Thermostat::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index b55a02680e33af..222f7b45276329 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -129,6 +129,8 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::TestCluster::Structs::TestFabricScoped::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType & value); +static CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::Thermostat::Structs::ThermostatScheduleTransition::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::NetworkCommissioning::Structs::ThreadInterfaceScanResult::DecodableType & value); diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index b7bb364d792898..3206749cbdd160 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -30185,7 +30185,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand case 1: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - int16_t value; + chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "", "int16")); } diff --git a/zzz_generated/placeholder/app1/zap-generated/access.h b/zzz_generated/placeholder/app1/zap-generated/access.h index 4bbe080b592b7d..125af6375e7656 100644 --- a/zzz_generated/placeholder/app1/zap-generated/access.h +++ b/zzz_generated/placeholder/app1/zap-generated/access.h @@ -45,13 +45,13 @@ /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ @@ -75,13 +75,13 @@ /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ @@ -105,13 +105,13 @@ /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ @@ -132,13 +132,13 @@ 512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \ 512, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ 512, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ 516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ 516, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ 258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \ @@ -157,13 +157,13 @@ 23, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \ 32, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ 33, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \ - 21, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - 22, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - 23, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - 24, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - 25, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - 27, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - 28, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + 21, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + 22, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + 23, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + 24, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + 25, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + 27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + 28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ 1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ 2, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ 23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \ @@ -182,13 +182,13 @@ kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \ diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index c0920a800a1ce4..b8dd48ba15a2d1 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -68,7 +68,7 @@ } // This is an array of EmberAfAttributeMinMaxValue structures. -#define GENERATED_MIN_MAX_DEFAULT_COUNT 15 +#define GENERATED_MIN_MAX_DEFAULT_COUNT 17 #define GENERATED_MIN_MAX_DEFAULTS \ { \ \ @@ -83,13 +83,15 @@ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x7 }, /* ControlMode */ \ \ /* Endpoint: 0, Cluster: Thermostat (server) */ \ - { (uint16_t) 0x2BC, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* min heat setpoint limit */ \ - { (uint16_t) 0xBB8, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* max heat setpoint limit */ \ - { (uint16_t) 0x640, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* min cool setpoint limit */ \ - { (uint16_t) 0xC80, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* max cool setpoint limit */ \ - { (uint16_t) 0x19, (uint16_t) 0x0, (uint16_t) 0x19 }, /* min setpoint dead band */ \ - { (uint16_t) 0x4, (uint16_t) 0x0, (uint16_t) 0x5 }, /* control sequence of operation */ \ - { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* system mode */ \ + { (uint16_t) 0xA28, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedCoolingSetpoint */ \ + { (uint16_t) 0x7D0, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedHeatingSetpoint */ \ + { (uint16_t) 0x2BC, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MinHeatSetpointLimit */ \ + { (uint16_t) 0xBB8, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MaxHeatSetpointLimit */ \ + { (uint16_t) 0x640, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MinCoolSetpointLimit */ \ + { (uint16_t) 0xC80, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MaxCoolSetpointLimit */ \ + { (uint16_t) 0x19, (uint16_t) 0x0, (uint16_t) 0x19 }, /* MinSetpointDeadBand */ \ + { (uint16_t) 0x4, (uint16_t) 0x0, (uint16_t) 0x5 }, /* ControlSequenceOfOperation */ \ + { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* SystemMode */ \ \ /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* temperature display mode */ \ @@ -415,41 +417,41 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Thermostat (server) */ \ - { 0x00000000, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* local temperature */ \ - { 0x00000003, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x02BC) }, /* abs min heat setpoint limit */ \ - { 0x00000005, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0640) }, /* abs min cool setpoint limit */ \ - { 0x00000006, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0C80) }, /* abs max cool setpoint limit */ \ - { 0x00000011, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_SIMPLE_DEFAULT(0x0A28) }, /* occupied cooling setpoint */ \ - { 0x00000012, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_SIMPLE_DEFAULT(0x07D0) }, /* occupied heating setpoint */ \ + { 0x00000000, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* LocalTemperature */ \ + { 0x00000003, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x02BC) }, /* AbsMinHeatSetpointLimit */ \ + { 0x00000005, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0640) }, /* AbsMinCoolSetpointLimit */ \ + { 0x00000006, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0C80) }, /* AbsMaxCoolSetpointLimit */ \ + { 0x00000011, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_MIN_MAX_DEFAULTS_INDEX(4) }, /* OccupiedCoolingSetpoint */ \ + { 0x00000012, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* OccupiedHeatingSetpoint */ \ { 0x00000015, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(4) }, /* min heat setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(6) }, /* MinHeatSetpointLimit */ \ { 0x00000016, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* max heat setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(7) }, /* MaxHeatSetpointLimit */ \ { 0x00000017, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(6) }, /* min cool setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(8) }, /* MinCoolSetpointLimit */ \ { 0x00000018, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(7) }, /* max cool setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(9) }, /* MaxCoolSetpointLimit */ \ { 0x00000019, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(8) }, /* min setpoint dead band */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(10) }, /* MinSetpointDeadBand */ \ { 0x0000001B, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(9) }, /* control sequence of operation */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(11) }, /* ControlSequenceOfOperation */ \ { 0x0000001C, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(10) }, /* system mode */ \ - { 0x00000020, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* start of week */ \ - { 0x00000021, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(7) }, /* number of weekly transitions */ \ - { 0x00000022, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(4) }, /* number of daily transitions */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(12) }, /* SystemMode */ \ + { 0x00000020, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* StartOfWeek */ \ + { 0x00000021, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(7) }, /* NumberOfWeeklyTransitions */ \ + { 0x00000022, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(4) }, /* NumberOfDailyTransitions */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x000b) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \ { 0x00000000, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(11) }, /* temperature display mode */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(13) }, /* temperature display mode */ \ { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(12) }, /* keypad lockout */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(14) }, /* keypad lockout */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(13) }, /* schedule programming visibility */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(15) }, /* schedule programming visibility */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ @@ -595,7 +597,7 @@ ZAP_SIMPLE_DEFAULT(0x00) }, /* color control options */ \ { 0x0000400D, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* couple color temp to level min-mireds */ \ { 0x00004010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(14) }, /* start up color temperature mireds */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(16) }, /* start up color temperature mireds */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \ } diff --git a/zzz_generated/placeholder/app2/zap-generated/access.h b/zzz_generated/placeholder/app2/zap-generated/access.h index 4bbe080b592b7d..125af6375e7656 100644 --- a/zzz_generated/placeholder/app2/zap-generated/access.h +++ b/zzz_generated/placeholder/app2/zap-generated/access.h @@ -45,13 +45,13 @@ /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ @@ -75,13 +75,13 @@ /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ @@ -105,13 +105,13 @@ /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: view */ \ /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: view */ \ /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: view */ \ /* Cluster: Window Covering, Attribute: Mode, Privilege: view */ \ @@ -132,13 +132,13 @@ 512, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \ 512, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ 512, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ 516, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ 516, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ 258, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \ @@ -157,13 +157,13 @@ 23, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \ 32, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ 33, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \ - 21, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - 22, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - 23, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - 24, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - 25, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - 27, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - 28, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + 21, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + 22, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + 23, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + 24, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + 25, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + 27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + 28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ 1, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ 2, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ 23, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \ @@ -182,13 +182,13 @@ kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: LifetimeEnergyConsumed, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: OperationMode, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Pump Configuration and Control, Attribute: ControlMode, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: keypad lockout, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Thermostat User Interface Configuration, Attribute: schedule programming visibility, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Window Covering, Attribute: Mode, Privilege: manage */ \ diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index c0920a800a1ce4..b8dd48ba15a2d1 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -68,7 +68,7 @@ } // This is an array of EmberAfAttributeMinMaxValue structures. -#define GENERATED_MIN_MAX_DEFAULT_COUNT 15 +#define GENERATED_MIN_MAX_DEFAULT_COUNT 17 #define GENERATED_MIN_MAX_DEFAULTS \ { \ \ @@ -83,13 +83,15 @@ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x7 }, /* ControlMode */ \ \ /* Endpoint: 0, Cluster: Thermostat (server) */ \ - { (uint16_t) 0x2BC, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* min heat setpoint limit */ \ - { (uint16_t) 0xBB8, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* max heat setpoint limit */ \ - { (uint16_t) 0x640, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* min cool setpoint limit */ \ - { (uint16_t) 0xC80, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* max cool setpoint limit */ \ - { (uint16_t) 0x19, (uint16_t) 0x0, (uint16_t) 0x19 }, /* min setpoint dead band */ \ - { (uint16_t) 0x4, (uint16_t) 0x0, (uint16_t) 0x5 }, /* control sequence of operation */ \ - { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* system mode */ \ + { (uint16_t) 0xA28, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedCoolingSetpoint */ \ + { (uint16_t) 0x7D0, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedHeatingSetpoint */ \ + { (uint16_t) 0x2BC, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MinHeatSetpointLimit */ \ + { (uint16_t) 0xBB8, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MaxHeatSetpointLimit */ \ + { (uint16_t) 0x640, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MinCoolSetpointLimit */ \ + { (uint16_t) 0xC80, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MaxCoolSetpointLimit */ \ + { (uint16_t) 0x19, (uint16_t) 0x0, (uint16_t) 0x19 }, /* MinSetpointDeadBand */ \ + { (uint16_t) 0x4, (uint16_t) 0x0, (uint16_t) 0x5 }, /* ControlSequenceOfOperation */ \ + { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* SystemMode */ \ \ /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* temperature display mode */ \ @@ -415,41 +417,41 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Thermostat (server) */ \ - { 0x00000000, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* local temperature */ \ - { 0x00000003, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x02BC) }, /* abs min heat setpoint limit */ \ - { 0x00000005, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0640) }, /* abs min cool setpoint limit */ \ - { 0x00000006, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0C80) }, /* abs max cool setpoint limit */ \ - { 0x00000011, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_SIMPLE_DEFAULT(0x0A28) }, /* occupied cooling setpoint */ \ - { 0x00000012, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_SIMPLE_DEFAULT(0x07D0) }, /* occupied heating setpoint */ \ + { 0x00000000, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* LocalTemperature */ \ + { 0x00000003, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x02BC) }, /* AbsMinHeatSetpointLimit */ \ + { 0x00000005, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0640) }, /* AbsMinCoolSetpointLimit */ \ + { 0x00000006, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0C80) }, /* AbsMaxCoolSetpointLimit */ \ + { 0x00000011, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_MIN_MAX_DEFAULTS_INDEX(4) }, /* OccupiedCoolingSetpoint */ \ + { 0x00000012, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* OccupiedHeatingSetpoint */ \ { 0x00000015, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(4) }, /* min heat setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(6) }, /* MinHeatSetpointLimit */ \ { 0x00000016, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* max heat setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(7) }, /* MaxHeatSetpointLimit */ \ { 0x00000017, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(6) }, /* min cool setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(8) }, /* MinCoolSetpointLimit */ \ { 0x00000018, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(7) }, /* max cool setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(9) }, /* MaxCoolSetpointLimit */ \ { 0x00000019, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(8) }, /* min setpoint dead band */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(10) }, /* MinSetpointDeadBand */ \ { 0x0000001B, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(9) }, /* control sequence of operation */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(11) }, /* ControlSequenceOfOperation */ \ { 0x0000001C, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(10) }, /* system mode */ \ - { 0x00000020, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* start of week */ \ - { 0x00000021, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(7) }, /* number of weekly transitions */ \ - { 0x00000022, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(4) }, /* number of daily transitions */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(12) }, /* SystemMode */ \ + { 0x00000020, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* StartOfWeek */ \ + { 0x00000021, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(7) }, /* NumberOfWeeklyTransitions */ \ + { 0x00000022, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(4) }, /* NumberOfDailyTransitions */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x000b) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Thermostat User Interface Configuration (server) */ \ { 0x00000000, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(11) }, /* temperature display mode */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(13) }, /* temperature display mode */ \ { 0x00000001, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(12) }, /* keypad lockout */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(14) }, /* keypad lockout */ \ { 0x00000002, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(13) }, /* schedule programming visibility */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(15) }, /* schedule programming visibility */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ @@ -595,7 +597,7 @@ ZAP_SIMPLE_DEFAULT(0x00) }, /* color control options */ \ { 0x0000400D, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* couple color temp to level min-mireds */ \ { 0x00004010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(14) }, /* start up color temperature mireds */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(16) }, /* start up color temperature mireds */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \ } diff --git a/zzz_generated/thermostat/zap-generated/access.h b/zzz_generated/thermostat/zap-generated/access.h index 88a66d3f86c7c3..5f0fc44c5755fd 100644 --- a/zzz_generated/thermostat/zap-generated/access.h +++ b/zzz_generated/thermostat/zap-generated/access.h @@ -46,13 +46,13 @@ 49, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \ 62, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: User Label, Attribute: label list, Privilege: view */ \ } @@ -75,13 +75,13 @@ 6, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \ 7, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \ 0, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: User Label, Attribute: label list, Privilege: view */ \ } @@ -104,13 +104,13 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkID, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ - /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: view */ \ - /* Cluster: Thermostat, Attribute: system mode, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: view */ \ + /* Cluster: Thermostat, Attribute: SystemMode, Privilege: view */ \ /* Cluster: User Label, Attribute: label list, Privilege: view */ \ } @@ -126,13 +126,13 @@ 48, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \ 63, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \ - 513, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - 513, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + 513, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ 65, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \ } @@ -146,13 +146,13 @@ 0, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \ 0, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \ 4, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \ - 21, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - 22, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - 23, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - 24, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - 25, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - 27, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - 28, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + 21, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + 22, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + 23, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + 24, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + 25, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + 27, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + 28, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ 0, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \ } @@ -166,13 +166,13 @@ kMatterAccessPrivilegeAdminister, /* Cluster: General Commissioning, Attribute: Breadcrumb, Privilege: administer */ \ kMatterAccessPrivilegeManage, /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Attribute: InterfaceEnabled, Privilege: administer */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min heat setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: max heat setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min cool setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: max cool setpoint limit, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: min setpoint dead band, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: control sequence of operation, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: system mode, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinHeatSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MaxHeatSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinCoolSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MaxCoolSetpointLimit, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: MinSetpointDeadBand, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: ControlSequenceOfOperation, Privilege: manage */ \ + kMatterAccessPrivilegeManage, /* Cluster: Thermostat, Attribute: SystemMode, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: User Label, Attribute: label list, Privilege: manage */ \ } diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 165845aea1f18f..92130f623f1f50 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -118,7 +118,7 @@ } // This is an array of EmberAfAttributeMinMaxValue structures. -#define GENERATED_MIN_MAX_DEFAULT_COUNT 8 +#define GENERATED_MIN_MAX_DEFAULT_COUNT 10 #define GENERATED_MIN_MAX_DEFAULTS \ { \ \ @@ -126,15 +126,17 @@ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* HourFormat */ \ \ /* Endpoint: 1, Cluster: Thermostat (server) */ \ - { (uint16_t) 0x2BC, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* min heat setpoint limit */ \ - { (uint16_t) 0xBB8, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* max heat setpoint limit */ \ - { (uint16_t) 0x640, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* min cool setpoint limit */ \ - { (uint16_t) 0xC80, (uint16_t) 0x954D, (uint16_t) 0x7FFF }, /* max cool setpoint limit */ \ - { (uint16_t) 0x19, (uint16_t) 0x0, (uint16_t) 0x19 }, /* min setpoint dead band */ \ - { (uint16_t) 0x4, (uint16_t) 0x0, (uint16_t) 0x5 }, /* control sequence of operation */ \ + { (uint16_t) 0xA28, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedCoolingSetpoint */ \ + { (uint16_t) 0x7D0, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedHeatingSetpoint */ \ + { (uint16_t) 0x2BC, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MinHeatSetpointLimit */ \ + { (uint16_t) 0xBB8, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MaxHeatSetpointLimit */ \ + { (uint16_t) 0x640, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MinCoolSetpointLimit */ \ + { (uint16_t) 0xC80, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MaxCoolSetpointLimit */ \ + { (uint16_t) 0x19, (uint16_t) 0x0, (uint16_t) 0x19 }, /* MinSetpointDeadBand */ \ + { (uint16_t) 0x4, (uint16_t) 0x0, (uint16_t) 0x5 }, /* ControlSequenceOfOperation */ \ { \ (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 \ - } /* system mode */ \ + } /* SystemMode */ \ } #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask @@ -496,32 +498,32 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Thermostat (server) */ \ - { 0x00000000, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* local temperature */ \ - { 0x00000003, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(700) }, /* abs min heat setpoint limit */ \ - { 0x00000004, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(3000) }, /* abs max heat setpoint limit */ \ - { 0x00000005, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(1600) }, /* abs min cool setpoint limit */ \ - { 0x00000006, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(3200) }, /* abs max cool setpoint limit */ \ - { 0x00000011, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_SIMPLE_DEFAULT(0x0A28) }, /* occupied cooling setpoint */ \ - { 0x00000012, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_SIMPLE_DEFAULT(0x07D0) }, /* occupied heating setpoint */ \ + { 0x00000000, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* LocalTemperature */ \ + { 0x00000003, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(700) }, /* AbsMinHeatSetpointLimit */ \ + { 0x00000004, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(3000) }, /* AbsMaxHeatSetpointLimit */ \ + { 0x00000005, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(1600) }, /* AbsMinCoolSetpointLimit */ \ + { 0x00000006, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(3200) }, /* AbsMaxCoolSetpointLimit */ \ + { 0x00000011, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_MIN_MAX_DEFAULTS_INDEX(1) }, /* OccupiedCoolingSetpoint */ \ + { 0x00000012, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_MIN_MAX_DEFAULTS_INDEX(2) }, /* OccupiedHeatingSetpoint */ \ { 0x00000015, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(1) }, /* min heat setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(3) }, /* MinHeatSetpointLimit */ \ { 0x00000016, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(2) }, /* max heat setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(4) }, /* MaxHeatSetpointLimit */ \ { 0x00000017, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(3) }, /* min cool setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* MinCoolSetpointLimit */ \ { 0x00000018, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(4) }, /* max cool setpoint limit */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(6) }, /* MaxCoolSetpointLimit */ \ { 0x00000019, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* min setpoint dead band */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(7) }, /* MinSetpointDeadBand */ \ { 0x0000001B, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(6) }, /* control sequence of operation */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(8) }, /* ControlSequenceOfOperation */ \ { 0x0000001C, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(7) }, /* system mode */ \ - { 0x00000020, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* start of week */ \ - { 0x00000021, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(7) }, /* number of weekly transitions */ \ - { 0x00000022, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(4) }, /* number of daily transitions */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(9) }, /* SystemMode */ \ + { 0x00000020, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* StartOfWeek */ \ + { 0x00000021, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(7) }, /* NumberOfWeeklyTransitions */ \ + { 0x00000022, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(4) }, /* NumberOfDailyTransitions */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x000b) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(5) }, /* ClusterRevision */ \ }