Skip to content

Commit 9118cab

Browse files
authored
Merge branch 'master' into disconnect_previous_network_when_trying_a_new
2 parents 75df75b + 01632c4 commit 9118cab

File tree

154 files changed

+1826
-13000
lines changed

Some content is hidden

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

154 files changed

+1826
-13000
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/all-clusters-app/all-clusters-common/all-clusters-app.matter

+108
Original file line numberDiff line numberDiff line change
@@ -2985,6 +2985,16 @@ cluster OvenMode = 73 {
29852985
revision 1;
29862986

29872987
enum ModeTag : enum16 {
2988+
kAuto = 0;
2989+
kQuick = 1;
2990+
kQuiet = 2;
2991+
kLowNoise = 3;
2992+
kLowEnergy = 4;
2993+
kVacation = 5;
2994+
kMin = 6;
2995+
kMax = 7;
2996+
kNight = 8;
2997+
kDay = 9;
29882998
kBake = 16384;
29892999
kConvection = 16385;
29903000
kGrill = 16386;
@@ -3106,6 +3116,16 @@ cluster LaundryWasherMode = 81 {
31063116
revision 2;
31073117

31083118
enum ModeTag : enum16 {
3119+
kAuto = 0;
3120+
kQuick = 1;
3121+
kQuiet = 2;
3122+
kLowNoise = 3;
3123+
kLowEnergy = 4;
3124+
kVacation = 5;
3125+
kMin = 6;
3126+
kMax = 7;
3127+
kNight = 8;
3128+
kDay = 9;
31093129
kNormal = 16384;
31103130
kDelicate = 16385;
31113131
kHeavy = 16386;
@@ -3157,6 +3177,16 @@ cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
31573177
revision 2;
31583178

31593179
enum ModeTag : enum16 {
3180+
kAuto = 0;
3181+
kQuick = 1;
3182+
kQuiet = 2;
3183+
kLowNoise = 3;
3184+
kLowEnergy = 4;
3185+
kVacation = 5;
3186+
kMin = 6;
3187+
kMax = 7;
3188+
kNight = 8;
3189+
kDay = 9;
31603190
kRapidCool = 16384;
31613191
kRapidFreeze = 16385;
31623192
}
@@ -3234,6 +3264,16 @@ cluster RvcRunMode = 84 {
32343264
revision 3;
32353265

32363266
enum ModeTag : enum16 {
3267+
kAuto = 0;
3268+
kQuick = 1;
3269+
kQuiet = 2;
3270+
kLowNoise = 3;
3271+
kLowEnergy = 4;
3272+
kVacation = 5;
3273+
kMin = 6;
3274+
kMax = 7;
3275+
kNight = 8;
3276+
kDay = 9;
32373277
kIdle = 16384;
32383278
kCleaning = 16385;
32393279
kMapping = 16386;
@@ -3293,6 +3333,16 @@ cluster RvcCleanMode = 85 {
32933333
revision 3;
32943334

32953335
enum ModeTag : enum16 {
3336+
kAuto = 0;
3337+
kQuick = 1;
3338+
kQuiet = 2;
3339+
kLowNoise = 3;
3340+
kLowEnergy = 4;
3341+
kVacation = 5;
3342+
kMin = 6;
3343+
kMax = 7;
3344+
kNight = 8;
3345+
kDay = 9;
32963346
kDeepClean = 16384;
32973347
kVacuum = 16385;
32983348
kMop = 16386;
@@ -3403,6 +3453,16 @@ cluster DishwasherMode = 89 {
34033453
revision 2;
34043454

34053455
enum ModeTag : enum16 {
3456+
kAuto = 0;
3457+
kQuick = 1;
3458+
kQuiet = 2;
3459+
kLowNoise = 3;
3460+
kLowEnergy = 4;
3461+
kVacation = 5;
3462+
kMin = 6;
3463+
kMax = 7;
3464+
kNight = 8;
3465+
kDay = 9;
34063466
kNormal = 16384;
34073467
kHeavy = 16385;
34083468
kLight = 16386;
@@ -3644,6 +3704,16 @@ cluster MicrowaveOvenMode = 94 {
36443704
revision 1;
36453705

36463706
enum ModeTag : enum16 {
3707+
kAuto = 0;
3708+
kQuick = 1;
3709+
kQuiet = 2;
3710+
kLowNoise = 3;
3711+
kLowEnergy = 4;
3712+
kVacation = 5;
3713+
kMin = 6;
3714+
kMax = 7;
3715+
kNight = 8;
3716+
kDay = 9;
36473717
kNormal = 16384;
36483718
kDefrost = 16385;
36493719
}
@@ -3744,6 +3814,10 @@ cluster RvcOperationalState = 97 {
37443814
revision 1;
37453815

37463816
enum ErrorStateEnum : enum8 {
3817+
kNoError = 0;
3818+
kUnableToStartOrResume = 1;
3819+
kUnableToCompleteOperation = 2;
3820+
kCommandInvalidInState = 3;
37473821
kFailedToFindChargingDock = 64;
37483822
kStuck = 65;
37493823
kDustBinMissing = 66;
@@ -3755,6 +3829,10 @@ cluster RvcOperationalState = 97 {
37553829
}
37563830

37573831
enum OperationalStateEnum : enum8 {
3832+
kStopped = 0;
3833+
kRunning = 1;
3834+
kPaused = 2;
3835+
kError = 3;
37583836
kSeekingCharger = 64;
37593837
kCharging = 65;
37603838
kDocked = 66;
@@ -4903,6 +4981,16 @@ cluster EnergyEvseMode = 157 {
49034981
revision 1;
49044982

49054983
enum ModeTag : enum16 {
4984+
kAuto = 0;
4985+
kQuick = 1;
4986+
kQuiet = 2;
4987+
kLowNoise = 3;
4988+
kLowEnergy = 4;
4989+
kVacation = 5;
4990+
kMin = 6;
4991+
kMax = 7;
4992+
kNight = 8;
4993+
kDay = 9;
49064994
kManual = 16384;
49074995
kTimeOfUse = 16385;
49084996
kSolarCharging = 16386;
@@ -4953,6 +5041,16 @@ cluster WaterHeaterMode = 158 {
49535041
revision 1;
49545042

49555043
enum ModeTag : enum16 {
5044+
kAuto = 0;
5045+
kQuick = 1;
5046+
kQuiet = 2;
5047+
kLowNoise = 3;
5048+
kLowEnergy = 4;
5049+
kVacation = 5;
5050+
kMin = 6;
5051+
kMax = 7;
5052+
kNight = 8;
5053+
kDay = 9;
49565054
kOff = 16384;
49575055
kManual = 16385;
49585056
kTimed = 16386;
@@ -5003,6 +5101,16 @@ provisional cluster DeviceEnergyManagementMode = 159 {
50035101
revision 1;
50045102

50055103
enum ModeTag : enum16 {
5104+
kAuto = 0;
5105+
kQuick = 1;
5106+
kQuiet = 2;
5107+
kLowNoise = 3;
5108+
kLowEnergy = 4;
5109+
kVacation = 5;
5110+
kMin = 6;
5111+
kMax = 7;
5112+
kNight = 8;
5113+
kDay = 9;
50065114
kNoOptimization = 16384;
50075115
kDeviceOptimization = 16385;
50085116
kLocalOptimization = 16386;

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;

0 commit comments

Comments
 (0)