Skip to content

Commit 1213484

Browse files
andy31415pull[bot]
authored andcommitted
Preserve acronyms in constant naming for bitmap and enum constants (#27523)
* Preserve acronyms in constant naming for bitmap and enum constants * Also update the names of enums/bitmaps. No diff here, but just in case things change * One more change to standardise on acronym preservation (even though noop currently on these changes)
1 parent 107abaf commit 1213484

File tree

51 files changed

+1814
-1814
lines changed

Some content is hidden

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

51 files changed

+1814
-1814
lines changed

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

+171-171
Large diffs are not rendered by default.

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

+79-79
Original file line numberDiff line numberDiff line change
@@ -447,8 +447,8 @@ server cluster Binding = 30 {
447447
cluster instances. */
448448
server cluster AccessControl = 31 {
449449
enum AccessControlEntryAuthModeEnum : ENUM8 {
450-
kPase = 1;
451-
kCase = 2;
450+
kPASE = 1;
451+
kCASE = 2;
452452
kGroup = 3;
453453
}
454454

@@ -690,7 +690,7 @@ client cluster OtaSoftwareUpdateProvider = 41 {
690690
enum OTADownloadProtocol : ENUM8 {
691691
kBDXSynchronous = 0;
692692
kBDXAsynchronous = 1;
693-
kHttps = 2;
693+
kHTTPS = 2;
694694
kVendorSpecific = 3;
695695
}
696696

@@ -964,7 +964,7 @@ server cluster PowerSource = 47 {
964964
}
965965

966966
enum BatChargeLevelEnum : ENUM8 {
967-
kOk = 0;
967+
kOK = 0;
968968
kWarning = 1;
969969
kCritical = 2;
970970
}
@@ -978,15 +978,15 @@ server cluster PowerSource = 47 {
978978

979979
enum BatCommonDesignationEnum : ENUM16 {
980980
kUnspecified = 0;
981-
kAaa = 1;
982-
kAa = 2;
981+
kAAA = 1;
982+
kAA = 2;
983983
kC = 3;
984984
kD = 4;
985985
k4v5 = 5;
986986
k6v0 = 6;
987987
k9v0 = 7;
988-
k12aa = 8;
989-
kAaaa = 9;
988+
k12AA = 8;
989+
kAAAA = 9;
990990
kA = 10;
991991
kB = 11;
992992
kF = 12;
@@ -995,9 +995,9 @@ server cluster PowerSource = 47 {
995995
kSubC = 15;
996996
kA23 = 16;
997997
kA27 = 17;
998-
kBa5800 = 18;
998+
kBA5800 = 18;
999999
kDuplex = 19;
1000-
k4sr44 = 20;
1000+
k4SR44 = 20;
10011001
k523 = 21;
10021002
k531 = 22;
10031003
k15v0 = 23;
@@ -1006,39 +1006,39 @@ server cluster PowerSource = 47 {
10061006
k45v0 = 26;
10071007
k67v5 = 27;
10081008
kJ = 28;
1009-
kCr123a = 29;
1010-
kCr2 = 30;
1011-
k2cr5 = 31;
1012-
kCrP2 = 32;
1013-
kCrV3 = 33;
1014-
kSr41 = 34;
1015-
kSr43 = 35;
1016-
kSr44 = 36;
1017-
kSr45 = 37;
1018-
kSr48 = 38;
1019-
kSr54 = 39;
1020-
kSr55 = 40;
1021-
kSr57 = 41;
1022-
kSr58 = 42;
1023-
kSr59 = 43;
1024-
kSr60 = 44;
1025-
kSr63 = 45;
1026-
kSr64 = 46;
1027-
kSr65 = 47;
1028-
kSr66 = 48;
1029-
kSr67 = 49;
1030-
kSr68 = 50;
1031-
kSr69 = 51;
1032-
kSr516 = 52;
1033-
kSr731 = 53;
1034-
kSr712 = 54;
1035-
kLr932 = 55;
1009+
kCR123A = 29;
1010+
kCR2 = 30;
1011+
k2CR5 = 31;
1012+
kCRP2 = 32;
1013+
kCRV3 = 33;
1014+
kSR41 = 34;
1015+
kSR43 = 35;
1016+
kSR44 = 36;
1017+
kSR45 = 37;
1018+
kSR48 = 38;
1019+
kSR54 = 39;
1020+
kSR55 = 40;
1021+
kSR57 = 41;
1022+
kSR58 = 42;
1023+
kSR59 = 43;
1024+
kSR60 = 44;
1025+
kSR63 = 45;
1026+
kSR64 = 46;
1027+
kSR65 = 47;
1028+
kSR66 = 48;
1029+
kSR67 = 49;
1030+
kSR68 = 50;
1031+
kSR69 = 51;
1032+
kSR516 = 52;
1033+
kSR731 = 53;
1034+
kSR712 = 54;
1035+
kLR932 = 55;
10361036
kA5 = 56;
10371037
kA10 = 57;
10381038
kA13 = 58;
10391039
kA312 = 59;
10401040
kA675 = 60;
1041-
kAc41e = 61;
1041+
kAC41E = 61;
10421042
k10180 = 62;
10431043
k10280 = 63;
10441044
k10440 = 64;
@@ -1048,7 +1048,7 @@ server cluster PowerSource = 47 {
10481048
k14650 = 68;
10491049
k15270 = 69;
10501050
k16340 = 70;
1051-
kRcr123a = 71;
1051+
kRCR123A = 71;
10521052
k17500 = 72;
10531053
k17670 = 73;
10541054
k18350 = 74;
@@ -1081,8 +1081,8 @@ server cluster PowerSource = 47 {
10811081
}
10821082

10831083
enum WiredCurrentTypeEnum : ENUM8 {
1084-
kAc = 0;
1085-
kDc = 1;
1084+
kAC = 0;
1085+
kDC = 1;
10861086
}
10871087

10881088
enum WiredFaultEnum : ENUM8 {
@@ -1142,7 +1142,7 @@ server cluster PowerSource = 47 {
11421142
/** This cluster is used to manage global aspects of the Commissioning flow. */
11431143
server cluster GeneralCommissioning = 48 {
11441144
enum CommissioningErrorEnum : ENUM8 {
1145-
kOk = 0;
1145+
kOK = 0;
11461146
kValueOutsideRange = 1;
11471147
kInvalidAuthentication = 2;
11481148
kNoFailSafe = 3;
@@ -1222,12 +1222,12 @@ server cluster NetworkCommissioning = 49 {
12221222
}
12231223

12241224
enum WiFiBandEnum : ENUM8 {
1225-
k2g4 = 0;
1226-
k3g65 = 1;
1227-
k5g = 2;
1228-
k6g = 3;
1229-
k60g = 4;
1230-
k1g = 5;
1225+
k2G4 = 0;
1226+
k3G65 = 1;
1227+
k5G = 2;
1228+
k6G = 3;
1229+
k60G = 4;
1230+
k1G = 5;
12311231
}
12321232

12331233
bitmap Feature : BITMAP32 {
@@ -1238,10 +1238,10 @@ server cluster NetworkCommissioning = 49 {
12381238

12391239
bitmap WiFiSecurityBitmap : BITMAP8 {
12401240
kUnencrypted = 0x1;
1241-
kWep = 0x2;
1242-
kWpaPersonal = 0x4;
1243-
kWpa2Personal = 0x8;
1244-
kWpa3Personal = 0x10;
1241+
kWEP = 0x2;
1242+
kWPAPersonal = 0x4;
1243+
kWPA2Personal = 0x8;
1244+
kWPA3Personal = 0x10;
12451245
}
12461246

12471247
struct NetworkInfoStruct {
@@ -1361,7 +1361,7 @@ server cluster DiagnosticLogs = 50 {
13611361

13621362
enum TransferProtocolEnum : ENUM8 {
13631363
kResponsePayload = 0;
1364-
kBdx = 1;
1364+
kBDX = 1;
13651365
}
13661366

13671367
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1526,7 +1526,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
15261526
kUnassigned = 1;
15271527
kSleepyEndDevice = 2;
15281528
kEndDevice = 3;
1529-
kReed = 4;
1529+
kREED = 4;
15301530
kRouter = 5;
15311531
kLeader = 6;
15321532
}
@@ -1639,10 +1639,10 @@ server cluster WiFiNetworkDiagnostics = 54 {
16391639
enum SecurityTypeEnum : ENUM8 {
16401640
kUnspecified = 0;
16411641
kNone = 1;
1642-
kWep = 2;
1643-
kWpa = 3;
1644-
kWpa2 = 4;
1645-
kWpa3 = 5;
1642+
kWEP = 2;
1643+
kWPA = 3;
1644+
kWPA2 = 4;
1645+
kWPA3 = 5;
16461646
}
16471647

16481648
enum WiFiVersionEnum : ENUM8 {
@@ -1692,7 +1692,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
16921692
kRate10M = 0;
16931693
kRate100M = 1;
16941694
kRate1G = 2;
1695-
kRate25g = 3;
1695+
kRate25G = 3;
16961696
kRate5G = 4;
16971697
kRate10G = 5;
16981698
kRate40G = 6;
@@ -1821,7 +1821,7 @@ server cluster OperationalCredentials = 62 {
18211821
}
18221822

18231823
enum NodeOperationalCertStatusEnum : ENUM8 {
1824-
kOk = 0;
1824+
kOK = 0;
18251825
kInvalidPublicKey = 1;
18261826
kInvalidNodeOpId = 2;
18271827
kInvalidNOC = 3;
@@ -2101,8 +2101,8 @@ server cluster DoorLock = 257 {
21012101

21022102
enum CredentialTypeEnum : ENUM8 {
21032103
kProgrammingPIN = 0;
2104-
kPin = 1;
2105-
kRfid = 2;
2104+
kPIN = 1;
2105+
kRFID = 2;
21062106
kFingerprint = 3;
21072107
kFingerVein = 4;
21082108
kFace = 5;
@@ -2213,8 +2213,8 @@ server cluster DoorLock = 257 {
22132213
kWeekDaySchedule = 3;
22142214
kYearDaySchedule = 4;
22152215
kHolidaySchedule = 5;
2216-
kPin = 6;
2217-
kRfid = 7;
2216+
kPIN = 6;
2217+
kRFID = 7;
22182218
kFingerprint = 8;
22192219
kFingerVein = 9;
22202220
kFace = 10;
@@ -2253,7 +2253,7 @@ server cluster DoorLock = 257 {
22532253
kButton = 5;
22542254
kSchedule = 6;
22552255
kRemote = 7;
2256-
kRfid = 8;
2256+
kRFID = 8;
22572257
kBiometric = 9;
22582258
}
22592259

@@ -2402,8 +2402,8 @@ server cluster DoorLock = 257 {
24022402
}
24032403

24042404
bitmap Feature : BITMAP32 {
2405-
kPinCredential = 0x1;
2406-
kRfidCredential = 0x2;
2405+
kPINCredential = 0x1;
2406+
kRFIDCredential = 0x2;
24072407
kFingerCredentials = 0x4;
24082408
kLogging = 0x8;
24092409
kWeekDayAccessSchedules = 0x10;
@@ -2932,7 +2932,7 @@ server cluster ColorControl = 768 {
29322932
kHueAndSaturation = 0x1;
29332933
kEnhancedHue = 0x2;
29342934
kColorLoop = 0x4;
2935-
kXy = 0x8;
2935+
kXY = 0x8;
29362936
kColorTemperature = 0x10;
29372937
}
29382938

@@ -2968,7 +2968,7 @@ server cluster BallastConfiguration = 769 {
29682968
server cluster IlluminanceMeasurement = 1024 {
29692969
enum LightSensorTypeEnum : ENUM8 {
29702970
kPhotodiode = 0;
2971-
kCmos = 1;
2971+
kCMOS = 1;
29722972
}
29732973

29742974
readonly attribute nullable int16u measuredValue = 0;
@@ -3041,7 +3041,7 @@ server cluster RelativeHumidityMeasurement = 1029 {
30413041
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
30423042
server cluster OccupancySensing = 1030 {
30433043
enum OccupancySensorTypeEnum : ENUM8 {
3044-
kPir = 0;
3044+
kPIR = 0;
30453045
kUltrasonic = 1;
30463046
kPIRAndUltrasonic = 2;
30473047
kPhysicalContact = 3;
@@ -3052,7 +3052,7 @@ server cluster OccupancySensing = 1030 {
30523052
}
30533053

30543054
bitmap OccupancySensorTypeBitmap : BITMAP8 {
3055-
kPir = 0x1;
3055+
kPIR = 0x1;
30563056
kUltrasonic = 0x2;
30573057
kPhysicalContact = 0x4;
30583058
}
@@ -3087,7 +3087,7 @@ server cluster Channel = 1284 {
30873087
}
30883088

30893089
enum LineupInfoTypeEnum : ENUM8 {
3090-
kMso = 0;
3090+
kMSO = 0;
30913091
}
30923092

30933093
bitmap Feature : BITMAP32 {
@@ -3217,13 +3217,13 @@ server cluster MediaInput = 1287 {
32173217
kAux = 1;
32183218
kCoax = 2;
32193219
kComposite = 3;
3220-
kHdmi = 4;
3220+
kHDMI = 4;
32213221
kInput = 5;
32223222
kLine = 6;
32233223
kOptical = 7;
32243224
kVideo = 8;
3225-
kScart = 9;
3226-
kUsb = 10;
3225+
kSCART = 9;
3226+
kUSB = 10;
32273227
kOther = 11;
32283228
}
32293229

@@ -3425,8 +3425,8 @@ server cluster ContentLauncher = 1290 {
34253425
}
34263426

34273427
bitmap SupportedStreamingProtocol : BITMAP32 {
3428-
kDash = 0x1;
3429-
kHls = 0x2;
3428+
kDASH = 0x1;
3429+
kHLS = 0x2;
34303430
}
34313431

34323432
struct DimensionStruct {
@@ -3476,8 +3476,8 @@ server cluster ContentLauncher = 1290 {
34763476
/** This cluster provides an interface for controlling the Output on a media device such as a TV. */
34773477
server cluster AudioOutput = 1291 {
34783478
enum OutputTypeEnum : ENUM8 {
3479-
kHdmi = 0;
3480-
kBt = 1;
3479+
kHDMI = 0;
3480+
kBT = 1;
34813481
kOptical = 2;
34823482
kHeadphone = 3;
34833483
kInternal = 4;

0 commit comments

Comments
 (0)