Skip to content

Commit 69a5fc1

Browse files
Updated Zap generated files
1 parent 0e1f0b4 commit 69a5fc1

File tree

19 files changed

+33
-26
lines changed

19 files changed

+33
-26
lines changed

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -3639,7 +3639,7 @@ provisional cluster ScenesManagement = 98 {
36393639
int8u sceneIdentifierFrom = 2;
36403640
}
36413641

3642-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
3642+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
36433643
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
36443644
/** Retrieves the requested scene entry from its Scene table. */
36453645
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2551,7 +2551,7 @@ provisional cluster ScenesManagement = 98 {
25512551
int8u sceneIdentifierFrom = 2;
25522552
}
25532553

2554-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
2554+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
25552555
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
25562556
/** Retrieves the requested scene entry from its Scene table. */
25572557
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter

+11-4
Original file line numberDiff line numberDiff line change
@@ -1515,14 +1515,21 @@ provisional cluster ScenesManagement = 98 {
15151515
kSceneNames = 0x1;
15161516
}
15171517

1518-
struct AttributeValuePair {
1518+
struct AttributeValuePairStruct {
15191519
attrib_id attributeID = 0;
1520-
int32u attributeValue = 1;
1520+
optional int8u valueUnsigned8 = 1;
1521+
optional int8s valueSigned8 = 2;
1522+
optional int16u valueUnsigned16 = 3;
1523+
optional int16s valueSigned16 = 4;
1524+
optional int32u valueUnsigned32 = 5;
1525+
optional int32s valueSigned32 = 6;
1526+
optional int64u valueUnsigned64 = 7;
1527+
optional int64s valueSigned64 = 8;
15211528
}
15221529

15231530
struct ExtensionFieldSet {
15241531
cluster_id clusterID = 0;
1525-
AttributeValuePair attributeValueList[] = 1;
1532+
AttributeValuePairStruct attributeValueList[] = 1;
15261533
}
15271534

15281535
fabric_scoped struct SceneInfoStruct {
@@ -1634,7 +1641,7 @@ provisional cluster ScenesManagement = 98 {
16341641
int8u sceneIdentifierFrom = 2;
16351642
}
16361643

1637-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "AttributeValue": VALUE}]}' */
1644+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
16381645
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
16391646
/** Retrieves the requested scene entry from its Scene table. */
16401647
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/light-switch-app/light-switch-common/light-switch-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2169,7 +2169,7 @@ provisional cluster ScenesManagement = 98 {
21692169
int8u sceneIdentifierFrom = 2;
21702170
}
21712171

2172-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
2172+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
21732173
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
21742174
/** Retrieves the requested scene entry from its Scene table. */
21752175
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/light-switch-app/qpg/zap/switch.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1966,7 +1966,7 @@ provisional cluster ScenesManagement = 98 {
19661966
int8u sceneIdentifierFrom = 2;
19671967
}
19681968

1969-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
1969+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
19701970
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
19711971
/** Retrieves the requested scene entry from its Scene table. */
19721972
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/lighting-app/lighting-common/lighting-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1979,7 +1979,7 @@ provisional cluster ScenesManagement = 98 {
19791979
int8u sceneIdentifierFrom = 2;
19801980
}
19811981

1982-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
1982+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
19831983
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
19841984
/** Retrieves the requested scene entry from its Scene table. */
19851985
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/lighting-app/silabs/data_model/lighting-thread-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1683,7 +1683,7 @@ provisional cluster ScenesManagement = 98 {
16831683
int8u sceneIdentifierFrom = 2;
16841684
}
16851685

1686-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
1686+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
16871687
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
16881688
/** Retrieves the requested scene entry from its Scene table. */
16891689
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/lighting-app/silabs/data_model/lighting-wifi-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1974,7 +1974,7 @@ provisional cluster ScenesManagement = 98 {
19741974
int8u sceneIdentifierFrom = 2;
19751975
}
19761976

1977-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
1977+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
19781978
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
19791979
/** Retrieves the requested scene entry from its Scene table. */
19801980
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/placeholder/linux/apps/app1/config.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -3146,7 +3146,7 @@ provisional cluster ScenesManagement = 98 {
31463146
int8u sceneIdentifierFrom = 2;
31473147
}
31483148

3149-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
3149+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
31503150
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
31513151
/** Retrieves the requested scene entry from its Scene table. */
31523152
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/placeholder/linux/apps/app2/config.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -3103,7 +3103,7 @@ provisional cluster ScenesManagement = 98 {
31033103
int8u sceneIdentifierFrom = 2;
31043104
}
31053105

3106-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
3106+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
31073107
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
31083108
/** Retrieves the requested scene entry from its Scene table. */
31093109
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/thermostat/nxp/zap/thermostat_matter_thread.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1879,7 +1879,7 @@ provisional cluster ScenesManagement = 98 {
18791879
int8u sceneIdentifierFrom = 2;
18801880
}
18811881

