Skip to content

Commit 443e2d5

Browse files
Sarthak-ShahaSarthak-Shaha
authored
Merge branch 'master' into silabs/add_air_quality_app
2 parents 725c4ef + 78830a0 commit 443e2d5

File tree

113 files changed

+373
-12466
lines changed

Some content is hidden

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

113 files changed

+373
-12466
lines changed

‎.github/.wordlist.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1532,6 +1532,7 @@ virtualenv
15321532
visualstudio
15331533
vlatest
15341534
VLEDs
1535+
vm
15351536
vn
15361537
vnc
15371538
vous

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

-76
Original file line numberDiff line numberDiff line change
@@ -988,67 +988,6 @@ cluster OtaSoftwareUpdateRequestor = 42 {
988988
command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0;
989989
}
990990

991-
/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
992-
may have differing common languages, units of measurements, and numerical formatting
993-
standards. As such, Nodes that visually or audibly convey information need a mechanism by which
994-
they can be configured to use a user’s preferred language, units, etc */
995-
cluster LocalizationConfiguration = 43 {
996-
revision 1; // NOTE: Default/not specifically set
997-
998-
attribute access(write: manage) char_string<35> activeLocale = 0;
999-
readonly attribute char_string supportedLocales[] = 1;
1000-
readonly attribute command_id generatedCommandList[] = 65528;
1001-
readonly attribute command_id acceptedCommandList[] = 65529;
1002-
readonly attribute event_id eventList[] = 65530;
1003-
readonly attribute attrib_id attributeList[] = 65531;
1004-
readonly attribute bitmap32 featureMap = 65532;
1005-
readonly attribute int16u clusterRevision = 65533;
1006-
}
1007-
1008-
/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
1009-
may have differing preferences for how dates and times are conveyed. As such, Nodes that visually
1010-
or audibly convey time information need a mechanism by which they can be configured to use a
1011-
user’s preferred format. */
1012-
cluster TimeFormatLocalization = 44 {
1013-
revision 1; // NOTE: Default/not specifically set
1014-
1015-
enum CalendarTypeEnum : enum8 {
1016-
kBuddhist = 0;
1017-
kChinese = 1;
1018-
kCoptic = 2;
1019-
kEthiopian = 3;
1020-
kGregorian = 4;
1021-
kHebrew = 5;
1022-
kIndian = 6;
1023-
kIslamic = 7;
1024-
kJapanese = 8;
1025-
kKorean = 9;
1026-
kPersian = 10;
1027-
kTaiwanese = 11;
1028-
kUseActiveLocale = 255;
1029-
}
1030-
1031-
enum HourFormatEnum : enum8 {
1032-
k12hr = 0;
1033-
k24hr = 1;
1034-
kUseActiveLocale = 255;
1035-
}
1036-
1037-
bitmap Feature : bitmap32 {
1038-
kCalendarFormat = 0x1;
1039-
}
1040-
1041-
attribute access(write: manage) HourFormatEnum hourFormat = 0;
1042-
attribute access(write: manage) optional CalendarTypeEnum activeCalendarType = 1;
1043-
readonly attribute optional CalendarTypeEnum supportedCalendarTypes[] = 2;
1044-
readonly attribute command_id generatedCommandList[] = 65528;
1045-
readonly attribute command_id acceptedCommandList[] = 65529;
1046-
readonly attribute event_id eventList[] = 65530;
1047-
readonly attribute attrib_id attributeList[] = 65531;
1048-
readonly attribute bitmap32 featureMap = 65532;
1049-
readonly attribute int16u clusterRevision = 65533;
1050-
}
1051-
1052991
/** This cluster is used to manage global aspects of the Commissioning flow. */
1053992
cluster GeneralCommissioning = 48 {
1054993
revision 1; // NOTE: Default/not specifically set
@@ -2047,21 +1986,6 @@ endpoint 0 {
20471986
handle command AnnounceOTAProvider;
20481987
}
20491988

2050-
server cluster LocalizationConfiguration {
2051-
callback attribute activeLocale;
2052-
callback attribute supportedLocales;
2053-
ram attribute featureMap default = 0;
2054-
ram attribute clusterRevision default = 1;
2055-
}
2056-
2057-
server cluster TimeFormatLocalization {
2058-
persist attribute hourFormat default = 0;
2059-
persist attribute activeCalendarType default = 0;
2060-
callback attribute supportedCalendarTypes;
2061-
ram attribute featureMap default = 0;
2062-
ram attribute clusterRevision default = 1;
2063-
}
2064-
20651989
server cluster GeneralCommissioning {
20661990
ram attribute breadcrumb default = 0x0000000000000000;
20671991
callback attribute basicCommissioningInfo;

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap

-164
Original file line numberDiff line numberDiff line change
@@ -929,170 +929,6 @@
929929
}
930930
]
931931
},
932-
{
933-
"name": "Localization Configuration",
934-
"code": 43,
935-
"mfgCode": null,
936-
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
937-
"side": "server",
938-
"enabled": 1,
939-
"attributes": [
940-
{
941-
"name": "ActiveLocale",
942-
"code": 0,
943-
"mfgCode": null,
944-
"side": "server",
945-
"type": "char_string",
946-
"included": 1,
947-
"storageOption": "External",
948-
"singleton": 0,
949-
"bounded": 0,
950-
"defaultValue": "",
951-
"reportable": 1,
952-
"minInterval": 1,
953-
"maxInterval": 65534,
954-
"reportableChange": 0
955-
},
956-
{
957-
"name": "SupportedLocales",
958-
"code": 1,
959-
"mfgCode": null,
960-
"side": "server",
961-
"type": "array",
962-
"included": 1,
963-
"storageOption": "External",
964-
"singleton": 0,
965-
"bounded": 0,
966-
"defaultValue": null,
967-
"reportable": 1,
968-
"minInterval": 1,
969-
"maxInterval": 65534,
970-
"reportableChange": 0
971-
},
972-
{
973-
"name": "FeatureMap",
974-
"code": 65532,
975-
"mfgCode": null,
976-
"side": "server",
977-
"type": "bitmap32",
978-
"included": 1,
979-
"storageOption": "RAM",
980-
"singleton": 0,
981-
"bounded": 0,
982-
"defaultValue": "0",
983-
"reportable": 1,
984-
"minInterval": 1,
985-
"maxInterval": 65534,
986-
"reportableChange": 0
987-
},
988-
{
989-
"name": "ClusterRevision",
990-
"code": 65533,
991-
"mfgCode": null,
992-
"side": "server",
993-
"type": "int16u",
994-
"included": 1,
995-
"storageOption": "RAM",
996-
"singleton": 0,
997-
"bounded": 0,
998-
"defaultValue": "1",
999-
"reportable": 1,
1000-
"minInterval": 1,
1001-
"maxInterval": 65534,
1002-
"reportableChange": 0
1003-
}
1004-
]
1005-
},
1006-
{
1007-
"name": "Time Format Localization",
1008-
"code": 44,
1009-
"mfgCode": null,
1010-
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
1011-
"side": "server",
1012-
"enabled": 1,
1013-
"attributes": [
1014-
{
1015-
"name": "HourFormat",
1016-
"code": 0,
1017-
"mfgCode": null,
1018-
"side": "server",
1019-
"type": "HourFormatEnum",
1020-
"included": 1,
1021-
"storageOption": "NVM",
1022-
"singleton": 0,
1023-
"bounded": 0,
1024-
"defaultValue": "0",
1025-
"reportable": 1,
1026-
"minInterval": 1,
1027-
"maxInterval": 65534,
1028-
"reportableChange": 0
1029-
},
1030-
{
1031-
"name": "ActiveCalendarType",
1032-
"code": 1,
1033-
"mfgCode": null,
1034-
"side": "server",
1035-
"type": "CalendarTypeEnum",
1036-
"included": 1,
1037-
"storageOption": "NVM",
1038-
"singleton": 0,
1039-
"bounded": 0,
1040-
"defaultValue": "0",
1041-
"reportable": 1,
1042-
"minInterval": 1,
1043-
"maxInterval": 65534,
1044-
"reportableChange": 0
1045-
},
1046-
{
1047-
"name": "SupportedCalendarTypes",
1048-
"code": 2,
1049-
"mfgCode": null,
1050-
"side": "server",
1051-
"type": "array",
1052-
"included": 1,
1053-
"storageOption": "External",
1054-
"singleton": 0,
1055-
"bounded": 0,
1056-
"defaultValue": null,
1057-
"reportable": 1,
1058-
"minInterval": 1,
1059-
"maxInterval": 65534,
1060-
"reportableChange": 0
1061-
},
1062-
{
1063-
"name": "FeatureMap",
1064-
"code": 65532,
1065-
"mfgCode": null,
1066-
"side": "server",
1067-
"type": "bitmap32",
1068-
"included": 1,
1069-
"storageOption": "RAM",
1070-
"singleton": 0,
1071-
"bounded": 0,
1072-
"defaultValue": "0",
1073-
"reportable": 1,
1074-
"minInterval": 1,
1075-
"maxInterval": 65534,
1076-
"reportableChange": 0
1077-
},
1078-
{
1079-
"name": "ClusterRevision",
1080-
"code": 65533,
1081-
"mfgCode": null,
1082-
"side": "server",
1083-
"type": "int16u",
1084-
"included": 1,
1085-
"storageOption": "RAM",
1086-
"singleton": 0,
1087-
"bounded": 0,
1088-
"defaultValue": "1",
1089-
"reportable": 1,
1090-
"minInterval": 1,
1091-
"maxInterval": 65534,
1092-
"reportableChange": 0
1093-
}
1094-
]
1095-
},
1096932
{
1097933
"name": "General Commissioning",
1098934
"code": 48,

‎examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter

-74
Original file line numberDiff line numberDiff line change
@@ -693,67 +693,6 @@ cluster OtaSoftwareUpdateRequestor = 42 {
693693
command AnnounceOTAProvider(AnnounceOTAProviderRequest): DefaultSuccess = 0;
694694
}
695695

696-
/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
697-
may have differing common languages, units of measurements, and numerical formatting
698-
standards. As such, Nodes that visually or audibly convey information need a mechanism by which
699-
they can be configured to use a user’s preferred language, units, etc */
700-
cluster LocalizationConfiguration = 43 {
701-
revision 1; // NOTE: Default/not specifically set
702-
703-
attribute access(write: manage) char_string<35> activeLocale = 0;
704-
readonly attribute char_string supportedLocales[] = 1;
705-
readonly attribute command_id generatedCommandList[] = 65528;
706-
readonly attribute command_id acceptedCommandList[] = 65529;
707-
readonly attribute event_id eventList[] = 65530;
708-
readonly attribute attrib_id attributeList[] = 65531;
709-
readonly attribute bitmap32 featureMap = 65532;
710-
readonly attribute int16u clusterRevision = 65533;
711-
}
712-
713-
/** Nodes should be expected to be deployed to any and all regions of the world. These global regions
714-
may have differing preferences for how dates and times are conveyed. As such, Nodes that visually
715-
or audibly convey time information need a mechanism by which they can be configured to use a
716-
user’s preferred format. */
717-
cluster TimeFormatLocalization = 44 {
718-
revision 1; // NOTE: Default/not specifically set
719-
720-
enum CalendarTypeEnum : enum8 {
721-
kBuddhist = 0;
722-
kChinese = 1;
723-
kCoptic = 2;
724-
kEthiopian = 3;
725-
kGregorian = 4;
726-
kHebrew = 5;
727-
kIndian = 6;
728-
kIslamic = 7;
729-
kJapanese = 8;
730-
kKorean = 9;
731-
kPersian = 10;
732-
kTaiwanese = 11;
733-
kUseActiveLocale = 255;
734-
}
735-
736-
enum HourFormatEnum : enum8 {
737-
k12hr = 0;
738-
k24hr = 1;
739-
kUseActiveLocale = 255;
740-
}
741-
742-
bitmap Feature : bitmap32 {
743-
kCalendarFormat = 0x1;
744-
}
745-
746-
attribute access(write: manage) HourFormatEnum hourFormat = 0;
747-
attribute access(write: manage) optional CalendarTypeEnum activeCalendarType = 1;
748-
readonly attribute optional CalendarTypeEnum supportedCalendarTypes[] = 2;
749-
readonly attribute command_id generatedCommandList[] = 65528;
750-
readonly attribute command_id acceptedCommandList[] = 65529;
751-
readonly attribute event_id eventList[] = 65530;
752-
readonly attribute attrib_id attributeList[] = 65531;
753-
readonly attribute bitmap32 featureMap = 65532;
754-
readonly attribute int16u clusterRevision = 65533;
755-
}
756-
757696
/** This cluster is used to describe the configuration and capabilities of a physical power source that provides power to the Node. */
758697
cluster PowerSource = 47 {
759698
revision 1; // NOTE: Default/not specifically set
@@ -2474,19 +2413,6 @@ endpoint 0 {
24742413
handle command AnnounceOTAProvider;
24752414
}
24762415

2477-
server cluster LocalizationConfiguration {
2478-
ram attribute activeLocale;
2479-
callback attribute supportedLocales;
2480-
ram attribute featureMap default = 0;
2481-
ram attribute clusterRevision default = 1;
2482-
}
2483-
2484-
server cluster TimeFormatLocalization {
2485-
persist attribute hourFormat default = 0;
2486-
ram attribute featureMap default = 0;
2487-
ram attribute clusterRevision default = 1;
2488-
}
2489-
24902416
server cluster GeneralCommissioning {
24912417
ram attribute breadcrumb default = 0x0000000000000000;
24922418
callback attribute basicCommissioningInfo;

0 commit comments

Comments
 (0)