Skip to content

Commit

Permalink
Switch cluster ID from 0xFFF1F50F to 0xFFF1FC05 to match spec range r…
Browse files Browse the repository at this point in the history
…estrictions .. even more restricted it seems
  • Loading branch information
andy31415 committed Jun 8, 2022
1 parent 09aaf13 commit 2c14182
Show file tree
Hide file tree
Showing 23 changed files with 717 additions and 1,649 deletions.
397 changes: 0 additions & 397 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -19327,7 +19327,7 @@
},
{
"name": "Test Cluster",
"code": 4294046994294046991,
"code": 4294046991,
"mfgCode": null,
"define": "TEST_CLUSTER",
"side": "server",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2511,7 +2511,7 @@ server cluster TemperatureMeasurement = 1026 {
readonly attribute int16u clusterRevision = 65533;
}

server cluster TestCluster = 4293985551 {
server cluster TestCluster = 4294046991 {
enum SimpleEnum : ENUM8 {
kUnspecified = 0;
kValueA = 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1854,7 +1854,7 @@ client cluster TargetNavigator = 1285 {
command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
}

server cluster TestCluster = 4293985551 {
server cluster TestCluster = 4294046991 {
enum SimpleEnum : ENUM8 {
kUnspecified = 0;
kValueA = 1;
Expand Down
28 changes: 14 additions & 14 deletions src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ limitations under the License.
<configurator>
<domain name="CHIP"/>
<struct name="TestListStructOctet">
<cluster code="0xFFF1F50F"/>
<cluster code="0xFFF1FC05"/>
<item name="fabricIndex" type="INT64U"/>
<item name="operationalCert" type="OCTET_STRING" length="32"/>
</struct>

<struct name="TestFabricScoped">
<cluster code="0xFFF1F50F"/>
<cluster code="0xFFF1FC05"/>
<item fieldId="1" name="fabricSensitiveInt8u" type="INT8U" isFabricSensitive="true"/>
<item fieldId="2" name="optionalFabricSensitiveInt8u" type="INT8U" optional="true" isFabricSensitive="true"/>
<item fieldId="3" name="nullableFabricSensitiveInt8u" type="INT8U" isNullable="true" isFabricSensitive="true"/>
Expand All @@ -35,22 +35,22 @@ limitations under the License.
</struct>

<enum name="SimpleEnum" type="ENUM8">
<cluster code="0xFFF1F50F"/>
<cluster code="0xFFF1FC05"/>
<item name="Unspecified" value="0x00"/>
<item name="ValueA" value="0x01"/>
<item name="ValueB" value="0x02"/>
<item name="ValueC" value="0x03"/>
</enum>

<bitmap name="SimpleBitmap" type="BITMAP8">
<cluster code="0xFFF1F50F"/>
<cluster code="0xFFF1FC05"/>
<field name="ValueA" mask="0x1"/>
<field name="ValueB" mask="0x2"/>
<field name="ValueC" mask="0x4"/>
</bitmap>

<struct name="SimpleStruct">
<cluster code="0xFFF1F50F"/>
<cluster code="0xFFF1FC05"/>
<item name="a" type="INT8U" optional="false"/>
<item name="b" type="BOOLEAN" optional="false"/>
<item name="c" type="SimpleEnum" optional="false"/>
Expand All @@ -62,14 +62,14 @@ limitations under the License.
</struct>

<struct name="NestedStruct">
<cluster code="0xFFF1F50F"/>
<cluster code="0xFFF1FC05"/>
<item name="a" type="INT8U" optional="false"/>
<item name="b" type="BOOLEAN" optional="false"/>
<item name="c" type="SimpleStruct" optional="false"/>
</struct>

<struct name="NestedStructList">
<cluster code="0xFFF1F50F"/>
<cluster code="0xFFF1FC05"/>
<item name="a" type="INT8U" optional="false"/>
<item name="b" type="BOOLEAN" optional="false"/>
<item name="c" type="SimpleStruct" optional="false"/>
Expand All @@ -80,13 +80,13 @@ limitations under the License.
</struct>

<struct name="DoubleNestedStructList">
<cluster code="0xFFF1F50F"/>
<cluster code="0xFFF1FC05"/>
<item name="a" type="NestedStructList" array="true" optional="false"/>
</struct>


<struct name="NullablesAndOptionalsStruct">
<cluster code="0xFFF1F50F"/>
<cluster code="0xFFF1FC05"/>
<item name="NullableInt" type="INT16U" isNullable="true"/>
<item name="OptionalInt" type="INT16U" optional="true"/>
<item name="NullableOptionalInt" type="INT16U" isNullable="true"
Expand All @@ -106,31 +106,31 @@ limitations under the License.
</struct>

<bitmap name="Bitmap8MaskMap" type="BITMAP8">
<cluster code="0xFFF1F50F" />
<cluster code="0xFFF1FC05" />
<field mask="0x01" name="MaskVal1" />
<field mask="0x02" name="MaskVal2" />
<field mask="0x04" name="MaskVal3" />
<field mask="0x40" name="MaskVal4" />
</bitmap>

<bitmap name="Bitmap16MaskMap" type="BITMAP16">
<cluster code="0xFFF1F50F" />
<cluster code="0xFFF1FC05" />
<field mask="0x01" name="MaskVal1" />
<field mask="0x02" name="MaskVal2" />
<field mask="0x04" name="MaskVal3" />
<field mask="0x4000" name="MaskVal4" />
</bitmap>

<bitmap name="Bitmap32MaskMap" type="BITMAP32">
<cluster code="0xFFF1F50F" />
<cluster code="0xFFF1FC05" />
<field mask="0x01" name="MaskVal1" />
<field mask="0x02" name="MaskVal2" />
<field mask="0x04" name="MaskVal3" />
<field mask="0x40000000" name="MaskVal4" />
</bitmap>

<bitmap name="Bitmap64MaskMap" type="BITMAP64">
<cluster code="0xFFF1F50F" />
<cluster code="0xFFF1FC05" />
<field mask="0x01" name="MaskVal1" />
<field mask="0x02" name="MaskVal2" />
<field mask="0x04" name="MaskVal3" />
Expand All @@ -140,7 +140,7 @@ limitations under the License.
<cluster>
<domain>CHIP</domain>
<name>Test Cluster</name>
<code>0xFFF1F50F</code>
<code>0xFFF1FC05</code>
<define>TEST_CLUSTER</define>
<description>The Test Cluster is meant to validate the generated code</description>
<!-- Base data types -->
Expand Down
2 changes: 1 addition & 1 deletion src/controller/data_model/controller-clusters.matter
Original file line number Diff line number Diff line change
Expand Up @@ -3475,7 +3475,7 @@ client cluster TemperatureMeasurement = 1026 {
readonly attribute int16u clusterRevision = 65533;
}

client cluster TestCluster = 4293985551 {
client cluster TestCluster = 4294046991 {
enum SimpleEnum : ENUM8 {
kUnspecified = 0;
kValueA = 1;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/controller/python/chip/clusters/CHIPClusters.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2c14182

Please sign in to comment.