Skip to content

Commit

Permalink
Ensure all derived clusters have the base enum values (project-chip#3…
Browse files Browse the repository at this point in the history
…5489)

- OperationalState and ModeBase cluster enum values did not
  include the base enums values. This causes all sorts of
  pain for anything based on .matter files or code-gened
  enum values.
- This PR fixes the situation in the short term by having the ZAP
  XML include the necessary values

Testing done:

- No changes of values, only added values
  • Loading branch information
tcarmelveilleux authored Sep 10, 2024
1 parent 3f0f242 commit 2d0135d
Show file tree
Hide file tree
Showing 26 changed files with 1,023 additions and 95 deletions.
108 changes: 108 additions & 0 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -2985,6 +2985,16 @@ cluster OvenMode = 73 {
revision 1;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kBake = 16384;
kConvection = 16385;
kGrill = 16386;
Expand Down Expand Up @@ -3106,6 +3116,16 @@ cluster LaundryWasherMode = 81 {
revision 2;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kNormal = 16384;
kDelicate = 16385;
kHeavy = 16386;
Expand Down Expand Up @@ -3157,6 +3177,16 @@ cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
revision 2;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kRapidCool = 16384;
kRapidFreeze = 16385;
}
Expand Down Expand Up @@ -3234,6 +3264,16 @@ cluster RvcRunMode = 84 {
revision 3;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kIdle = 16384;
kCleaning = 16385;
kMapping = 16386;
Expand Down Expand Up @@ -3293,6 +3333,16 @@ cluster RvcCleanMode = 85 {
revision 3;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kDeepClean = 16384;
kVacuum = 16385;
kMop = 16386;
Expand Down Expand Up @@ -3403,6 +3453,16 @@ cluster DishwasherMode = 89 {
revision 2;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kNormal = 16384;
kHeavy = 16385;
kLight = 16386;
Expand Down Expand Up @@ -3644,6 +3704,16 @@ cluster MicrowaveOvenMode = 94 {
revision 1;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kNormal = 16384;
kDefrost = 16385;
}
Expand Down Expand Up @@ -3744,6 +3814,10 @@ cluster RvcOperationalState = 97 {
revision 1;

enum ErrorStateEnum : enum8 {
kNoError = 0;
kUnableToStartOrResume = 1;
kUnableToCompleteOperation = 2;
kCommandInvalidInState = 3;
kFailedToFindChargingDock = 64;
kStuck = 65;
kDustBinMissing = 66;
Expand All @@ -3755,6 +3829,10 @@ cluster RvcOperationalState = 97 {
}

enum OperationalStateEnum : enum8 {
kStopped = 0;
kRunning = 1;
kPaused = 2;
kError = 3;
kSeekingCharger = 64;
kCharging = 65;
kDocked = 66;
Expand Down Expand Up @@ -4903,6 +4981,16 @@ cluster EnergyEvseMode = 157 {
revision 1;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kManual = 16384;
kTimeOfUse = 16385;
kSolarCharging = 16386;
Expand Down Expand Up @@ -4953,6 +5041,16 @@ cluster WaterHeaterMode = 158 {
revision 1;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kOff = 16384;
kManual = 16385;
kTimed = 16386;
Expand Down Expand Up @@ -5003,6 +5101,16 @@ provisional cluster DeviceEnergyManagementMode = 159 {
revision 1;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kNoOptimization = 16384;
kDeviceOptimization = 16385;
kLocalOptimization = 16386;
Expand Down
10 changes: 10 additions & 0 deletions examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1303,6 +1303,16 @@ cluster LaundryWasherMode = 81 {
revision 2;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kNormal = 16384;
kDelicate = 16385;
kHeavy = 16386;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,16 @@ cluster RvcRunMode = 84 {
revision 3;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kIdle = 16384;
kCleaning = 16385;
kMapping = 16386;
Expand Down Expand Up @@ -1642,6 +1652,16 @@ cluster RvcCleanMode = 85 {
revision 3;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kDeepClean = 16384;
kVacuum = 16385;
kMop = 16386;
Expand Down Expand Up @@ -1694,6 +1714,10 @@ cluster RvcOperationalState = 97 {
revision 1;

enum ErrorStateEnum : enum8 {
kNoError = 0;
kUnableToStartOrResume = 1;
kUnableToCompleteOperation = 2;
kCommandInvalidInState = 3;
kFailedToFindChargingDock = 64;
kStuck = 65;
kDustBinMissing = 66;
Expand All @@ -1705,6 +1729,10 @@ cluster RvcOperationalState = 97 {
}

enum OperationalStateEnum : enum8 {
kStopped = 0;
kRunning = 1;
kPaused = 2;
kError = 3;
kSeekingCharger = 64;
kCharging = 65;
kDocked = 66;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2222,6 +2222,16 @@ cluster EnergyEvseMode = 157 {
revision 1;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kManual = 16384;
kTimeOfUse = 16385;
kSolarCharging = 16386;
Expand Down Expand Up @@ -2272,6 +2282,16 @@ cluster WaterHeaterMode = 158 {
revision 1;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kOff = 16384;
kManual = 16385;
kTimed = 16386;
Expand Down Expand Up @@ -2322,6 +2342,16 @@ provisional cluster DeviceEnergyManagementMode = 159 {
revision 1;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kNoOptimization = 16384;
kDeviceOptimization = 16385;
kLocalOptimization = 16386;
Expand Down
10 changes: 10 additions & 0 deletions examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1963,6 +1963,16 @@ cluster LaundryWasherMode = 81 {
revision 2;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kNormal = 16384;
kDelicate = 16385;
kHeavy = 16386;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1321,6 +1321,16 @@ cluster MicrowaveOvenMode = 94 {
revision 1;

enum ModeTag : enum16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
kNormal = 16384;
kDefrost = 16385;
}
Expand Down
Loading

0 comments on commit 2d0135d

Please sign in to comment.