Skip to content

Commit

Permalink
Regenerate generated code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bzbarsky-apple
bzbarsky-apple committed Feb 21, 2023
1 parent fe0d96d commit d364f0d
Show file tree
Hide file tree
Showing 20 changed files with 367 additions and 298 deletions.
18 changes: 9 additions & 9 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2700,7 +2700,7 @@ server cluster BarrierControl = 259 {
}

server cluster PumpConfigurationAndControl = 512 {
enum PumpControlMode : ENUM8 {
enum ControlModeEnum : ENUM8 {
kConstantSpeed = 0;
kConstantPressure = 1;
kProportionalPressure = 2;
Expand All @@ -2709,7 +2709,7 @@ server cluster PumpConfigurationAndControl = 512 {
kAutomatic = 7;
}

enum PumpOperationMode : ENUM8 {
enum OperationModeEnum : ENUM8 {
kNormal = 0;
kMinimum = 1;
kMaximum = 2;
Expand All @@ -2723,10 +2723,10 @@ server cluster PumpConfigurationAndControl = 512 {
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
kLocalOperation = 0x40;
}

bitmap PumpStatus : BITMAP16 {
bitmap PumpStatusBitmap : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSpeedLow = 0x4;
Expand Down Expand Up @@ -2802,16 +2802,16 @@ server cluster PumpConfigurationAndControl = 512 {
readonly attribute nullable int16u maxConstFlow = 10;
readonly attribute nullable int16s minConstTemp = 11;
readonly attribute nullable int16s maxConstTemp = 12;
readonly attribute PumpStatus pumpStatus = 16;
readonly attribute PumpOperationMode effectiveOperationMode = 17;
readonly attribute PumpControlMode effectiveControlMode = 18;
readonly attribute PumpStatusBitmap pumpStatus = 16;
readonly attribute OperationModeEnum effectiveOperationMode = 17;
readonly attribute ControlModeEnum effectiveControlMode = 18;
readonly attribute nullable int16s capacity = 19;
readonly attribute nullable int16u speed = 20;
attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
readonly attribute nullable int24u power = 22;
attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
attribute access(write: manage) PumpOperationMode operationMode = 32;
attribute access(write: manage) PumpControlMode controlMode = 33;
attribute access(write: manage) OperationModeEnum operationMode = 32;
attribute access(write: manage) ControlModeEnum controlMode = 33;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
14 changes: 7 additions & 7 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2299,7 +2299,7 @@ server cluster WindowCovering = 258 {
}

server cluster PumpConfigurationAndControl = 512 {
enum PumpControlMode : ENUM8 {
enum ControlModeEnum : ENUM8 {
kConstantSpeed = 0;
kConstantPressure = 1;
kProportionalPressure = 2;
Expand All @@ -2308,7 +2308,7 @@ server cluster PumpConfigurationAndControl = 512 {
kAutomatic = 7;
}

enum PumpOperationMode : ENUM8 {
enum OperationModeEnum : ENUM8 {
kNormal = 0;
kMinimum = 1;
kMaximum = 2;
Expand All @@ -2322,10 +2322,10 @@ server cluster PumpConfigurationAndControl = 512 {
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
kLocalOperation = 0x40;
}

bitmap PumpStatus : BITMAP16 {
bitmap PumpStatusBitmap : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSpeedLow = 0x4;
Expand Down Expand Up @@ -2393,10 +2393,10 @@ server cluster PumpConfigurationAndControl = 512 {
readonly attribute nullable int16u maxFlow = 2;
readonly attribute nullable int16s minConstPressure = 3;
readonly attribute nullable int16s maxConstPressure = 4;
readonly attribute PumpOperationMode effectiveOperationMode = 17;
readonly attribute PumpControlMode effectiveControlMode = 18;
readonly attribute OperationModeEnum effectiveOperationMode = 17;
readonly attribute ControlModeEnum effectiveControlMode = 18;
readonly attribute nullable int16s capacity = 19;
attribute access(write: manage) PumpOperationMode operationMode = 32;
attribute access(write: manage) OperationModeEnum operationMode = 32;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
18 changes: 9 additions & 9 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1902,7 +1902,7 @@ server cluster WindowCovering = 258 {
}

server cluster PumpConfigurationAndControl = 512 {
enum PumpControlMode : ENUM8 {
enum ControlModeEnum : ENUM8 {
kConstantSpeed = 0;
kConstantPressure = 1;
kProportionalPressure = 2;
Expand All @@ -1911,7 +1911,7 @@ server cluster PumpConfigurationAndControl = 512 {
kAutomatic = 7;
}

enum PumpOperationMode : ENUM8 {
enum OperationModeEnum : ENUM8 {
kNormal = 0;
kMinimum = 1;
kMaximum = 2;
Expand All @@ -1925,10 +1925,10 @@ server cluster PumpConfigurationAndControl = 512 {
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
kLocalOperation = 0x40;
}

bitmap PumpStatus : BITMAP16 {
bitmap PumpStatusBitmap : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSpeedLow = 0x4;
Expand Down Expand Up @@ -2004,16 +2004,16 @@ server cluster PumpConfigurationAndControl = 512 {
readonly attribute nullable int16u maxConstFlow = 10;
readonly attribute nullable int16s minConstTemp = 11;
readonly attribute nullable int16s maxConstTemp = 12;
readonly attribute PumpStatus pumpStatus = 16;
readonly attribute PumpOperationMode effectiveOperationMode = 17;
readonly attribute PumpControlMode effectiveControlMode = 18;
readonly attribute PumpStatusBitmap pumpStatus = 16;
readonly attribute OperationModeEnum effectiveOperationMode = 17;
readonly attribute ControlModeEnum effectiveControlMode = 18;
readonly attribute nullable int16s capacity = 19;
readonly attribute nullable int16u speed = 20;
attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
readonly attribute nullable int24u power = 22;
attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
attribute access(write: manage) PumpOperationMode operationMode = 32;
attribute access(write: manage) PumpControlMode controlMode = 33;
attribute access(write: manage) OperationModeEnum operationMode = 32;
attribute access(write: manage) ControlModeEnum controlMode = 33;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
18 changes: 9 additions & 9 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1871,7 +1871,7 @@ server cluster WindowCovering = 258 {
}

server cluster PumpConfigurationAndControl = 512 {
enum PumpControlMode : ENUM8 {
enum ControlModeEnum : ENUM8 {
kConstantSpeed = 0;
kConstantPressure = 1;
kProportionalPressure = 2;
Expand All @@ -1880,7 +1880,7 @@ server cluster PumpConfigurationAndControl = 512 {
kAutomatic = 7;
}

enum PumpOperationMode : ENUM8 {
enum OperationModeEnum : ENUM8 {
kNormal = 0;
kMinimum = 1;
kMaximum = 2;
Expand All @@ -1894,10 +1894,10 @@ server cluster PumpConfigurationAndControl = 512 {
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
kLocalOperation = 0x40;
}

bitmap PumpStatus : BITMAP16 {
bitmap PumpStatusBitmap : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSpeedLow = 0x4;
Expand Down Expand Up @@ -1973,16 +1973,16 @@ server cluster PumpConfigurationAndControl = 512 {
readonly attribute nullable int16u maxConstFlow = 10;
readonly attribute nullable int16s minConstTemp = 11;
readonly attribute nullable int16s maxConstTemp = 12;
readonly attribute PumpStatus pumpStatus = 16;
readonly attribute PumpOperationMode effectiveOperationMode = 17;
readonly attribute PumpControlMode effectiveControlMode = 18;
readonly attribute PumpStatusBitmap pumpStatus = 16;
readonly attribute OperationModeEnum effectiveOperationMode = 17;
readonly attribute ControlModeEnum effectiveControlMode = 18;
readonly attribute nullable int16s capacity = 19;
readonly attribute nullable int16u speed = 20;
attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
readonly attribute nullable int24u power = 22;
attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
attribute access(write: manage) PumpOperationMode operationMode = 32;
attribute access(write: manage) PumpControlMode controlMode = 33;
attribute access(write: manage) OperationModeEnum operationMode = 32;
attribute access(write: manage) ControlModeEnum controlMode = 33;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
18 changes: 9 additions & 9 deletions examples/pump-app/pump-common/pump-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ server cluster GroupKeyManagement = 63 {
}

server cluster PumpConfigurationAndControl = 512 {
enum PumpControlMode : ENUM8 {
enum ControlModeEnum : ENUM8 {
kConstantSpeed = 0;
kConstantPressure = 1;
kProportionalPressure = 2;
Expand All @@ -1120,7 +1120,7 @@ server cluster PumpConfigurationAndControl = 512 {
kAutomatic = 7;
}

enum PumpOperationMode : ENUM8 {
enum OperationModeEnum : ENUM8 {
kNormal = 0;
kMinimum = 1;
kMaximum = 2;
Expand All @@ -1134,10 +1134,10 @@ server cluster PumpConfigurationAndControl = 512 {
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
kLocalOperation = 0x40;
}

bitmap PumpStatus : BITMAP16 {
bitmap PumpStatusBitmap : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSpeedLow = 0x4;
Expand Down Expand Up @@ -1213,16 +1213,16 @@ server cluster PumpConfigurationAndControl = 512 {
readonly attribute nullable int16u maxConstFlow = 10;
readonly attribute nullable int16s minConstTemp = 11;
readonly attribute nullable int16s maxConstTemp = 12;
readonly attribute PumpStatus pumpStatus = 16;
readonly attribute PumpOperationMode effectiveOperationMode = 17;
readonly attribute PumpControlMode effectiveControlMode = 18;
readonly attribute PumpStatusBitmap pumpStatus = 16;
readonly attribute OperationModeEnum effectiveOperationMode = 17;
readonly attribute ControlModeEnum effectiveControlMode = 18;
readonly attribute nullable int16s capacity = 19;
readonly attribute nullable int16u speed = 20;
attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
readonly attribute nullable int24u power = 22;
attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
attribute access(write: manage) PumpOperationMode operationMode = 32;
attribute access(write: manage) PumpControlMode controlMode = 33;
attribute access(write: manage) OperationModeEnum operationMode = 32;
attribute access(write: manage) ControlModeEnum controlMode = 33;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
14 changes: 7 additions & 7 deletions examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@ server cluster GroupKeyManagement = 63 {
}

client cluster PumpConfigurationAndControl = 512 {
enum PumpControlMode : ENUM8 {
enum ControlModeEnum : ENUM8 {
kConstantSpeed = 0;
kConstantPressure = 1;
kProportionalPressure = 2;
Expand All @@ -1022,7 +1022,7 @@ client cluster PumpConfigurationAndControl = 512 {
kAutomatic = 7;
}

enum PumpOperationMode : ENUM8 {
enum OperationModeEnum : ENUM8 {
kNormal = 0;
kMinimum = 1;
kMaximum = 2;
Expand All @@ -1036,10 +1036,10 @@ client cluster PumpConfigurationAndControl = 512 {
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
kLocalOperation = 0x40;
}

bitmap PumpStatus : BITMAP16 {
bitmap PumpStatusBitmap : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSpeedLow = 0x4;
Expand Down Expand Up @@ -1105,10 +1105,10 @@ client cluster PumpConfigurationAndControl = 512 {
readonly attribute nullable int16s maxPressure = 0;
readonly attribute nullable int16u maxSpeed = 1;
readonly attribute nullable int16u maxFlow = 2;
readonly attribute PumpOperationMode effectiveOperationMode = 17;
readonly attribute PumpControlMode effectiveControlMode = 18;
readonly attribute OperationModeEnum effectiveOperationMode = 17;
readonly attribute ControlModeEnum effectiveControlMode = 18;
readonly attribute nullable int16s capacity = 19;
attribute access(write: manage) PumpOperationMode operationMode = 32;
attribute access(write: manage) OperationModeEnum operationMode = 32;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
18 changes: 9 additions & 9 deletions src/controller/data_model/controller-clusters.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2861,7 +2861,7 @@ client cluster BarrierControl = 259 {
}

client cluster PumpConfigurationAndControl = 512 {
enum PumpControlMode : ENUM8 {
enum ControlModeEnum : ENUM8 {
kConstantSpeed = 0;
kConstantPressure = 1;
kProportionalPressure = 2;
Expand All @@ -2870,7 +2870,7 @@ client cluster PumpConfigurationAndControl = 512 {
kAutomatic = 7;
}

enum PumpOperationMode : ENUM8 {
enum OperationModeEnum : ENUM8 {
kNormal = 0;
kMinimum = 1;
kMaximum = 2;
Expand All @@ -2884,10 +2884,10 @@ client cluster PumpConfigurationAndControl = 512 {
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
kLocalOperation = 0x40;
}

bitmap PumpStatus : BITMAP16 {
bitmap PumpStatusBitmap : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSpeedLow = 0x4;
Expand Down Expand Up @@ -2963,16 +2963,16 @@ client cluster PumpConfigurationAndControl = 512 {
readonly attribute nullable int16u maxConstFlow = 10;
readonly attribute nullable int16s minConstTemp = 11;
readonly attribute nullable int16s maxConstTemp = 12;
readonly attribute PumpStatus pumpStatus = 16;
readonly attribute PumpOperationMode effectiveOperationMode = 17;
readonly attribute PumpControlMode effectiveControlMode = 18;
readonly attribute PumpStatusBitmap pumpStatus = 16;
readonly attribute OperationModeEnum effectiveOperationMode = 17;
readonly attribute ControlModeEnum effectiveControlMode = 18;
readonly attribute nullable int16s capacity = 19;
readonly attribute nullable int16u speed = 20;
attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
readonly attribute nullable int24u power = 22;
attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
attribute access(write: manage) PumpOperationMode operationMode = 32;
attribute access(write: manage) PumpControlMode controlMode = 33;
attribute access(write: manage) OperationModeEnum operationMode = 32;
attribute access(write: manage) ControlModeEnum controlMode = 33;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
Loading

0 comments on commit d364f0d

Please sign in to comment.