Set Thermostat cluster revision as external and implement Read handler (project-chip#41223)

jmartinez-silabs · andy31415 · web-flow · commit 0ac25c640825 · 2025-10-02T21:36:48.000Z
* Set Thermostat ClusterRevision to external. Implement the read handler and use the generated MetaData Revision constant

* run zap_regen_all

* Update src/app/clusters/thermostat-server/thermostat-server.cpp

Co-authored-by: Andrei Litvin &lt;andy314@gmail.com&gt;

---------

Co-authored-by: Andrei Litvin &lt;andy314@gmail.com&gt;
diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
@@ -3472,7 +3472,7 @@ endpoint 5 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 6;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
   }
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
@@ -8743,7 +8743,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x0123;
-    ram      attribute clusterRevision default = 7;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
     handle command SetActiveScheduleRequest;
diff --git a/examples/all-clusters-app/realtek/data_model/all-clusters-app.matter b/examples/all-clusters-app/realtek/data_model/all-clusters-app.matter
@@ -9090,7 +9090,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x0123;
-    ram      attribute clusterRevision default = 7;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
     handle command SetActiveScheduleRequest;
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -7001,7 +7001,7 @@ endpoint 1 {
     ram      attribute controlSequenceOfOperation default = 0x04;
     ram      attribute systemMode default = 0x01;
     ram      attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 6;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
   }
diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
@@ -3320,7 +3320,7 @@ endpoint 5 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 1;
-    ram      attribute clusterRevision default = 6;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
   }
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
@@ -2361,7 +2361,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 3;
-    ram      attribute clusterRevision default = 7;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
   }
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -2611,7 +2611,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 39;
-    ram      attribute clusterRevision default = 6;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
   }
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -9267,7 +9267,7 @@ endpoint 0 {
     callback attribute ACCoilTemperature;
     callback attribute ACCapacityformat default = 0x00;
     ram      attribute featureMap default = 0x000b;
-    ram      attribute clusterRevision default = 6;
+    callback attribute clusterRevision;
   }
 
   server cluster ThermostatUserInterfaceConfiguration {
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -9230,7 +9230,7 @@ endpoint 0 {
     callback attribute ACCoilTemperature;
     callback attribute ACCapacityformat default = 0x00;
     ram      attribute featureMap default = 0x000b;
-    ram      attribute clusterRevision default = 6;
+    callback attribute clusterRevision;
   }
 
   server cluster ThermostatUserInterfaceConfiguration {
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_br.matter b/examples/thermostat/nxp/zap/thermostat_matter_br.matter
@@ -2709,7 +2709,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x3;
-    ram      attribute clusterRevision default = 9;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
   }
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_eth.matter b/examples/thermostat/nxp/zap/thermostat_matter_eth.matter
@@ -2406,7 +2406,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x3;
-    ram      attribute clusterRevision default = 9;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
   }
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
@@ -2637,7 +2637,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x3;
-    ram      attribute clusterRevision default = 9;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
   }
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
@@ -2499,7 +2499,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x3;
-    ram      attribute clusterRevision default = 9;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
   }
