Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Pump Configuration and Control Mode XML to match spec. #25206

Merged
merged 3 commits into from
Feb 21, 2023
Merged

Update Pump Configuration and Control Mode XML to match spec. #25206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9a3851
Update Pump Configuration and Control Mode XML to match spec.
bzbarsky-apple Feb 21, 2023
fe0d96d
Auto-update ZAP files.
bzbarsky-apple Feb 21, 2023
d364f0d
Regenerate generated code.
bzbarsky-apple Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
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
30 changes: 15 additions & 15 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 90,
"featureLevel": 92,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -8117,7 +8117,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancyBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -8133,7 +8133,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
"type": "enum8",
"type": "OccupancySensorTypeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -8149,7 +8149,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancySensorTypeBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -14731,7 +14731,7 @@
"code": 16,
"mfgCode": null,
"side": "server",
"type": "PumpStatus",
"type": "PumpStatusBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -14747,7 +14747,7 @@
"code": 17,
"mfgCode": null,
"side": "server",
"type": "PumpOperationMode",
"type": "OperationModeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -14763,7 +14763,7 @@
"code": 18,
"mfgCode": null,
"side": "server",
"type": "PumpControlMode",
"type": "ControlModeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -14859,7 +14859,7 @@
"code": 32,
"mfgCode": null,
"side": "server",
"type": "PumpOperationMode",
"type": "OperationModeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -14875,7 +14875,7 @@
"code": 33,
"mfgCode": null,
"side": "server",
"type": "PumpControlMode",
"type": "ControlModeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -17963,7 +17963,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancyBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -17979,7 +17979,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
"type": "enum8",
"type": "OccupancySensorTypeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -17995,7 +17995,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancySensorTypeBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -25037,7 +25037,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancyBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -25053,7 +25053,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
"type": "enum8",
"type": "OccupancySensorTypeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -25069,7 +25069,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancySensorTypeBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
14 changes: 7 additions & 7 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
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
30 changes: 15 additions & 15 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 90,
"featureLevel": 92,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -8034,7 +8034,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancyBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -8050,7 +8050,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
"type": "enum8",
"type": "OccupancySensorTypeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -8066,7 +8066,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancySensorTypeBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -14179,7 +14179,7 @@
"code": 16,
"mfgCode": null,
"side": "server",
"type": "PumpStatus",
"type": "PumpStatusBitmap",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -14195,7 +14195,7 @@
"code": 17,
"mfgCode": null,
"side": "server",
"type": "PumpOperationMode",
"type": "OperationModeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -14211,7 +14211,7 @@
"code": 18,
"mfgCode": null,
"side": "server",
"type": "PumpControlMode",
"type": "ControlModeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -14307,7 +14307,7 @@
"code": 32,
"mfgCode": null,
"side": "server",
"type": "PumpOperationMode",
"type": "OperationModeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -14323,7 +14323,7 @@
"code": 33,
"mfgCode": null,
"side": "server",
"type": "PumpControlMode",
"type": "ControlModeEnum",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -17347,7 +17347,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancyBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -17363,7 +17363,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
"type": "enum8",
"type": "OccupancySensorTypeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -17379,7 +17379,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancySensorTypeBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -24491,7 +24491,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancyBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -24507,7 +24507,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
"type": "enum8",
"type": "OccupancySensorTypeEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -24523,7 +24523,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "OccupancySensorTypeBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/bridge-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 90,
"featureLevel": 92,
"creator": "zap",
"keyValuePairs": [
{
Expand Down
Loading