Switch cluster ID from 0xFFF1F50F to 0xFFF1FC05 to match spec range r…

…estrictions .. even more restricted it seems
project-chip · Jun 8, 2022 · 5c7a25d · 5c7a25d
1 parent 2c14182
commit 5c7a25d
Show file tree

Hide file tree

Showing 17 changed files with 996 additions and 64 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
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
@@ -8268,7 +8268,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -8320,7 +8320,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -19155,7 +19155,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -19327,7 +19327,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",

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
@@ -2511,7 +2511,7 @@ server cluster TemperatureMeasurement = 1026 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-server cluster TestCluster = 4294046991 {
+server cluster TestCluster = 4294048773 {
   enum SimpleEnum : ENUM8 {
     kUnspecified = 0;
     kValueA = 1;

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
@@ -8268,7 +8268,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -8320,7 +8320,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -19110,7 +19110,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -19282,7 +19282,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",

diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
@@ -7009,7 +7009,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -7061,7 +7061,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -14090,7 +14090,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -14134,7 +14134,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",

diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
@@ -7123,7 +7123,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -7175,7 +7175,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -9432,7 +9432,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -9484,7 +9484,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",

diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -1854,7 +1854,7 @@ client cluster TargetNavigator = 1285 {
   command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
 }
 
-server cluster TestCluster = 4294046991 {
+server cluster TestCluster = 4294048773 {
   enum SimpleEnum : ENUM8 {
     kUnspecified = 0;
     kValueA = 1;

diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -6896,7 +6896,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -6948,7 +6948,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",
@@ -14227,7 +14227,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -14271,7 +14271,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -3475,7 +3475,7 @@ client cluster TemperatureMeasurement = 1026 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-client cluster TestCluster = 4294046991 {
+client cluster TestCluster = 4294048773 {
   enum SimpleEnum : ENUM8 {
     kUnspecified = 0;
     kValueA = 1;

diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
@@ -17368,7 +17368,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "client",
@@ -17556,7 +17556,7 @@
         },
         {
           "name": "Test Cluster",
-          "code": 4294046991,
+          "code": 4294048773,
           "mfgCode": null,
           "define": "TEST_CLUSTER",
           "side": "server",

diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java