Revert "Add Spec version and Max Paths Per Invoke to Basic Informatio…

…n cluster (project-chip#30496)" This reverts commit 9969d44.
pankore · Apr 16, 2024 · ab575cc · ab575cc
1 parent 1ba1c65
commit ab575cc
Show file tree

Hide file tree

Showing 171 changed files with 945 additions and 949 deletions.
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
@@ -243,9 +243,12 @@ cluster BasicInformation = 40 {
   readonly attribute optional boolean reachable = 17;
   readonly attribute optional char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+<<<<<<< HEAD
   readonly attribute optional ProductAppearanceStruct productAppearance = 20;
   readonly attribute int32u specificationVersion = 21;
   readonly attribute int16u maxPathsPerInvoke = 22;
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1941,10 +1944,8 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
-    callback attribute specificationVersion;
-    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute clusterRevision default = 1;
   }
 
   server cluster OtaSoftwareUpdateRequestor {

diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
@@ -633,6 +633,7 @@
               "reportableChange": 0
             },
             {
+<<<<<<< HEAD
               "name": "SpecificationVersion",
               "code": 21,
               "mfgCode": null,
@@ -665,6 +666,8 @@
               "reportableChange": 0
             },
             {
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
               "name": "FeatureMap",
               "code": 65532,
               "mfgCode": null,
@@ -690,7 +693,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,

diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
@@ -243,9 +243,12 @@ cluster BasicInformation = 40 {
   readonly attribute optional boolean reachable = 17;
   readonly attribute optional char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+<<<<<<< HEAD
   readonly attribute optional ProductAppearanceStruct productAppearance = 20;
   readonly attribute int32u specificationVersion = 21;
   readonly attribute int16u maxPathsPerInvoke = 22;
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2032,10 +2035,8 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
-    callback attribute specificationVersion;
-    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute clusterRevision default = 2;
   }
 
   server cluster OtaSoftwareUpdateRequestor {

diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap
@@ -633,6 +633,7 @@
               "reportableChange": 0
             },
             {
+<<<<<<< HEAD
               "name": "SpecificationVersion",
               "code": 21,
               "mfgCode": null,
@@ -665,6 +666,8 @@
               "reportableChange": 0
             },
             {
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
               "name": "FeatureMap",
               "code": 65532,
               "mfgCode": null,
@@ -690,7 +693,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,

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
@@ -1015,9 +1015,13 @@ cluster BasicInformation = 40 {
   readonly attribute optional boolean reachable = 17;
   readonly attribute optional char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+<<<<<<< HEAD
   readonly attribute optional ProductAppearanceStruct productAppearance = 20;
   readonly attribute int32u specificationVersion = 21;
   readonly attribute int16u maxPathsPerInvoke = 22;
+=======
+  readonly attribute ProductAppearanceStruct productAppearance = 20;
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6443,14 +6447,12 @@ endpoint 0 {
     callback attribute uniqueID;
     callback attribute capabilityMinima;
     callback attribute productAppearance;
-    callback attribute specificationVersion;
-    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute clusterRevision default = 2;
   }
 
   server cluster OtaSoftwareUpdateRequestor {

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -1075,6 +1075,7 @@
               "reportableChange": 0
             },
             {
+<<<<<<< HEAD
               "name": "SpecificationVersion",
               "code": 21,
               "mfgCode": null,
@@ -1107,6 +1108,8 @@
               "reportableChange": 0
             },
             {
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
               "name": "GeneratedCommandList",
               "code": 65528,
               "mfgCode": null,
@@ -1196,7 +1199,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -14073,7 +14076,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "TemperatureDisplayModeEnum",
+              "type": "enum8",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -14089,7 +14092,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "KeypadLockoutEnum",
+              "type": "enum8",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -14105,7 +14108,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "ScheduleProgrammingVisibilityEnum",
+              "type": "enum8",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,

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
@@ -908,9 +908,12 @@ cluster BasicInformation = 40 {
   readonly attribute optional boolean reachable = 17;
   readonly attribute optional char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+<<<<<<< HEAD
   readonly attribute optional ProductAppearanceStruct productAppearance = 20;
   readonly attribute int32u specificationVersion = 21;
   readonly attribute int16u maxPathsPerInvoke = 22;
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -5794,14 +5797,12 @@ endpoint 0 {
     callback attribute softwareVersion;
     callback attribute softwareVersionString;
     callback attribute capabilityMinima;
-    callback attribute specificationVersion;
-    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute clusterRevision default = 2;
   }
 
   server cluster OtaSoftwareUpdateRequestor {

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -916,6 +916,7 @@
               "reportableChange": 0
             },
             {
+<<<<<<< HEAD
               "name": "SpecificationVersion",
               "code": 21,
               "mfgCode": null,
@@ -948,6 +949,8 @@
               "reportableChange": 0
             },
             {
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
               "name": "GeneratedCommandList",
               "code": 65528,
               "mfgCode": null,
@@ -1037,7 +1040,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,

diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -713,9 +713,12 @@ cluster BasicInformation = 40 {
   readonly attribute optional boolean reachable = 17;
   readonly attribute optional char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+<<<<<<< HEAD
   readonly attribute optional ProductAppearanceStruct productAppearance = 20;
   readonly attribute int32u specificationVersion = 21;
   readonly attribute int16u maxPathsPerInvoke = 22;
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1943,13 +1946,11 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
-    callback attribute specificationVersion;
-    callback attribute maxPathsPerInvoke;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute clusterRevision default = 2;
   }
 
   server cluster LocalizationConfiguration {

diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -748,6 +748,7 @@
               "reportableChange": 0
             },
             {
+<<<<<<< HEAD
               "name": "SpecificationVersion",
               "code": 21,
               "mfgCode": null,
@@ -780,6 +781,8 @@
               "reportableChange": 0
             },
             {
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
               "name": "GeneratedCommandList",
               "code": 65528,
               "mfgCode": null,
@@ -853,7 +856,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,

diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -538,9 +538,12 @@ cluster BasicInformation = 40 {
   readonly attribute optional boolean reachable = 17;
   readonly attribute optional char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+<<<<<<< HEAD
   readonly attribute optional ProductAppearanceStruct productAppearance = 20;
   readonly attribute int32u specificationVersion = 21;
   readonly attribute int16u maxPathsPerInvoke = 22;
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1683,10 +1686,8 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
-    callback attribute specificationVersion;
-    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute clusterRevision default = 2;
   }
 
   server cluster OtaSoftwareUpdateRequestor {

diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -633,6 +633,7 @@
               "reportableChange": 0
             },
             {
+<<<<<<< HEAD
               "name": "SpecificationVersion",
               "code": 21,
               "mfgCode": null,
@@ -665,6 +666,8 @@
               "reportableChange": 0
             },
             {
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
               "name": "FeatureMap",
               "code": 65532,
               "mfgCode": null,
@@ -690,7 +693,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,

diff --git a/...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
@@ -320,9 +320,12 @@ cluster BasicInformation = 40 {
   readonly attribute optional boolean reachable = 17;
   readonly attribute optional char_string<32> uniqueID = 18;
   readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
+<<<<<<< HEAD
   readonly attribute optional ProductAppearanceStruct productAppearance = 20;
   readonly attribute int32u specificationVersion = 21;
   readonly attribute int16u maxPathsPerInvoke = 22;
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2114,10 +2117,8 @@ endpoint 0 {
     persist  attribute localConfigDisabled default = 0;
     callback attribute uniqueID;
     callback attribute capabilityMinima;
-    callback attribute specificationVersion;
-    callback attribute maxPathsPerInvoke;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute clusterRevision default = 2;
   }
 
   server cluster GeneralCommissioning {

diff --git a/...e_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap b/...e_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap
@@ -633,6 +633,7 @@
               "reportableChange": 0
             },
             {
+<<<<<<< HEAD
               "name": "SpecificationVersion",
               "code": 21,
               "mfgCode": null,
@@ -665,6 +666,8 @@
               "reportableChange": 0
             },
             {
+=======
+>>>>>>> parent of 9969d44dce (Add Spec version and Max Paths Per Invoke to Basic Information cluster (#30496))
               "name": "FeatureMap",
               "code": 65532,
               "mfgCode": null,
@@ -690,7 +693,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,