Skip to content

Commit 4707273

Browse files
bzbarsky-applepull[bot]
bzbarsky-apple
authored and
pull[bot]
committed
Update Pump Configuration and Control Mode XML to match spec. (#25206)
* Update Pump Configuration and Control Mode XML to match spec. Spec changes happend in https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/5750. Fixes #25183 * Auto-update ZAP files. * Regenerate generated code.
1 parent 73eddec commit 4707273

File tree

71 files changed

+673
-553
lines changed

Some content is hidden

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

71 files changed

+673
-553
lines changed

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -2700,7 +2700,7 @@ server cluster BarrierControl = 259 {
27002700
}
27012701

27022702
server cluster PumpConfigurationAndControl = 512 {
2703-
enum PumpControlMode : ENUM8 {
2703+
enum ControlModeEnum : ENUM8 {
27042704
kConstantSpeed = 0;
27052705
kConstantPressure = 1;
27062706
kProportionalPressure = 2;
@@ -2709,7 +2709,7 @@ server cluster PumpConfigurationAndControl = 512 {
27092709
kAutomatic = 7;
27102710
}
27112711

2712-
enum PumpOperationMode : ENUM8 {
2712+
enum OperationModeEnum : ENUM8 {
27132713
kNormal = 0;
27142714
kMinimum = 1;
27152715
kMaximum = 2;
@@ -2723,10 +2723,10 @@ server cluster PumpConfigurationAndControl = 512 {
27232723
kConstantSpeed = 0x8;
27242724
kConstantTemperature = 0x10;
27252725
kAutomatic = 0x20;
2726-
kLocal = 0x40;
2726+
kLocalOperation = 0x40;
27272727
}
27282728

2729-
bitmap PumpStatus : BITMAP16 {
2729+
bitmap PumpStatusBitmap : BITMAP16 {
27302730
kDeviceFault = 0x1;
27312731
kSupplyfault = 0x2;
27322732
kSpeedLow = 0x4;
@@ -2802,16 +2802,16 @@ server cluster PumpConfigurationAndControl = 512 {
28022802
readonly attribute nullable int16u maxConstFlow = 10;
28032803
readonly attribute nullable int16s minConstTemp = 11;
28042804
readonly attribute nullable int16s maxConstTemp = 12;
2805-
readonly attribute PumpStatus pumpStatus = 16;
2806-
readonly attribute PumpOperationMode effectiveOperationMode = 17;
2807-
readonly attribute PumpControlMode effectiveControlMode = 18;
2805+
readonly attribute PumpStatusBitmap pumpStatus = 16;
2806+
readonly attribute OperationModeEnum effectiveOperationMode = 17;
2807+
readonly attribute ControlModeEnum effectiveControlMode = 18;
28082808
readonly attribute nullable int16s capacity = 19;
28092809
readonly attribute nullable int16u speed = 20;
28102810
attribute access(write: manage) nullable int24u lifetimeRunningHours = 21;
28112811
readonly attribute nullable int24u power = 22;
28122812
attribute access(write: manage) nullable int32u lifetimeEnergyConsumed = 23;
2813-
attribute access(write: manage) PumpOperationMode operationMode = 32;
2814-
attribute access(write: manage) PumpControlMode controlMode = 33;
2813+
attribute access(write: manage) OperationModeEnum operationMode = 32;
2814+
attribute access(write: manage) ControlModeEnum controlMode = 33;
28152815
readonly attribute command_id generatedCommandList[] = 65528;
28162816
readonly attribute command_id acceptedCommandList[] = 65529;
28172817
readonly attribute event_id eventList[] = 65530;

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 90,
2+
"featureLevel": 92,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -8117,7 +8117,7 @@
81178117
"code": 0,
81188118
"mfgCode": null,
81198119
"side": "server",
8120-
"type": "bitmap8",
8120+
"type": "OccupancyBitmap",
81218121
"included": 1,
81228122
"storageOption": "RAM",
81238123
"singleton": 0,
@@ -8133,7 +8133,7 @@
81338133
"code": 1,
81348134
"mfgCode": null,
81358135
"side": "server",
8136-
"type": "enum8",
8136+
"type": "OccupancySensorTypeEnum",
81378137
"included": 1,
81388138
"storageOption": "RAM",
81398139
"singleton": 0,
@@ -8149,7 +8149,7 @@
81498149
"code": 2,
81508150
"mfgCode": null,
81518151
"side": "server",
8152-
"type": "bitmap8",
8152+
"type": "OccupancySensorTypeBitmap",
81538153
"included": 1,
81548154
"storageOption": "RAM",
81558155
"singleton": 0,
@@ -14731,7 +14731,7 @@
1473114731
"code": 16,
1473214732
"mfgCode": null,
1473314733
"side": "server",
14734-
"type": "PumpStatus",
14734+
"type": "PumpStatusBitmap",
1473514735
"included": 1,
1473614736
"storageOption": "RAM",
1473714737
"singleton": 0,
@@ -14747,7 +14747,7 @@
1474714747
"code": 17,
1474814748
"mfgCode": null,
1474914749
"side": "server",
14750-
"type": "PumpOperationMode",
14750+
"type": "OperationModeEnum",
1475114751
"included": 1,
1475214752
"storageOption": "RAM",
1475314753
"singleton": 0,
@@ -14763,7 +14763,7 @@
1476314763
"code": 18,
1476414764
"mfgCode": null,
1476514765
"side": "server",
14766-
"type": "PumpControlMode",
14766+
"type": "ControlModeEnum",
1476714767
"included": 1,
1476814768
"storageOption": "RAM",
1476914769
"singleton": 0,
@@ -14859,7 +14859,7 @@
1485914859
"code": 32,
1486014860
"mfgCode": null,
1486114861
"side": "server",
14862-
"type": "PumpOperationMode",
14862+
"type": "OperationModeEnum",
1486314863
"included": 1,
1486414864
"storageOption": "RAM",
1486514865
"singleton": 0,
@@ -14875,7 +14875,7 @@
1487514875
"code": 33,
1487614876
"mfgCode": null,
1487714877
"side": "server",
14878-
"type": "PumpControlMode",
14878+
"type": "ControlModeEnum",
1487914879
"included": 1,
1488014880
"storageOption": "RAM",
1488114881
"singleton": 0,
@@ -17963,7 +17963,7 @@
1796317963
"code": 0,
1796417964
"mfgCode": null,
1796517965
"side": "server",
17966-
"type": "bitmap8",
17966+
"type": "OccupancyBitmap",
1796717967
"included": 1,
1796817968
"storageOption": "RAM",
1796917969
"singleton": 0,
@@ -17979,7 +17979,7 @@
1797917979
"code": 1,
1798017980
"mfgCode": null,
1798117981
"side": "server",
17982-
"type": "enum8",
17982+
"type": "OccupancySensorTypeEnum",
1798317983
"included": 1,
1798417984
"storageOption": "RAM",
1798517985
"singleton": 0,
@@ -17995,7 +17995,7 @@
1799517995
"code": 2,
1799617996
"mfgCode": null,
1799717997
"side": "server",
17998-
"type": "bitmap8",
17998+
"type": "OccupancySensorTypeBitmap",
1799917999
"included": 1,
1800018000
"storageOption": "RAM",
1800118001
"singleton": 0,
@@ -25037,7 +25037,7 @@
2503725037
"code": 0,
2503825038
"mfgCode": null,
2503925039
"side": "server",
25040-
"type": "bitmap8",
25040+
"type": "OccupancyBitmap",
2504125041
"included": 1,
2504225042
"storageOption": "RAM",
2504325043
"singleton": 0,
@@ -25053,7 +25053,7 @@
2505325053
"code": 1,
2505425054
"mfgCode": null,
2505525055
"side": "server",
25056-
"type": "enum8",
25056+
"type": "OccupancySensorTypeEnum",
2505725057
"included": 1,
2505825058
"storageOption": "RAM",
2505925059
"singleton": 0,
@@ -25069,7 +25069,7 @@
2506925069
"code": 2,
2507025070
"mfgCode": null,
2507125071
"side": "server",
25072-
"type": "bitmap8",
25072+
"type": "OccupancySensorTypeBitmap",
2507325073
"included": 1,
2507425074
"storageOption": "RAM",
2507525075
"singleton": 0,

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -2299,7 +2299,7 @@ server cluster WindowCovering = 258 {
22992299
}
23002300

23012301
server cluster PumpConfigurationAndControl = 512 {
2302-
enum PumpControlMode : ENUM8 {
2302+
enum ControlModeEnum : ENUM8 {
23032303
kConstantSpeed = 0;
23042304
kConstantPressure = 1;
23052305
kProportionalPressure = 2;
@@ -2308,7 +2308,7 @@ server cluster PumpConfigurationAndControl = 512 {
23082308
kAutomatic = 7;
23092309
}
23102310

2311-
enum PumpOperationMode : ENUM8 {
2311+
enum OperationModeEnum : ENUM8 {
23122312
kNormal = 0;
23132313
kMinimum = 1;
23142314
kMaximum = 2;
@@ -2322,10 +2322,10 @@ server cluster PumpConfigurationAndControl = 512 {
23222322
kConstantSpeed = 0x8;
23232323
kConstantTemperature = 0x10;
23242324
kAutomatic = 0x20;
2325-
kLocal = 0x40;
2325+
kLocalOperation = 0x40;
23262326
}
23272327

2328-
bitmap PumpStatus : BITMAP16 {
2328+
bitmap PumpStatusBitmap : BITMAP16 {
23292329
kDeviceFault = 0x1;
23302330
kSupplyfault = 0x2;
23312331
kSpeedLow = 0x4;
@@ -2393,10 +2393,10 @@ server cluster PumpConfigurationAndControl = 512 {
23932393
readonly attribute nullable int16u maxFlow = 2;
23942394
readonly attribute nullable int16s minConstPressure = 3;
23952395
readonly attribute nullable int16s maxConstPressure = 4;
2396-
readonly attribute PumpOperationMode effectiveOperationMode = 17;
2397-
readonly attribute PumpControlMode effectiveControlMode = 18;
2396+
readonly attribute OperationModeEnum effectiveOperationMode = 17;
2397+
readonly attribute ControlModeEnum effectiveControlMode = 18;
23982398
readonly attribute nullable int16s capacity = 19;
2399-
attribute access(write: manage) PumpOperationMode operationMode = 32;
2399+
attribute access(write: manage) OperationModeEnum operationMode = 32;
24002400
readonly attribute command_id generatedCommandList[] = 65528;
24012401
readonly attribute command_id acceptedCommandList[] = 65529;
24022402
readonly attribute event_id eventList[] = 65530;

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 90,
2+
"featureLevel": 92,
33
"creator": "zap",
44
"keyValuePairs": [
55
{
@@ -8034,7 +8034,7 @@
80348034
"code": 0,
80358035
"mfgCode": null,
80368036
"side": "server",
8037-
"type": "bitmap8",
8037+
"type": "OccupancyBitmap",
80388038
"included": 1,
80398039
"storageOption": "RAM",
80408040
"singleton": 0,
@@ -8050,7 +8050,7 @@
80508050
"code": 1,
80518051
"mfgCode": null,
80528052
"side": "server",
8053-
"type": "enum8",
8053+
"type": "OccupancySensorTypeEnum",
80548054
"included": 1,
80558055
"storageOption": "RAM",
80568056
"singleton": 0,
@@ -8066,7 +8066,7 @@
80668066
"code": 2,
80678067
"mfgCode": null,
80688068
"side": "server",
8069-
"type": "bitmap8",
8069+
"type": "OccupancySensorTypeBitmap",
80708070
"included": 1,
80718071
"storageOption": "RAM",
80728072
"singleton": 0,
@@ -14179,7 +14179,7 @@
1417914179
"code": 16,
1418014180
"mfgCode": null,
1418114181
"side": "server",
14182-
"type": "PumpStatus",
14182+
"type": "PumpStatusBitmap",
1418314183
"included": 0,
1418414184
"storageOption": "RAM",
1418514185
"singleton": 0,
@@ -14195,7 +14195,7 @@
1419514195
"code": 17,
1419614196
"mfgCode": null,
1419714197
"side": "server",
14198-
"type": "PumpOperationMode",
14198+
"type": "OperationModeEnum",
1419914199
"included": 1,
1420014200
"storageOption": "RAM",
1420114201
"singleton": 0,
@@ -14211,7 +14211,7 @@
1421114211
"code": 18,
1421214212
"mfgCode": null,
1421314213
"side": "server",
14214-
"type": "PumpControlMode",
14214+
"type": "ControlModeEnum",
1421514215
"included": 1,
1421614216
"storageOption": "RAM",
1421714217
"singleton": 0,
@@ -14307,7 +14307,7 @@
1430714307
"code": 32,
1430814308
"mfgCode": null,
1430914309
"side": "server",
14310-
"type": "PumpOperationMode",
14310+
"type": "OperationModeEnum",
1431114311
"included": 1,
1431214312
"storageOption": "RAM",
1431314313
"singleton": 0,
@@ -14323,7 +14323,7 @@
1432314323
"code": 33,
1432414324
"mfgCode": null,
1432514325
"side": "server",
14326-
"type": "PumpControlMode",
14326+
"type": "ControlModeEnum",
1432714327
"included": 0,
1432814328
"storageOption": "RAM",
1432914329
"singleton": 0,
@@ -17347,7 +17347,7 @@
1734717347
"code": 0,
1734817348
"mfgCode": null,
1734917349
"side": "server",
17350-
"type": "bitmap8",
17350+
"type": "OccupancyBitmap",
1735117351
"included": 1,
1735217352
"storageOption": "RAM",
1735317353
"singleton": 0,
@@ -17363,7 +17363,7 @@
1736317363
"code": 1,
1736417364
"mfgCode": null,
1736517365
"side": "server",
17366-
"type": "enum8",
17366+
"type": "OccupancySensorTypeEnum",
1736717367
"included": 1,
1736817368
"storageOption": "RAM",
1736917369
"singleton": 0,
@@ -17379,7 +17379,7 @@
1737917379
"code": 2,
1738017380
"mfgCode": null,
1738117381
"side": "server",
17382-
"type": "bitmap8",
17382+
"type": "OccupancySensorTypeBitmap",
1738317383
"included": 1,
1738417384
"storageOption": "RAM",
1738517385
"singleton": 0,
@@ -24491,7 +24491,7 @@
2449124491
"code": 0,
2449224492
"mfgCode": null,
2449324493
"side": "server",
24494-
"type": "bitmap8",
24494+
"type": "OccupancyBitmap",
2449524495
"included": 1,
2449624496
"storageOption": "RAM",
2449724497
"singleton": 0,
@@ -24507,7 +24507,7 @@
2450724507
"code": 1,
2450824508
"mfgCode": null,
2450924509
"side": "server",
24510-
"type": "enum8",
24510+
"type": "OccupancySensorTypeEnum",
2451124511
"included": 1,
2451224512
"storageOption": "RAM",
2451324513
"singleton": 0,
@@ -24523,7 +24523,7 @@
2452324523
"code": 2,
2452424524
"mfgCode": null,
2452524525
"side": "server",
24526-
"type": "bitmap8",
24526+
"type": "OccupancySensorTypeBitmap",
2452724527
"included": 1,
2452824528
"storageOption": "RAM",
2452924529
"singleton": 0,

‎examples/bridge-app/bridge-common/bridge-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"featureLevel": 90,
2+
"featureLevel": 92,
33
"creator": "zap",
44
"keyValuePairs": [
55
{

0 commit comments

Comments
 (0)