1882-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
1882+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
18831883
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
18841884
/** Retrieves the requested scene entry from its Scene table. */
18851885
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/thermostat/nxp/zap/thermostat_matter_wifi.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1790,7 +1790,7 @@ provisional cluster ScenesManagement = 98 {
17901790
int8u sceneIdentifierFrom = 2;
17911791
}
17921792

1793-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
1793+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
17941794
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
17951795
/** Retrieves the requested scene entry from its Scene table. */
17961796
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

examples/virtual-device-app/virtual-device-common/virtual-device-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2026,7 +2026,7 @@ provisional cluster ScenesManagement = 98 {
20262026
int8u sceneIdentifierFrom = 2;
20272027
}
20282028

2029-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
2029+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
20302030
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
20312031
/** Retrieves the requested scene entry from its Scene table. */
20322032
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

src/controller/data_model/controller-clusters.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -3882,7 +3882,7 @@ provisional cluster ScenesManagement = 98 {
38823882
int8u sceneIdentifierFrom = 2;
38833883
}
38843884

3885-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "ValueX": VALUE}]}' */
3885+
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
38863886
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
38873887
/** Retrieves the requested scene entry from its Scene table. */
38883888
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesManagementClusterAttributeValuePairStruct.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ScenesManagementClusterAttributeValuePairStruct(
3232
val valueUnsigned32: Optional<ULong>,
3333
val valueSigned32: Optional<Long>,
3434
val valueUnsigned64: Optional<ULong>,
35-
val valueSigned64: Optional<Long>
35+
val valueSigned64: Optional<Long>,
3636
) {
3737
override fun toString(): String = buildString {
3838
append("ScenesManagementClusterAttributeValuePairStruct {\n")
@@ -101,7 +101,7 @@ class ScenesManagementClusterAttributeValuePairStruct(
101101

102102
fun fromTlv(
103103
tlvTag: Tag,
104-
tlvReader: TlvReader
104+
tlvReader: TlvReader,
105105
): ScenesManagementClusterAttributeValuePairStruct {
106106
tlvReader.enterStructure(tlvTag)
107107
val attributeID = tlvReader.getULong(ContextSpecificTag(TAG_ATTRIBUTE_I_D))
@@ -165,7 +165,7 @@ class ScenesManagementClusterAttributeValuePairStruct(
165165
valueUnsigned32,
166166
valueSigned32,
167167
valueUnsigned64,
168-
valueSigned64
168+
valueSigned64,
169169
)
170170
}
171171
}

src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ScenesManagementClusterExtensionFieldSet.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
2525

2626
class ScenesManagementClusterExtensionFieldSet(
2727
val clusterID: ULong,
28-
val attributeValueList: List<ScenesManagementClusterAttributeValuePairStruct>
28+
val attributeValueList: List<ScenesManagementClusterAttributeValuePairStruct>,
2929
) {
3030
override fun toString(): String = buildString {
3131
append("ScenesManagementClusterExtensionFieldSet {\n")

src/controller/java/generated/java/matter/controller/cluster/structs/ScenesManagementClusterAttributeValuePairStruct.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ScenesManagementClusterAttributeValuePairStruct(
3232
val valueUnsigned32: Optional<UInt>,
3333
val valueSigned32: Optional<Int>,
3434
val valueUnsigned64: Optional<ULong>,
35-
val valueSigned64: Optional<Long>
35+
val valueSigned64: Optional<Long>,
3636
) {
3737
override fun toString(): String = buildString {
3838
append("ScenesManagementClusterAttributeValuePairStruct {\n")
@@ -101,7 +101,7 @@ class ScenesManagementClusterAttributeValuePairStruct(
101101

102102
fun fromTlv(
103103
tlvTag: Tag,
104-
tlvReader: TlvReader
104+
tlvReader: TlvReader,
105105
): ScenesManagementClusterAttributeValuePairStruct {
106106
tlvReader.enterStructure(tlvTag)
107107
val attributeID = tlvReader.getUInt(ContextSpecificTag(TAG_ATTRIBUTE_I_D))
@@ -165,7 +165,7 @@ class ScenesManagementClusterAttributeValuePairStruct(
165165
valueUnsigned32,
166166
valueSigned32,
167167
valueUnsigned64,
168-
valueSigned64
168+
valueSigned64,
169169
)
170170
}
171171
}

src/controller/java/generated/java/matter/controller/cluster/structs/ScenesManagementClusterExtensionFieldSet.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import matter.tlv.TlvWriter
2525

2626
class ScenesManagementClusterExtensionFieldSet(
2727
val clusterID: UInt,
28-
val attributeValueList: List<ScenesManagementClusterAttributeValuePairStruct>
28+
val attributeValueList: List<ScenesManagementClusterAttributeValuePairStruct>,
2929
) {
3030
override fun toString(): String = buildString {
3131
append("ScenesManagementClusterExtensionFieldSet {\n")

src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)