Skip to content

Commit 9c8ab04

Browse files
luis4a0luis4a0
committed
Fix conformance errors on RVC app.
1 parent 7c1d6f7 commit 9c8ab04

File tree

2 files changed

+170
-63
lines changed

2 files changed

+170
-63
lines changed

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

+34-9
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,23 @@ cluster BasicInformation = 40 {
546546
command MfgSpecificPing(): DefaultSuccess = 0;
547547
}
548548

549+
/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
550+
may have differing common languages, units of measurements, and numerical formatting
551+
standards. As such, Nodes that visually or audibly convey information need a mechanism by which
552+
they can be configured to use a user’s preferred language, units, etc */
553+
cluster LocalizationConfiguration = 43 {
554+
revision 1; // NOTE: Default/not specifically set
555+
556+
attribute access(write: manage) char_string<35> activeLocale = 0;
557+
readonly attribute char_string supportedLocales[] = 1;
558+
readonly attribute command_id generatedCommandList[] = 65528;
559+
readonly attribute command_id acceptedCommandList[] = 65529;
560+
readonly attribute event_id eventList[] = 65530;
561+
readonly attribute attrib_id attributeList[] = 65531;
562+
readonly attribute bitmap32 featureMap = 65532;
563+
readonly attribute int16u clusterRevision = 65533;
564+
}
565+
549566
/** This cluster is used to manage global aspects of the Commissioning flow. */
550567
cluster GeneralCommissioning = 48 {
551568
revision 1; // NOTE: Default/not specifically set
@@ -1553,7 +1570,7 @@ provisional cluster ServiceArea = 336 {
15531570
}
15541571

15551572
endpoint 0 {
1556-
device type ma_rootdevice = 22, version 1;
1573+
device type ma_rootdevice = 22, version 3;
15571574

15581575

15591576
server cluster Descriptor {
@@ -1569,7 +1586,6 @@ endpoint 0 {
15691586
emits event AccessControlEntryChanged;
15701587
emits event AccessControlExtensionChanged;
15711588
callback attribute acl;
1572-
callback attribute extension;
15731589
callback attribute subjectsPerAccessControlEntry;
15741590
callback attribute targetsPerAccessControlEntry;
15751591
callback attribute accessControlEntriesPerFabric;
@@ -1604,7 +1620,17 @@ endpoint 0 {
16041620
callback attribute specificationVersion;
16051621
callback attribute maxPathsPerInvoke;
16061622
ram attribute featureMap default = 0;
1607-
ram attribute clusterRevision default = 3;
1623+
ram attribute clusterRevision default = 4;
1624+
}
1625+
1626+
server cluster LocalizationConfiguration {
1627+
ram attribute activeLocale;
1628+
callback attribute supportedLocales;
1629+
callback attribute generatedCommandList;
1630+
callback attribute acceptedCommandList;
1631+
callback attribute attributeList;
1632+
ram attribute featureMap default = 0;
1633+
ram attribute clusterRevision default = 1;
16081634
}
16091635

16101636
server cluster GeneralCommissioning {
@@ -1614,7 +1640,7 @@ endpoint 0 {
16141640
callback attribute locationCapability;
16151641
callback attribute supportsConcurrentConnection;
16161642
ram attribute featureMap default = 0;
1617-
ram attribute clusterRevision default = 0x0001;
1643+
ram attribute clusterRevision default = 0x0002;
16181644

16191645
handle command ArmFailSafe;
16201646
handle command ArmFailSafeResponse;
@@ -1627,8 +1653,6 @@ endpoint 0 {
16271653
server cluster NetworkCommissioning {
16281654
ram attribute maxNetworks;
16291655
callback attribute networks;
1630-
ram attribute scanMaxTimeSeconds;
1631-
ram attribute connectMaxTimeSeconds;
16321656
ram attribute interfaceEnabled;
16331657
ram attribute lastNetworkingStatus;
16341658
ram attribute lastNetworkID;
@@ -1652,6 +1676,7 @@ endpoint 0 {
16521676
ram attribute clusterRevision default = 1;
16531677

16541678
handle command RetrieveLogsRequest;
1679+
handle command RetrieveLogsResponse;
16551680
}
16561681

16571682
server cluster GeneralDiagnostics {
@@ -1728,7 +1753,7 @@ endpoint 0 {
17281753
}
17291754
}
17301755
endpoint 1 {
1731-
device type ma_robotic_vacuum_cleaner = 116, version 1;
1756+
device type ma_robotic_vacuum_cleaner = 116, version 3;
17321757

17331758

17341759
server cluster Identify {
@@ -1738,7 +1763,7 @@ endpoint 1 {
17381763
callback attribute acceptedCommandList;
17391764
callback attribute attributeList;
17401765
ram attribute featureMap default = 0;
1741-
ram attribute clusterRevision default = 4;
1766+
ram attribute clusterRevision default = 5;
17421767

17431768
handle command Identify;
17441769
handle command TriggerEffect;
@@ -1794,7 +1819,7 @@ endpoint 1 {
17941819
callback attribute acceptedCommandList;
17951820
callback attribute attributeList;
17961821
ram attribute featureMap default = 0;
1797-
ram attribute clusterRevision default = 1;
1822+
ram attribute clusterRevision default = 2;
17981823

17991824
handle command Pause;
18001825
handle command Resume;

‎examples/rvc-app/rvc-common/rvc-app.zap

+136-54
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
}
5555
],
5656
"deviceVersions": [
57-
1
57+
3
5858
],
5959
"deviceIdentifiers": [
6060
22
@@ -193,22 +193,6 @@
193193
"maxInterval": 65534,
194194
"reportableChange": 0
195195
},
196-
{
197-
"name": "Extension",
198-
"code": 1,
199-
"mfgCode": null,
200-
"side": "server",
201-
"type": "array",
202-
"included": 1,
203-
"storageOption": "External",
204-
"singleton": 0,
205-
"bounded": 0,
206-
"defaultValue": null,
207-
"reportable": 1,
208-
"minInterval": 1,
209-
"maxInterval": 65534,
210-
"reportableChange": 0
211-
},
212196
{
213197
"name": "SubjectsPerAccessControlEntry",
214198
"code": 2,
@@ -693,7 +677,7 @@
693677
"storageOption": "RAM",
694678
"singleton": 1,
695679
"bounded": 0,
696-
"defaultValue": "3",
680+
"defaultValue": "4",
697681
"reportable": 1,
698682
"minInterval": 0,
699683
"maxInterval": 65344,
@@ -724,6 +708,128 @@
724708
}
725709
]
726710
},
711+
{
712+
"name": "Localization Configuration",
713+
"code": 43,
714+
"mfgCode": null,
715+
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
716+
"side": "server",
717+
"enabled": 1,
718+
"attributes": [
719+
{
720+
"name": "ActiveLocale",
721+
"code": 0,
722+
"mfgCode": null,
723+
"side": "server",
724+
"type": "char_string",
725+
"included": 1,
726+
"storageOption": "RAM",
727+
"singleton": 0,
728+
"bounded": 0,
729+
"defaultValue": "",
730+
"reportable": 1,
731+
"minInterval": 1,
732+
"maxInterval": 65534,
733+
"reportableChange": 0
734+
},
735+
{
736+
"name": "SupportedLocales",
737+
"code": 1,
738+
"mfgCode": null,
739+
"side": "server",
740+
"type": "array",
741+
"included": 1,
742+
"storageOption": "External",
743+
"singleton": 0,
744+
"bounded": 0,
745+
"defaultValue": null,
746+
"reportable": 1,
747+
"minInterval": 1,
748+
"maxInterval": 65534,
749+
"reportableChange": 0
750+
},
751+
{
752+
"name": "GeneratedCommandList",
753+
"code": 65528,
754+
"mfgCode": null,
755+
"side": "server",
756+
"type": "array",
757+
"included": 1,
758+
"storageOption": "External",
759+
"singleton": 0,
760+
"bounded": 0,
761+
"defaultValue": null,
762+
"reportable": 1,
763+
"minInterval": 1,
764+
"maxInterval": 65534,
765+
"reportableChange": 0
766+
},
767+
{
768+
"name": "AcceptedCommandList",
769+
"code": 65529,
770+
"mfgCode": null,
771+
"side": "server",
772+
"type": "array",
773+
"included": 1,
774+
"storageOption": "External",
775+
"singleton": 0,
776+
"bounded": 0,
777+
"defaultValue": null,
778+
"reportable": 1,
779+
"minInterval": 1,
780+
"maxInterval": 65534,
781+
"reportableChange": 0
782+
},
783+
{
784+
"name": "AttributeList",
785+
"code": 65531,
786+
"mfgCode": null,
787+
"side": "server",
788+
"type": "array",
789+
"included": 1,
790+
"storageOption": "External",
791+
"singleton": 0,
792+
"bounded": 0,
793+
"defaultValue": null,
794+
"reportable": 1,
795+
"minInterval": 1,
796+
"maxInterval": 65534,
797+
"reportableChange": 0
798+
},
799+
{
800+
"name": "FeatureMap",
801+
"code": 65532,
802+
"mfgCode": null,
803+
"side": "server",
804+
"type": "bitmap32",
805+
"included": 1,
806+
"storageOption": "RAM",
807+
"singleton": 0,
808+
"bounded": 0,
809+
"defaultValue": "0",
810+
"reportable": 1,
811+
"minInterval": 1,
812+
"maxInterval": 65534,
813+
"reportableChange": 0
814+
},
815+
{
816+
"name": "ClusterRevision",
817+
"code": 65533,
818+
"mfgCode": null,
819+
"side": "server",
820+
"type": "int16u",
821+
"included": 1,
822+
"storageOption": "RAM",
823+
"singleton": 0,
824+
"bounded": 0,
825+
"defaultValue": "1",
826+
"reportable": 1,
827+
"minInterval": 1,
828+
"maxInterval": 65534,
829+
"reportableChange": 0
830+
}
831+
]
832+
},
727833
{
728834
"name": "General Commissioning",
729835
"code": 48,
@@ -888,7 +994,7 @@
888994
"storageOption": "RAM",
889995
"singleton": 0,
890996
"bounded": 0,
891-
"defaultValue": "0x0001",
997+
"defaultValue": "0x0002",
892998
"reportable": 1,
893999
"minInterval": 0,
8941000
"maxInterval": 65344,
@@ -1010,38 +1116,6 @@
10101116
"maxInterval": 65534,
10111117
"reportableChange": 0
10121118
},
1013-
{
1014-
"name": "ScanMaxTimeSeconds",
1015-
"code": 2,
1016-
"mfgCode": null,
1017-
"side": "server",
1018-
"type": "int8u",
1019-
"included": 1,
1020-
"storageOption": "RAM",
1021-
"singleton": 0,
1022-
"bounded": 0,
1023-
"defaultValue": "",
1024-
"reportable": 1,
1025-
"minInterval": 1,
1026-
"maxInterval": 65534,
1027-
"reportableChange": 0
1028-
},
1029-
{
1030-
"name": "ConnectMaxTimeSeconds",
1031-
"code": 3,
1032-
"mfgCode": null,
1033-
"side": "server",
1034-
"type": "int8u",
1035-
"included": 1,
1036-
"storageOption": "RAM",
1037-
"singleton": 0,
1038-
"bounded": 0,
1039-
"defaultValue": "",
1040-
"reportable": 1,
1041-
"minInterval": 1,
1042-
"maxInterval": 65534,
1043-
"reportableChange": 0
1044-
},
10451119
{
10461120
"name": "InterfaceEnabled",
10471121
"code": 4,
@@ -1155,6 +1229,14 @@
11551229
"source": "client",
11561230
"isIncoming": 1,
11571231
"isEnabled": 1
1232+
},
1233+
{
1234+
"name": "RetrieveLogsResponse",
1235+
"code": 1,
1236+
"mfgCode": null,
1237+
"source": "server",
1238+
"isIncoming": 0,
1239+
"isEnabled": 1
11581240
}
11591241
],
11601242
"attributes": [
@@ -1983,7 +2065,7 @@
19832065
}
19842066
],
19852067
"deviceVersions": [
1986-
1
2068+
3
19872069
],
19882070
"deviceIdentifiers": [
19892071
116
@@ -2124,7 +2206,7 @@
21242206
"storageOption": "RAM",
21252207
"singleton": 0,
21262208
"bounded": 0,
2127-
"defaultValue": "4",
2209+
"defaultValue": "5",
21282210
"reportable": 1,
21292211
"minInterval": 1,
21302212
"maxInterval": 65534,
@@ -2762,7 +2844,7 @@
27622844
"storageOption": "RAM",
27632845
"singleton": 0,
27642846
"bounded": 0,
2765-
"defaultValue": "1",
2847+
"defaultValue": "2",
27662848
"reportable": 1,
27672849
"minInterval": 1,
27682850
"maxInterval": 65534,

0 commit comments

Comments
 (0)