diff --git a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
@@ -3065,7 +3065,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x1A3;
-    ram      attribute clusterRevision default = 9;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
     handle command SetActiveScheduleRequest;
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
@@ -2957,7 +2957,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x123;
-    ram      attribute clusterRevision default = 8;
+    callback attribute clusterRevision;
 
     handle command SetpointRaiseLower;
     handle command AddThermostatSuggestionResponse;
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
@@ -1938,7 +1938,8 @@
         { ZAP_EMPTY_DEFAULT(), 0x00000052, 4, ZAP_TYPE(EPOCH_S),                                                                   \
           ZAP_ATTRIBUTE_MASK(READABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SetpointHoldExpiryTimestamp */                         \
         { ZAP_SIMPLE_DEFAULT(0x0023), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */          \
-        { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(READABLE) },        /* ClusterRevision */     \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */                             \
                                                                                                                                    \
         /* Endpoint: 1, Cluster: Fan Control (server) */                                                                           \
         { ZAP_MIN_MAX_DEFAULTS_INDEX(22), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                          \
@@ -4488,7 +4489,7 @@
       .clusterId = 0x00000201, \
       .attributes = ZAP_ATTRIBUTE_INDEX(590), \
       .attributeCount = 26, \
-      .clusterSize = 72, \
+      .clusterSize = 70, \
       .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
       .functions = chipFuncArrayThermostatServer, \
       .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 233 ), \
@@ -4961,7 +4962,7 @@
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
         { ZAP_CLUSTER_INDEX(0), 28, 219 },                                                                                         \
-        { ZAP_CLUSTER_INDEX(28), 73, 3444 },                                                                                       \
+        { ZAP_CLUSTER_INDEX(28), 73, 3442 },                                                                                       \
         { ZAP_CLUSTER_INDEX(101), 7, 114 },                                                                                        \
         { ZAP_CLUSTER_INDEX(108), 2, 0 },                                                                                          \
     }
@@ -4975,7 +4976,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 #define ATTRIBUTE_SINGLETONS_SIZE (0)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (3777)
+#define ATTRIBUTE_MAX_SIZE (3775)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (4)
diff --git a/src/app/clusters/thermostat-server/thermostat-server.cpp b/src/app/clusters/thermostat-server/thermostat-server.cpp
@@ -29,6 +29,7 @@
 #include <app/ConcreteCommandPath.h>
 #include <app/server/Server.h>
 #include <app/util/endpoint-config-api.h>
+#include <clusters/Thermostat/Metadata.h>
 #include <lib/core/CHIPEncoding.h>
 
 using namespace chip;
@@ -682,6 +683,8 @@ CHIP_ERROR ThermostatAttrAccess::Read(const ConcreteReadAttributePath & aPath, A
         ReturnErrorOnFailure(aEncoder.Encode(delegate->GetThermostatSuggestionNotFollowingReason()));
     }
     break;
+    case ClusterRevision::Id:
+        return aEncoder.Encode(Thermostat::kRevision);
     default: // return CHIP_NO_ERROR and just read from the attribute store in default
         break;
     }
diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -822,7 +822,8 @@
         "Thermostat": [
             "MaxThermostatSuggestions",
             "CurrentThermostatSuggestion",
-            "ThermostatSuggestionNotFollowingReason"
+            "ThermostatSuggestionNotFollowingReason",
+            "ClusterRevision"
         ],
         "Time Format Localization": ["ClusterRevision"],
         "Zone Management": [
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
@@ -821,7 +821,8 @@
         "Thermostat": [
             "MaxThermostatSuggestions",
             "CurrentThermostatSuggestion",
-            "ThermostatSuggestionNotFollowingReason"
+            "ThermostatSuggestionNotFollowingReason",
+            "ClusterRevision"
         ],
         "Time Format Localization": ["ClusterRevision"],
         "Zone Management": [
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
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

Original file line number	Diff line number	Diff line change
`@@ -3472,7 +3472,7 @@ endpoint 5 {`
`3472`	`3472`	`callback attribute acceptedCommandList;`
`3473`	`3473`	`callback attribute attributeList;`
`3474`	`3474`	`ram attribute featureMap default = 1;`
`3475`		`- ram attribute clusterRevision default = 6;`
	`3475`	`+ callback attribute clusterRevision;`
`3476`	`3476`
`3477`	`3477`	`handle command SetpointRaiseLower;`
`3478`	`3478`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7001,7 +7001,7 @@ endpoint 1 {`
`7001`	`7001`	`ram attribute controlSequenceOfOperation default = 0x04;`
`7002`	`7002`	`ram attribute systemMode default = 0x01;`
`7003`	`7003`	`ram attribute featureMap default = 1;`
`7004`		`- ram attribute clusterRevision default = 6;`
	`7004`	`+ callback attribute clusterRevision;`
`7005`	`7005`
`7006`	`7006`	`handle command SetpointRaiseLower;`
`7007`	`7007`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3320,7 +3320,7 @@ endpoint 5 {`
`3320`	`3320`	`callback attribute acceptedCommandList;`
`3321`	`3321`	`callback attribute attributeList;`
`3322`	`3322`	`ram attribute featureMap default = 1;`
`3323`		`- ram attribute clusterRevision default = 6;`
	`3323`	`+ callback attribute clusterRevision;`
`3324`	`3324`
`3325`	`3325`	`handle command SetpointRaiseLower;`
`3326`	`3326`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2361,7 +2361,7 @@ endpoint 1 {`
`2361`	`2361`	`callback attribute acceptedCommandList;`
`2362`	`2362`	`callback attribute attributeList;`
`2363`	`2363`	`ram attribute featureMap default = 3;`
`2364`		`- ram attribute clusterRevision default = 7;`
	`2364`	`+ callback attribute clusterRevision;`
`2365`	`2365`
`2366`	`2366`	`handle command SetpointRaiseLower;`
`2367`	`2367`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2611,7 +2611,7 @@ endpoint 1 {`
`2611`	`2611`	`callback attribute acceptedCommandList;`
`2612`	`2612`	`callback attribute attributeList;`
`2613`	`2613`	`ram attribute featureMap default = 39;`
`2614`		`- ram attribute clusterRevision default = 6;`
	`2614`	`+ callback attribute clusterRevision;`
`2615`	`2615`
`2616`	`2616`	`handle command SetpointRaiseLower;`
`2617`	`2617`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9267,7 +9267,7 @@ endpoint 0 {`
`9267`	`9267`	`callback attribute ACCoilTemperature;`
`9268`	`9268`	`callback attribute ACCapacityformat default = 0x00;`
`9269`	`9269`	`ram attribute featureMap default = 0x000b;`
`9270`		`- ram attribute clusterRevision default = 6;`
	`9270`	`+ callback attribute clusterRevision;`
`9271`	`9271`	`}`
`9272`	`9272`
`9273`	`9273`	`server cluster ThermostatUserInterfaceConfiguration {`
Original file line number	Diff line number	Diff line change
`@@ -9230,7 +9230,7 @@ endpoint 0 {`
`9230`	`9230`	`callback attribute ACCoilTemperature;`
`9231`	`9231`	`callback attribute ACCapacityformat default = 0x00;`
`9232`	`9232`	`ram attribute featureMap default = 0x000b;`
`9233`		`- ram attribute clusterRevision default = 6;`
	`9233`	`+ callback attribute clusterRevision;`
`9234`	`9234`	`}`
`9235`	`9235`
`9236`	`9236`	`server cluster ThermostatUserInterfaceConfiguration {`
Original file line number	Diff line number	Diff line change
`@@ -2709,7 +2709,7 @@ endpoint 1 {`
`2709`	`2709`	`callback attribute acceptedCommandList;`
`2710`	`2710`	`callback attribute attributeList;`
`2711`	`2711`	`ram attribute featureMap default = 0x3;`
`2712`		`- ram attribute clusterRevision default = 9;`
	`2712`	`+ callback attribute clusterRevision;`
`2713`	`2713`
`2714`	`2714`	`handle command SetpointRaiseLower;`
`2715`	`2715`	`}`