Skip to content

Commit 69e6678

Browse files
zaid-googlezaid-google
authored
XML Changes for Improved Capabilities in Basic Information Cluster (project-chip#41964)
* XML changes * Codegen * Poke CI * Revert "Poke CI" This reverts commit 7a7bfc0. * Codegen
1 parent a093a9b commit 69e6678

File tree

141 files changed

+1667
-689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+1667
-689
lines changed

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ cluster AccessControl = 31 {
649649
Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
650650
which apply to the whole Node. Also allows setting user device information such as location. */
651651
cluster BasicInformation = 40 {
652-
revision 5;
652+
revision 6;
653653

654654
enum ColorEnum : enum8 {
655655
kBlack = 0;
@@ -687,6 +687,10 @@ cluster BasicInformation = 40 {
687687
struct CapabilityMinimaStruct {
688688
int16u caseSessionsPerFabric = 0;
689689
int16u subscriptionsPerFabric = 1;
690+
optional int16u simultaneousInvocationsSupported = 2;
691+
optional int16u simultaneousWritesSupported = 3;
692+
optional int16u readPathsSupported = 4;
693+
optional int16u subscribePathsSupported = 5;
690694
}
691695

692696
struct ProductAppearanceStruct {
@@ -727,12 +731,12 @@ cluster BasicInformation = 40 {
727731
readonly attribute optional char_string<32> serialNumber = 15;
728732
attribute access(write: manage) optional boolean localConfigDisabled = 16;
729733
readonly attribute optional boolean reachable = 17;
730-
readonly attribute char_string<32> uniqueID = 18;
734+
readonly attribute optional char_string<32> uniqueID = 18;
731735
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
732736
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
733-
readonly attribute int32u specificationVersion = 21;
734-
readonly attribute int16u maxPathsPerInvoke = 22;
735-
readonly attribute int32u configurationVersion = 24;
737+
readonly attribute optional int32u specificationVersion = 21;
738+
readonly attribute optional int16u maxPathsPerInvoke = 22;
739+
readonly attribute optional int32u configurationVersion = 24;
736740
readonly attribute command_id generatedCommandList[] = 65528;
737741
readonly attribute command_id acceptedCommandList[] = 65529;
738742
readonly attribute attrib_id attributeList[] = 65531;

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ cluster AccessControl = 31 {
578578
Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
579579
which apply to the whole Node. Also allows setting user device information such as location. */
580580
cluster BasicInformation = 40 {
581-
revision 5;
581+
revision 6;
582582

583583
enum ColorEnum : enum8 {
584584
kBlack = 0;
@@ -616,6 +616,10 @@ cluster BasicInformation = 40 {
616616
struct CapabilityMinimaStruct {
617617
int16u caseSessionsPerFabric = 0;
618618
int16u subscriptionsPerFabric = 1;
619+
optional int16u simultaneousInvocationsSupported = 2;
620+
optional int16u simultaneousWritesSupported = 3;
621+
optional int16u readPathsSupported = 4;
622+
optional int16u subscribePathsSupported = 5;
619623
}
620624

621625
struct ProductAppearanceStruct {
@@ -656,12 +660,12 @@ cluster BasicInformation = 40 {
656660
readonly attribute optional char_string<32> serialNumber = 15;
657661
attribute access(write: manage) optional boolean localConfigDisabled = 16;
658662
readonly attribute optional boolean reachable = 17;
659-
readonly attribute char_string<32> uniqueID = 18;
663+
readonly attribute optional char_string<32> uniqueID = 18;
660664
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
661665
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
662-
readonly attribute int32u specificationVersion = 21;
663-
readonly attribute int16u maxPathsPerInvoke = 22;
664-
readonly attribute int32u configurationVersion = 24;
666+
readonly attribute optional int32u specificationVersion = 21;
667+
readonly attribute optional int16u maxPathsPerInvoke = 22;
668+
readonly attribute optional int32u configurationVersion = 24;
665669
readonly attribute command_id generatedCommandList[] = 65528;
666670
readonly attribute command_id acceptedCommandList[] = 65529;
667671
readonly attribute attrib_id attributeList[] = 65531;

‎examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ cluster AccessControl = 31 {
578578
Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
579579
which apply to the whole Node. Also allows setting user device information such as location. */
580580
cluster BasicInformation = 40 {
581-
revision 5;
581+
revision 6;
582582

583583
enum ColorEnum : enum8 {
584584
kBlack = 0;
@@ -616,6 +616,10 @@ cluster BasicInformation = 40 {
616616
struct CapabilityMinimaStruct {
617617
int16u caseSessionsPerFabric = 0;
618618
int16u subscriptionsPerFabric = 1;
619+
optional int16u simultaneousInvocationsSupported = 2;
620+
optional int16u simultaneousWritesSupported = 3;
621+
optional int16u readPathsSupported = 4;
622+
optional int16u subscribePathsSupported = 5;
619623
}
620624

621625
struct ProductAppearanceStruct {
@@ -656,12 +660,12 @@ cluster BasicInformation = 40 {
656660
readonly attribute optional char_string<32> serialNumber = 15;
657661
attribute access(write: manage) optional boolean localConfigDisabled = 16;
658662
readonly attribute optional boolean reachable = 17;
659-
readonly attribute char_string<32> uniqueID = 18;
663+
readonly attribute optional char_string<32> uniqueID = 18;
660664
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
661665
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
662-
readonly attribute int32u specificationVersion = 21;
663-
readonly attribute int16u maxPathsPerInvoke = 22;
664-
readonly attribute int32u configurationVersion = 24;
666+
readonly attribute optional int32u specificationVersion = 21;
667+
readonly attribute optional int16u maxPathsPerInvoke = 22;
668+
readonly attribute optional int32u configurationVersion = 24;
665669
readonly attribute command_id generatedCommandList[] = 65528;
666670
readonly attribute command_id acceptedCommandList[] = 65529;
667671
readonly attribute attrib_id attributeList[] = 65531;

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ cluster Actions = 37 {
11151115
Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
11161116
which apply to the whole Node. Also allows setting user device information such as location. */
11171117
cluster BasicInformation = 40 {
1118-
revision 5;
1118+
revision 6;
11191119

11201120
enum ColorEnum : enum8 {
11211121
kBlack = 0;
@@ -1153,6 +1153,10 @@ cluster BasicInformation = 40 {
11531153
struct CapabilityMinimaStruct {
11541154
int16u caseSessionsPerFabric = 0;
11551155
int16u subscriptionsPerFabric = 1;
1156+
optional int16u simultaneousInvocationsSupported = 2;
1157+
optional int16u simultaneousWritesSupported = 3;
1158+
optional int16u readPathsSupported = 4;
1159+
optional int16u subscribePathsSupported = 5;
11561160
}
11571161

11581162
struct ProductAppearanceStruct {
@@ -1193,12 +1197,12 @@ cluster BasicInformation = 40 {
11931197
readonly attribute optional char_string<32> serialNumber = 15;
11941198
attribute access(write: manage) optional boolean localConfigDisabled = 16;
11951199
readonly attribute optional boolean reachable = 17;
1196-
readonly attribute char_string<32> uniqueID = 18;
1200+
readonly attribute optional char_string<32> uniqueID = 18;
11971201
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
11981202
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
1199-
readonly attribute int32u specificationVersion = 21;
1200-
readonly attribute int16u maxPathsPerInvoke = 22;
1201-
readonly attribute int32u configurationVersion = 24;
1203+
readonly attribute optional int32u specificationVersion = 21;
1204+
readonly attribute optional int16u maxPathsPerInvoke = 22;
1205+
readonly attribute optional int32u configurationVersion = 24;
12021206
readonly attribute command_id generatedCommandList[] = 65528;
12031207
readonly attribute command_id acceptedCommandList[] = 65529;
12041208
readonly attribute attrib_id attributeList[] = 65531;

‎examples/all-clusters-app/realtek/data_model/all-clusters-app.matter‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ cluster Actions = 37 {
11151115
Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
11161116
which apply to the whole Node. Also allows setting user device information such as location. */
11171117
cluster BasicInformation = 40 {
1118-
revision 5;
1118+
revision 6;
11191119

11201120
enum ColorEnum : enum8 {
11211121
kBlack = 0;
@@ -1153,6 +1153,10 @@ cluster BasicInformation = 40 {
11531153
struct CapabilityMinimaStruct {
11541154
int16u caseSessionsPerFabric = 0;
11551155
int16u subscriptionsPerFabric = 1;
1156+
optional int16u simultaneousInvocationsSupported = 2;
1157+
optional int16u simultaneousWritesSupported = 3;
1158+
optional int16u readPathsSupported = 4;
1159+
optional int16u subscribePathsSupported = 5;
11561160
}
11571161

11581162
struct ProductAppearanceStruct {
@@ -1193,12 +1197,12 @@ cluster BasicInformation = 40 {
11931197
readonly attribute optional char_string<32> serialNumber = 15;
11941198
attribute access(write: manage) optional boolean localConfigDisabled = 16;
11951199
readonly attribute optional boolean reachable = 17;
1196-
readonly attribute char_string<32> uniqueID = 18;
1200+
readonly attribute optional char_string<32> uniqueID = 18;
11971201
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
11981202
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
1199-
readonly attribute int32u specificationVersion = 21;
1200-
readonly attribute int16u maxPathsPerInvoke = 22;
1201-
readonly attribute int32u configurationVersion = 24;
1203+
readonly attribute optional int32u specificationVersion = 21;
1204+
readonly attribute optional int16u maxPathsPerInvoke = 22;
1205+
readonly attribute optional int32u configurationVersion = 24;
12021206
readonly attribute command_id generatedCommandList[] = 65528;
12031207
readonly attribute command_id acceptedCommandList[] = 65529;
12041208
readonly attribute attrib_id attributeList[] = 65531;

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ cluster Actions = 37 {
10441044
Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
10451045
which apply to the whole Node. Also allows setting user device information such as location. */
10461046
cluster BasicInformation = 40 {
1047-
revision 5;
1047+
revision 6;
10481048

10491049
enum ColorEnum : enum8 {
10501050
kBlack = 0;
@@ -1082,6 +1082,10 @@ cluster BasicInformation = 40 {
10821082
struct CapabilityMinimaStruct {
10831083
int16u caseSessionsPerFabric = 0;
10841084
int16u subscriptionsPerFabric = 1;
1085+
optional int16u simultaneousInvocationsSupported = 2;
1086+
optional int16u simultaneousWritesSupported = 3;
1087+
optional int16u readPathsSupported = 4;
1088+
optional int16u subscribePathsSupported = 5;
10851089
}
10861090

10871091
struct ProductAppearanceStruct {
@@ -1122,12 +1126,12 @@ cluster BasicInformation = 40 {
11221126
readonly attribute optional char_string<32> serialNumber = 15;
11231127
attribute access(write: manage) optional boolean localConfigDisabled = 16;
11241128
readonly attribute optional boolean reachable = 17;
1125-
readonly attribute char_string<32> uniqueID = 18;
1129+
readonly attribute optional char_string<32> uniqueID = 18;
11261130
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
11271131
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
1128-
readonly attribute int32u specificationVersion = 21;
1129-
readonly attribute int16u maxPathsPerInvoke = 22;
1130-
readonly attribute int32u configurationVersion = 24;
1132+
readonly attribute optional int32u specificationVersion = 21;
1133+
readonly attribute optional int16u maxPathsPerInvoke = 22;
1134+
readonly attribute optional int32u configurationVersion = 24;
11311135
readonly attribute command_id generatedCommandList[] = 65528;
11321136
readonly attribute command_id acceptedCommandList[] = 65529;
11331137
readonly attribute attrib_id attributeList[] = 65531;

‎examples/bridge-app/bridge-common/bridge-app.matter‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ cluster Actions = 37 {
948948
Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
949949
which apply to the whole Node. Also allows setting user device information such as location. */
950950
cluster BasicInformation = 40 {
951-
revision 5;
951+
revision 6;
952952

953953
enum ColorEnum : enum8 {
954954
kBlack = 0;
@@ -986,6 +986,10 @@ cluster BasicInformation = 40 {
986986
struct CapabilityMinimaStruct {
987987
int16u caseSessionsPerFabric = 0;
988988
int16u subscriptionsPerFabric = 1;
989+
optional int16u simultaneousInvocationsSupported = 2;
990+
optional int16u simultaneousWritesSupported = 3;
991+
optional int16u readPathsSupported = 4;
992+
optional int16u subscribePathsSupported = 5;
989993
}
990994

991995
struct ProductAppearanceStruct {
@@ -1026,12 +1030,12 @@ cluster BasicInformation = 40 {
10261030
readonly attribute optional char_string<32> serialNumber = 15;
10271031
attribute access(write: manage) optional boolean localConfigDisabled = 16;
10281032
readonly attribute optional boolean reachable = 17;
1029-
readonly attribute char_string<32> uniqueID = 18;
1033+
readonly attribute optional char_string<32> uniqueID = 18;
10301034
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
10311035
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
1032-
readonly attribute int32u specificationVersion = 21;
1033-
readonly attribute int16u maxPathsPerInvoke = 22;
1034-
readonly attribute int32u configurationVersion = 24;
1036+
readonly attribute optional int32u specificationVersion = 21;
1037+
readonly attribute optional int16u maxPathsPerInvoke = 22;
1038+
readonly attribute optional int32u configurationVersion = 24;
10351039
readonly attribute command_id generatedCommandList[] = 65528;
10361040
readonly attribute command_id acceptedCommandList[] = 65529;
10371041
readonly attribute attrib_id attributeList[] = 65531;

‎examples/camera-app/camera-common/camera-app.matter‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ cluster AccessControl = 31 {
674674
Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
675675
which apply to the whole Node. Also allows setting user device information such as location. */
676676
cluster BasicInformation = 40 {
677-
revision 5;
677+
revision 6;
678678

679679
enum ColorEnum : enum8 {
680680
kBlack = 0;
@@ -712,6 +712,10 @@ cluster BasicInformation = 40 {
712712
struct CapabilityMinimaStruct {
713713
int16u caseSessionsPerFabric = 0;
714714
int16u subscriptionsPerFabric = 1;
715+
optional int16u simultaneousInvocationsSupported = 2;
716+
optional int16u simultaneousWritesSupported = 3;
717+
optional int16u readPathsSupported = 4;
718+
optional int16u subscribePathsSupported = 5;
715719
}
716720

717721
struct ProductAppearanceStruct {
@@ -752,12 +756,12 @@ cluster BasicInformation = 40 {
752756
readonly attribute optional char_string<32> serialNumber = 15;
753757
attribute access(write: manage) optional boolean localConfigDisabled = 16;
754758
readonly attribute optional boolean reachable = 17;
755-
readonly attribute char_string<32> uniqueID = 18;
759+
readonly attribute optional char_string<32> uniqueID = 18;
756760
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
757761
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
758-
readonly attribute int32u specificationVersion = 21;
759-
readonly attribute int16u maxPathsPerInvoke = 22;
760-
readonly attribute int32u configurationVersion = 24;
762+
readonly attribute optional int32u specificationVersion = 21;
763+
readonly attribute optional int16u maxPathsPerInvoke = 22;
764+
readonly attribute optional int32u configurationVersion = 24;
761765
readonly attribute command_id generatedCommandList[] = 65528;
762766
readonly attribute command_id acceptedCommandList[] = 65529;
763767
readonly attribute attrib_id attributeList[] = 65531;

‎examples/chef/devices/icd_rootnode_contactsensor_ed3b19ec55.matter‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ cluster AccessControl = 31 {
598598
Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
599599
which apply to the whole Node. Also allows setting user device information such as location. */
600600
cluster BasicInformation = 40 {
601-
revision 5;
601+
revision 6;
602602

603603
enum ColorEnum : enum8 {
604604
kBlack = 0;
@@ -636,6 +636,10 @@ cluster BasicInformation = 40 {
636636
struct CapabilityMinimaStruct {
637637
int16u caseSessionsPerFabric = 0;
638638
int16u subscriptionsPerFabric = 1;
639+
optional int16u simultaneousInvocationsSupported = 2;
640+
optional int16u simultaneousWritesSupported = 3;
641+
optional int16u readPathsSupported = 4;
642+
optional int16u subscribePathsSupported = 5;
639643
}
640644

641645
struct ProductAppearanceStruct {
@@ -676,12 +680,12 @@ cluster BasicInformation = 40 {
676680
readonly attribute optional char_string<32> serialNumber = 15;
677681
attribute access(write: manage) optional boolean localConfigDisabled = 16;
678682
readonly attribute optional boolean reachable = 17;
679-
readonly attribute char_string<32> uniqueID = 18;
683+
readonly attribute optional char_string<32> uniqueID = 18;
680684
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
681685
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
682-
readonly attribute int32u specificationVersion = 21;
683-
readonly attribute int16u maxPathsPerInvoke = 22;
684-
readonly attribute int32u configurationVersion = 24;
686+
readonly attribute optional int32u specificationVersion = 21;
687+
readonly attribute optional int16u maxPathsPerInvoke = 22;
688+
readonly attribute optional int32u configurationVersion = 24;
685689
readonly attribute command_id generatedCommandList[] = 65528;
686690
readonly attribute command_id acceptedCommandList[] = 65529;
687691
readonly attribute attrib_id attributeList[] = 65531;

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ cluster AccessControl = 31 {
868868
Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number,
869869
which apply to the whole Node. Also allows setting user device information such as location. */
870870
cluster BasicInformation = 40 {
871-
revision 5;
871+
revision 6;
872872

873873
enum ColorEnum : enum8 {
874874
kBlack = 0;
@@ -906,6 +906,10 @@ cluster BasicInformation = 40 {
906906
struct CapabilityMinimaStruct {
907907
int16u caseSessionsPerFabric = 0;
908908
int16u subscriptionsPerFabric = 1;
909+
optional int16u simultaneousInvocationsSupported = 2;
910+
optional int16u simultaneousWritesSupported = 3;
911+
optional int16u readPathsSupported = 4;
912+
optional int16u subscribePathsSupported = 5;
909913
}
910914

911915
struct ProductAppearanceStruct {
@@ -946,12 +950,12 @@ cluster BasicInformation = 40 {
946950
readonly attribute optional char_string<32> serialNumber = 15;
947951
attribute access(write: manage) optional boolean localConfigDisabled = 16;
948952
readonly attribute optional boolean reachable = 17;
949-
readonly attribute char_string<32> uniqueID = 18;
953+
readonly attribute optional char_string<32> uniqueID = 18;
950954
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
951955
readonly attribute optional ProductAppearanceStruct productAppearance = 20;
952-
readonly attribute int32u specificationVersion = 21;
953-
readonly attribute int16u maxPathsPerInvoke = 22;
954-
readonly attribute int32u configurationVersion = 24;
956+
readonly attribute optional int32u specificationVersion = 21;
957+
readonly attribute optional int16u maxPathsPerInvoke = 22;
958+
readonly attribute optional int32u configurationVersion = 24;
955959
readonly attribute command_id generatedCommandList[] = 65528;
956960
readonly attribute command_id acceptedCommandList[] = 65529;
957961
readonly attribute attrib_id attributeList[] = 65531;

0 commit comments

Comments
 (0)