From 470727305c8a62316833c74e53126bc11911a58a Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 21 Feb 2023 16:50:55 -0500 Subject: [PATCH] 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 https://github.com/project-chip/connectedhomeip/issues/25183 * Auto-update ZAP files. * Regenerate generated code. --- .../all-clusters-app.matter | 18 +-- .../all-clusters-common/all-clusters-app.zap | 30 ++--- .../all-clusters-minimal-app.matter | 14 +- .../all-clusters-minimal-app.zap | 30 ++--- .../bridge-app/bridge-common/bridge-app.zap | 2 +- ...noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 8 +- ...tnode_colortemperaturelight_hbUnzYVeyn.zap | 2 +- .../rootnode_contactsensor_lFAGG1bfRO.zap | 2 +- .../rootnode_dimmablelight_bCwGYSDpoe.zap | 8 +- .../devices/rootnode_doorlock_aNKYAreMXE.zap | 8 +- ...rootnode_extendedcolorlight_8lcaaYJVAa.zap | 8 +- .../chef/devices/rootnode_fan_7N2TobIlOX.zap | 2 +- .../rootnode_flowsensor_1zVxHedlaV.zap | 2 +- ...rootnode_heatingcoolingunit_ncdGai1E5a.zap | 2 +- .../rootnode_humiditysensor_Xyj4gda6Hb.zap | 2 +- .../rootnode_lightsensor_lZQycTFcJK.zap | 2 +- .../rootnode_occupancysensor_iHyVgifZuo.zap | 8 +- .../rootnode_onofflight_bbs1b7IaOV.zap | 8 +- .../rootnode_onofflightswitch_FsPlMr090Q.zap | 8 +- .../rootnode_onoffpluginunit_Wtf8ss5EBY.zap | 2 +- .../rootnode_pressuresensor_s0qC9wLH4k.zap | 2 +- .../devices/rootnode_speaker_RpzeXdimqA.zap | 2 +- .../rootnode_temperaturesensor_Qy1zkNW7c3.zap | 2 +- .../rootnode_thermostat_bm3fb8dhYi.zap | 2 +- .../rootnode_windowcovering_RLCxaGi9Yx.zap | 2 +- .../contact-sensor-app.zap | 8 +- .../bridge-common/bridge-app.zap | 2 +- .../light-switch-common/light-switch-app.zap | 8 +- .../lighting-common/lighting-app.zap | 8 +- .../lighting-app/nxp/zap/lighting-on-off.zap | 8 +- .../efr32/data_model/lighting-thread-app.zap | 8 +- .../efr32/data_model/lighting-wifi-app.zap | 8 +- examples/lock-app/lock-common/lock-app.zap | 14 +- examples/lock-app/nxp/zap/lock-app.zap | 2 +- .../log-source-common/log-source-app.zap | 2 +- .../ota-provider-common/ota-provider-app.zap | 2 +- .../ota-requestor-app.zap | 2 +- .../placeholder/linux/apps/app1/config.matter | 18 +-- .../placeholder/linux/apps/app1/config.zap | 18 +-- .../placeholder/linux/apps/app2/config.matter | 18 +-- .../placeholder/linux/apps/app2/config.zap | 18 +-- .../pump-app/cc13x2x7_26x2x7/main/AppTask.cpp | 14 +- examples/pump-app/pump-common/pump-app.matter | 18 +-- examples/pump-app/pump-common/pump-app.zap | 12 +- .../pump-controller-app.matter | 14 +- .../pump-controller-app.zap | 10 +- .../esp32/main/temperature-measurement.zap | 2 +- .../thermostat-common/thermostat.zap | 10 +- examples/tv-app/tv-common/tv-app.zap | 2 +- .../tv-casting-common/tv-casting-app.zap | 16 +-- examples/window-app/common/window-app.zap | 2 +- .../zap/tests/inputs/all-clusters-app.zap | 30 ++--- .../tools/zap/tests/inputs/lighting-app.zap | 8 +- .../pump-configuration-and-control-server.cpp | 116 ++++++++-------- ...pump-configuration-and-control-cluster.xml | 18 +-- .../data_model/controller-clusters.matter | 18 +-- .../data_model/controller-clusters.zap | 18 +-- .../python/chip/clusters/Objects.py | 40 +++--- .../CHIP/templates/availability.yaml | 51 +++++++ .../CHIP/zap-generated/MTRBaseClusters.h | 103 ++++++++++++--- .../CHIP/zap-generated/MTRBaseClusters.mm | 32 ++--- .../CHIP/zap-generated/MTRCallbackBridge.h | 125 +++++++++--------- .../CHIP/zap-generated/MTRCallbackBridge.mm | 26 ++-- .../zap-generated/attributes/Accessors.cpp | 42 +++--- .../zap-generated/attributes/Accessors.h | 21 +-- .../zap-generated/cluster-enums-check.h | 8 +- .../app-common/zap-generated/cluster-enums.h | 14 +- .../zap-generated/cluster-objects.h | 40 +++--- .../zap-generated/cluster/Commands.h | 10 +- .../cluster/logging/DataModelLogger.cpp | 10 +- .../chip-tool/zap-generated/test/Commands.h | 76 +++++------ 71 files changed, 673 insertions(+), 553 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index d5ddba278558ae..d7f6c71d460821 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -2700,7 +2700,7 @@ server cluster BarrierControl = 259 { } server cluster PumpConfigurationAndControl = 512 { - enum PumpControlMode : ENUM8 { + enum ControlModeEnum : ENUM8 { kConstantSpeed = 0; kConstantPressure = 1; kProportionalPressure = 2; @@ -2709,7 +2709,7 @@ server cluster PumpConfigurationAndControl = 512 { kAutomatic = 7; } - enum PumpOperationMode : ENUM8 { + enum OperationModeEnum : ENUM8 { kNormal = 0; kMinimum = 1; kMaximum = 2; @@ -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; @@ -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; diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 14ccb21837f802..ecc46d9b26a0d2 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -8117,7 +8117,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8133,7 +8133,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8149,7 +8149,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14731,7 +14731,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "PumpStatus", + "type": "PumpStatusBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14747,7 +14747,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14763,7 +14763,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14859,7 +14859,7 @@ "code": 32, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14875,7 +14875,7 @@ "code": 33, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17963,7 +17963,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17979,7 +17979,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17995,7 +17995,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -25037,7 +25037,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -25053,7 +25053,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -25069,7 +25069,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 6702db23e9c78e..38db730b65a2f2 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -2299,7 +2299,7 @@ server cluster WindowCovering = 258 { } server cluster PumpConfigurationAndControl = 512 { - enum PumpControlMode : ENUM8 { + enum ControlModeEnum : ENUM8 { kConstantSpeed = 0; kConstantPressure = 1; kProportionalPressure = 2; @@ -2308,7 +2308,7 @@ server cluster PumpConfigurationAndControl = 512 { kAutomatic = 7; } - enum PumpOperationMode : ENUM8 { + enum OperationModeEnum : ENUM8 { kNormal = 0; kMinimum = 1; kMaximum = 2; @@ -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; @@ -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; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index be47df712b2db3..0f672a4612a129 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -8034,7 +8034,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8050,7 +8050,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8066,7 +8066,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14179,7 +14179,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "PumpStatus", + "type": "PumpStatusBitmap", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -14195,7 +14195,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14211,7 +14211,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14307,7 +14307,7 @@ "code": 32, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14323,7 +14323,7 @@ "code": 33, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -17347,7 +17347,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17363,7 +17363,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17379,7 +17379,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -24491,7 +24491,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -24507,7 +24507,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -24523,7 +24523,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index f459b29fda6d47..a4dd482ce4c619 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 8859510d77607c..508ceadc74e545 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -7095,7 +7095,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7111,7 +7111,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7127,7 +7127,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index 2d6d91d3dbf56d..535b2839d2b3f9 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index 7a992514956431..99745e7037d5ce 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index 7156401149a70f..e2c9fc814c56a3 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -7072,7 +7072,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7088,7 +7088,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7104,7 +7104,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 90c4a036ebccce..11a0c35734dda2 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -8795,7 +8795,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8811,7 +8811,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8827,7 +8827,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 754b3192fc07fe..3a2fd25fe79acf 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -8190,7 +8190,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8206,7 +8206,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8222,7 +8222,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index a004e676f23e60..586aa0a098a5ad 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index 4899c3339d14d7..0c496f11e4fb45 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 1ae69c522256c3..c6e8561fd2e43e 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index ac75924a4d2d46..6324952cf96594 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index 57d84dac665cf0..c57d1cca0ec27f 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index 77a78af28c7603..22dbb517b3fc63 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -6076,7 +6076,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6092,7 +6092,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6108,7 +6108,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index 0fc8e36922c71c..0fd4fc6bfa1412 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -7072,7 +7072,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7088,7 +7088,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7104,7 +7104,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 451273776b0a29..2b418f1360b4e3 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -7072,7 +7072,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7088,7 +7088,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7104,7 +7104,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 1ba137d754cc21..c0e23ea337d148 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index 24d27aacd46bdd..e50d26ddffc493 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 92c6ade66345ad..fce7bbb10bd80c 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index 1ace42ad7e6f92..0f393371f3c025 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index dbd86cf6d70ca3..98de84ab647a31 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index fd45c02f09e60e..4b7dbdbedd1adb 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 1a8898eaad24e5..8f12b660e1ad2f 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -8686,7 +8686,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8702,7 +8702,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8718,7 +8718,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap index d4e90e413ea1a1..d8fa3b5c4635f5 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index faee98aa69de34..49761fdea15576 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -8173,7 +8173,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8189,7 +8189,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8205,7 +8205,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 0489f9a4cd1243..c52b071d3caedd 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -8242,7 +8242,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8258,7 +8258,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8274,7 +8274,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 271e7fffafad36..8934ab43e8c88e 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -8822,7 +8822,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8838,7 +8838,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8854,7 +8854,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap index 27adf15eee8625..c829785c57c88b 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -7697,7 +7697,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7713,7 +7713,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7729,7 +7729,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap index cbbf21a2a786ab..f76df042d106ef 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -8095,7 +8095,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8111,7 +8111,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8127,7 +8127,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index ee6b508d7c480e..b56fd7d0175406 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -5345,7 +5345,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5361,7 +5361,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5377,7 +5377,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7836,7 +7836,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7852,7 +7852,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7868,7 +7868,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap index 4e37d0e54ff8a1..29ee857784a2e3 100644 --- a/examples/lock-app/nxp/zap/lock-app.zap +++ b/examples/lock-app/nxp/zap/lock-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap index a029bb28e503a0..c5836ae74694c2 100644 --- a/examples/log-source-app/log-source-common/log-source-app.zap +++ b/examples/log-source-app/log-source-common/log-source-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index 4ca6350fdbda06..3b8170cd700578 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index f423cac5f2e316..7c1dc5a29e0068 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index cf851304f49b5a..1bbfb60b188b72 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1902,7 +1902,7 @@ server cluster WindowCovering = 258 { } server cluster PumpConfigurationAndControl = 512 { - enum PumpControlMode : ENUM8 { + enum ControlModeEnum : ENUM8 { kConstantSpeed = 0; kConstantPressure = 1; kProportionalPressure = 2; @@ -1911,7 +1911,7 @@ server cluster PumpConfigurationAndControl = 512 { kAutomatic = 7; } - enum PumpOperationMode : ENUM8 { + enum OperationModeEnum : ENUM8 { kNormal = 0; kMinimum = 1; kMaximum = 2; @@ -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; @@ -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; diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index d632f5f69da8a2..05a48197fdde74 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -4666,7 +4666,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "PumpStatus", + "type": "PumpStatusBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4682,7 +4682,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4698,7 +4698,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4794,7 +4794,7 @@ "code": 32, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4810,7 +4810,7 @@ "code": 33, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8798,7 +8798,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8814,7 +8814,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8830,7 +8830,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 5312e51a3c79c0..f5ef86707a16f2 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1871,7 +1871,7 @@ server cluster WindowCovering = 258 { } server cluster PumpConfigurationAndControl = 512 { - enum PumpControlMode : ENUM8 { + enum ControlModeEnum : ENUM8 { kConstantSpeed = 0; kConstantPressure = 1; kProportionalPressure = 2; @@ -1880,7 +1880,7 @@ server cluster PumpConfigurationAndControl = 512 { kAutomatic = 7; } - enum PumpOperationMode : ENUM8 { + enum OperationModeEnum : ENUM8 { kNormal = 0; kMinimum = 1; kMaximum = 2; @@ -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; @@ -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; diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index cc4fadbd58f8dc..6ab506298d4d02 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -4950,7 +4950,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "PumpStatus", + "type": "PumpStatusBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4966,7 +4966,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4982,7 +4982,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5078,7 +5078,7 @@ "code": 32, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5094,7 +5094,7 @@ "code": 33, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8798,7 +8798,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8814,7 +8814,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8830,7 +8830,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp index 62a5e436a58310..5eb903e6ca0688 100644 --- a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp +++ b/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp @@ -473,7 +473,7 @@ void AppTask::UpdateClusterState(void) void AppTask::UpdateCluster(intptr_t context) { EmberStatus status; - BitMask pumpStatus; + BitMask pumpStatus; ChipLogProgress(NotSpecified, "Update Cluster State"); @@ -481,34 +481,34 @@ void AppTask::UpdateCluster(intptr_t context) PumpConfigurationAndControl::Attributes::PumpStatus::Get(PCC_CLUSTER_ENDPOINT, &pumpStatus); if (PumpMgr().IsStopped()) { - pumpStatus.Clear(PumpConfigurationAndControl::PumpStatus::kRunning); + pumpStatus.Clear(PumpConfigurationAndControl::PumpStatusBitmap::kRunning); } else { - pumpStatus.Set(PumpConfigurationAndControl::PumpStatus::kRunning); + pumpStatus.Set(PumpConfigurationAndControl::PumpStatusBitmap::kRunning); } PumpConfigurationAndControl::Attributes::PumpStatus::Set(PCC_CLUSTER_ENDPOINT, pumpStatus); status = PumpConfigurationAndControl::Attributes::ControlMode::Set(PCC_CLUSTER_ENDPOINT, - PumpConfigurationAndControl::PumpControlMode::kConstantFlow); + PumpConfigurationAndControl::ControlModeEnum::kConstantFlow); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: Constant Flow error %x", status); } status = PumpConfigurationAndControl::Attributes::ControlMode::Set( - PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::PumpControlMode::kConstantPressure); + PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::ControlModeEnum::kConstantPressure); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: Constant Pressure error %x", status); } status = PumpConfigurationAndControl::Attributes::ControlMode::Set( - PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::PumpControlMode::kConstantSpeed); + PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::ControlModeEnum::kConstantSpeed); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: Constant Speed error %x", status); } status = PumpConfigurationAndControl::Attributes::ControlMode::Set( - PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::PumpControlMode::kConstantTemperature); + PCC_CLUSTER_ENDPOINT, PumpConfigurationAndControl::ControlModeEnum::kConstantTemperature); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: Constant Temperature error %x", status); diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 5ba73b670ec830..e7a9f1a3239038 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -1111,7 +1111,7 @@ server cluster GroupKeyManagement = 63 { } server cluster PumpConfigurationAndControl = 512 { - enum PumpControlMode : ENUM8 { + enum ControlModeEnum : ENUM8 { kConstantSpeed = 0; kConstantPressure = 1; kProportionalPressure = 2; @@ -1120,7 +1120,7 @@ server cluster PumpConfigurationAndControl = 512 { kAutomatic = 7; } - enum PumpOperationMode : ENUM8 { + enum OperationModeEnum : ENUM8 { kNormal = 0; kMinimum = 1; kMaximum = 2; @@ -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; @@ -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; diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 7d11ad734c203a..6b4c31b303877c 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -7029,7 +7029,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "PumpStatus", + "type": "PumpStatusBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7045,7 +7045,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7061,7 +7061,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7157,7 +7157,7 @@ "code": 32, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7173,7 +7173,7 @@ "code": 33, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 6584d9b1e17495..cbdbae0544ff1b 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -1013,7 +1013,7 @@ server cluster GroupKeyManagement = 63 { } client cluster PumpConfigurationAndControl = 512 { - enum PumpControlMode : ENUM8 { + enum ControlModeEnum : ENUM8 { kConstantSpeed = 0; kConstantPressure = 1; kProportionalPressure = 2; @@ -1022,7 +1022,7 @@ client cluster PumpConfigurationAndControl = 512 { kAutomatic = 7; } - enum PumpOperationMode : ENUM8 { + enum OperationModeEnum : ENUM8 { kNormal = 0; kMinimum = 1; kMaximum = 2; @@ -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; @@ -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; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 4d76593f0426ed..392ac72f45e407 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -6270,7 +6270,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "PumpStatus", + "type": "PumpStatusBitmap", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6286,7 +6286,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6302,7 +6302,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6334,7 +6334,7 @@ "code": 32, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap index ed8c2743c117c2..aaf058a3ab5115 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index f26871c0e84d16..bd118ac066ee23 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -11052,7 +11052,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "PumpStatus", + "type": "PumpStatusBitmap", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -11068,7 +11068,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11084,7 +11084,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11116,7 +11116,7 @@ "code": 32, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index ea94217f1b4f9b..9532f7d1fd11af 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index b8f5998fe8c16e..a953e4c594208a 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -10509,7 +10509,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "PumpStatus", + "type": "PumpStatusBitmap", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -10525,7 +10525,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10541,7 +10541,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -10573,7 +10573,7 @@ "code": 32, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -16421,7 +16421,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -16437,7 +16437,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -16453,7 +16453,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index d298fdd3c2b266..bebcebe0343dc7 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index b730a4a19f1752..b0c0673e926741 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -8117,7 +8117,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8133,7 +8133,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8149,7 +8149,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14508,7 +14508,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "PumpStatus", + "type": "PumpStatusBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14524,7 +14524,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14540,7 +14540,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14636,7 +14636,7 @@ "code": 32, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14652,7 +14652,7 @@ "code": 33, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17384,7 +17384,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17400,7 +17400,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17416,7 +17416,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -24458,7 +24458,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -24474,7 +24474,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -24490,7 +24490,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index 1c7552a7e9a382..da8a532f550567 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -8210,7 +8210,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8226,7 +8226,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8242,7 +8242,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp b/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp index 6613d4bb3df5a0..147b1dcd2c55c3 100644 --- a/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp +++ b/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp @@ -56,9 +56,9 @@ static RemoteSensorType detectRemoteSensorConnected() static void setEffectiveModes(EndpointId endpoint) { - PumpControlMode controlMode; - PumpOperationMode operationMode; - BitMask pumpStatus; + ControlModeEnum controlMode; + OperationModeEnum operationMode; + BitMask pumpStatus; bool isControlModeAvailable = true; bool isPumpStatusAvailable = true; @@ -81,7 +81,7 @@ static void setEffectiveModes(EndpointId endpoint) const EmberAfAttributeMetadata * effectiveControlModeMetaData; effectiveControlModeMetaData = GetAttributeMetadata( app::ConcreteAttributePath(endpoint, PumpConfigurationAndControl::Id, Attributes::EffectiveControlMode::Id)); - controlMode = static_cast(effectiveControlModeMetaData->defaultValue.defaultValue); + controlMode = static_cast(effectiveControlModeMetaData->defaultValue.defaultValue); } if (isPumpStatusAvailable) @@ -91,7 +91,7 @@ static void setEffectiveModes(EndpointId endpoint) switch (operationMode) { - case PumpOperationMode::kNormal: { + case OperationModeEnum::kNormal: { // The pump runs in the control mode as per the type of the remote sensor // If the remote sensor is a Flow sensor the mode would be ConstantFlow // If the remote sensor is a Pressure sensor the mode would be ConstantPressure (not ProportionalPressure) @@ -103,30 +103,30 @@ static void setEffectiveModes(EndpointId endpoint) switch (sensorType) { case RemoteSensorType::kFlowSensor: - Attributes::EffectiveControlMode::Set(endpoint, PumpControlMode::kConstantFlow); + Attributes::EffectiveControlMode::Set(endpoint, ControlModeEnum::kConstantFlow); if (isPumpStatusAvailable) { - pumpStatus.Set(PumpStatus::kRemoteFlow); - pumpStatus.Clear(PumpStatus::kRemotePressure); - pumpStatus.Clear(PumpStatus::kRemoteTemperature); + pumpStatus.Set(PumpStatusBitmap::kRemoteFlow); + pumpStatus.Clear(PumpStatusBitmap::kRemotePressure); + pumpStatus.Clear(PumpStatusBitmap::kRemoteTemperature); } break; case RemoteSensorType::kPressureSensor: - Attributes::EffectiveControlMode::Set(endpoint, PumpControlMode::kConstantPressure); + Attributes::EffectiveControlMode::Set(endpoint, ControlModeEnum::kConstantPressure); if (isPumpStatusAvailable) { - pumpStatus.Clear(PumpStatus::kRemoteFlow); - pumpStatus.Set(PumpStatus::kRemotePressure); - pumpStatus.Clear(PumpStatus::kRemoteTemperature); + pumpStatus.Clear(PumpStatusBitmap::kRemoteFlow); + pumpStatus.Set(PumpStatusBitmap::kRemotePressure); + pumpStatus.Clear(PumpStatusBitmap::kRemoteTemperature); } break; case RemoteSensorType::kTemperatureSensor: - Attributes::EffectiveControlMode::Set(endpoint, PumpControlMode::kConstantTemperature); + Attributes::EffectiveControlMode::Set(endpoint, ControlModeEnum::kConstantTemperature); if (isPumpStatusAvailable) { - pumpStatus.Clear(PumpStatus::kRemoteFlow); - pumpStatus.Clear(PumpStatus::kRemotePressure); - pumpStatus.Set(PumpStatus::kRemoteTemperature); + pumpStatus.Clear(PumpStatusBitmap::kRemoteFlow); + pumpStatus.Clear(PumpStatusBitmap::kRemotePressure); + pumpStatus.Set(PumpStatusBitmap::kRemoteTemperature); } break; case RemoteSensorType::kNoSensor: @@ -141,45 +141,45 @@ static void setEffectiveModes(EndpointId endpoint) Attributes::EffectiveControlMode::Set(endpoint, controlMode); if (isPumpStatusAvailable) { - pumpStatus.Clear(PumpStatus::kRemoteFlow); - pumpStatus.Clear(PumpStatus::kRemotePressure); - pumpStatus.Clear(PumpStatus::kRemoteTemperature); + pumpStatus.Clear(PumpStatusBitmap::kRemoteFlow); + pumpStatus.Clear(PumpStatusBitmap::kRemotePressure); + pumpStatus.Clear(PumpStatusBitmap::kRemoteTemperature); } break; } // Set the overall effective operation mode to Normal - Attributes::EffectiveOperationMode::Set(endpoint, PumpOperationMode::kNormal); + Attributes::EffectiveOperationMode::Set(endpoint, OperationModeEnum::kNormal); } break; // The pump is controlled by the OperationMode attribute. // Maximum, Minimum or Local - case PumpOperationMode::kMaximum: { + case OperationModeEnum::kMaximum: { #ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL uint8_t maxLevel; #endif - Attributes::EffectiveOperationMode::Set(endpoint, PumpOperationMode::kMaximum); - Attributes::EffectiveControlMode::Set(endpoint, PumpControlMode::kConstantSpeed); + Attributes::EffectiveOperationMode::Set(endpoint, OperationModeEnum::kMaximum); + Attributes::EffectiveControlMode::Set(endpoint, ControlModeEnum::kConstantSpeed); #ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL LevelControl::Attributes::MaxLevel::Get(endpoint, &maxLevel); LevelControl::Attributes::CurrentLevel::Set(endpoint, maxLevel); #endif if (isPumpStatusAvailable) { - pumpStatus.Clear(PumpStatus::kRemoteFlow); - pumpStatus.Clear(PumpStatus::kRemotePressure); - pumpStatus.Clear(PumpStatus::kRemoteTemperature); + pumpStatus.Clear(PumpStatusBitmap::kRemoteFlow); + pumpStatus.Clear(PumpStatusBitmap::kRemotePressure); + pumpStatus.Clear(PumpStatusBitmap::kRemoteTemperature); } } break; - case PumpOperationMode::kMinimum: { + case OperationModeEnum::kMinimum: { #ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL uint8_t minLevel; #endif - Attributes::EffectiveOperationMode::Set(endpoint, PumpOperationMode::kMinimum); - Attributes::EffectiveControlMode::Set(endpoint, PumpControlMode::kConstantSpeed); + Attributes::EffectiveOperationMode::Set(endpoint, OperationModeEnum::kMinimum); + Attributes::EffectiveControlMode::Set(endpoint, ControlModeEnum::kConstantSpeed); #ifdef EMBER_AF_PLUGIN_LEVEL_CONTROL LevelControl::Attributes::MinLevel::Get(endpoint, &minLevel); if (minLevel == 0) @@ -191,32 +191,32 @@ static void setEffectiveModes(EndpointId endpoint) #endif if (isPumpStatusAvailable) { - pumpStatus.Clear(PumpStatus::kRemoteFlow); - pumpStatus.Clear(PumpStatus::kRemotePressure); - pumpStatus.Clear(PumpStatus::kRemoteTemperature); + pumpStatus.Clear(PumpStatusBitmap::kRemoteFlow); + pumpStatus.Clear(PumpStatusBitmap::kRemotePressure); + pumpStatus.Clear(PumpStatusBitmap::kRemoteTemperature); } } break; - case PumpOperationMode::kLocal: { + case OperationModeEnum::kLocal: { // If the Application sets the OperatioMode to kLocal the application "owns" the EffectiveControlMode, which // it also does if the external entity sets the OperationMode to kLocal. So in any case the application // must set the EffectiveControlMode to something which applies to the current ControlMode in the application. // So to keeps things short: the application layer owns the EffetiveControlMode when OperationMode is kLocal. - Attributes::EffectiveOperationMode::Set(endpoint, PumpOperationMode::kLocal); + Attributes::EffectiveOperationMode::Set(endpoint, OperationModeEnum::kLocal); // Set the current ControlMode for now. Perhaps the application will set the EffectiveControlMode to something else. Attributes::EffectiveControlMode::Set(endpoint, controlMode); // Clear out the remote sensors from the PumpStatus flags. if (isPumpStatusAvailable) { - pumpStatus.Clear(PumpStatus::kRemoteFlow); - pumpStatus.Clear(PumpStatus::kRemotePressure); - pumpStatus.Clear(PumpStatus::kRemoteTemperature); + pumpStatus.Clear(PumpStatusBitmap::kRemoteFlow); + pumpStatus.Clear(PumpStatusBitmap::kRemotePressure); + pumpStatus.Clear(PumpStatusBitmap::kRemoteTemperature); } } break; - case PumpOperationMode::kUnknownEnumValue: { + case OperationModeEnum::kUnknownEnumValue: { // Not expected; see check in MatterPumpConfigurationAndControlClusterServerPreAttributeChangedCallback. break; } @@ -260,49 +260,49 @@ chip::Protocols::InteractionModel::Status MatterPumpConfigurationAndControlClust switch (attributePath.mAttributeId) { case Attributes::ControlMode::Id: { - PumpControlMode controlMode; - NumericAttributeTraits::StorageType tmp; + ControlModeEnum controlMode; + NumericAttributeTraits::StorageType tmp; memcpy(&tmp, value, size); - controlMode = NumericAttributeTraits::StorageToWorking(tmp); + controlMode = NumericAttributeTraits::StorageToWorking(tmp); switch (controlMode) { - case PumpControlMode::kConstantFlow: + case ControlModeEnum::kConstantFlow: if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantFlow)) { status = Protocols::InteractionModel::Status::ConstraintError; } break; - case PumpControlMode::kConstantPressure: + case ControlModeEnum::kConstantPressure: if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantPressure)) { status = Protocols::InteractionModel::Status::ConstraintError; } break; - case PumpControlMode::kConstantSpeed: + case ControlModeEnum::kConstantSpeed: if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantSpeed)) { status = Protocols::InteractionModel::Status::ConstraintError; } break; - case PumpControlMode::kConstantTemperature: + case ControlModeEnum::kConstantTemperature: if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantTemperature)) { status = Protocols::InteractionModel::Status::ConstraintError; } break; - case PumpControlMode::kProportionalPressure: + case ControlModeEnum::kProportionalPressure: if (!HasFeature(attributePath.mEndpointId, PumpFeature::kCompensatedPressure)) { status = Protocols::InteractionModel::Status::ConstraintError; } break; - case PumpControlMode::kAutomatic: + case ControlModeEnum::kAutomatic: if (!HasFeature(attributePath.mEndpointId, PumpFeature::kAutomatic)) { status = Protocols::InteractionModel::Status::ConstraintError; } break; - case PumpControlMode::kUnknownEnumValue: + case ControlModeEnum::kUnknownEnumValue: status = Protocols::InteractionModel::Status::ConstraintError; break; } @@ -310,35 +310,35 @@ chip::Protocols::InteractionModel::Status MatterPumpConfigurationAndControlClust break; case Attributes::OperationMode::Id: - PumpOperationMode operationMode; - NumericAttributeTraits::StorageType tmp; + OperationModeEnum operationMode; + NumericAttributeTraits::StorageType tmp; memcpy(&tmp, value, size); - operationMode = NumericAttributeTraits::StorageToWorking(tmp); + operationMode = NumericAttributeTraits::StorageToWorking(tmp); switch (operationMode) { - case PumpOperationMode::kMinimum: + case OperationModeEnum::kMinimum: if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantSpeed)) { status = Protocols::InteractionModel::Status::ConstraintError; } break; - case PumpOperationMode::kMaximum: + case OperationModeEnum::kMaximum: if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantSpeed)) { status = Protocols::InteractionModel::Status::ConstraintError; } break; - case PumpOperationMode::kLocal: - if (!HasFeature(attributePath.mEndpointId, PumpFeature::kLocal)) + case OperationModeEnum::kLocal: + if (!HasFeature(attributePath.mEndpointId, PumpFeature::kLocalOperation)) { status = Protocols::InteractionModel::Status::ConstraintError; } break; - case PumpOperationMode::kNormal: + case OperationModeEnum::kNormal: status = Protocols::InteractionModel::Status::Success; break; - case PumpOperationMode::kUnknownEnumValue: + case OperationModeEnum::kUnknownEnumValue: status = Protocols::InteractionModel::Status::ConstraintError; break; } diff --git a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml index 60c3c864b177e3..02d92c554feb23 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml @@ -38,9 +38,9 @@ limitations under the License. MaxConstFlow MinConstTemp MaxConstTemp - PumpStatus - EffectiveOperationMode - EffectiveControlMode + PumpStatus + EffectiveOperationMode + EffectiveControlMode Capacity Speed @@ -54,12 +54,12 @@ limitations under the License. - + OperationMode - + ControlMode @@ -118,7 +118,7 @@ limitations under the License. - + @@ -131,7 +131,7 @@ limitations under the License. - + @@ -139,7 +139,7 @@ limitations under the License. - + @@ -157,7 +157,7 @@ limitations under the License. - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 493ef03cf0725e..dd1450dc61f56a 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2861,7 +2861,7 @@ client cluster BarrierControl = 259 { } client cluster PumpConfigurationAndControl = 512 { - enum PumpControlMode : ENUM8 { + enum ControlModeEnum : ENUM8 { kConstantSpeed = 0; kConstantPressure = 1; kProportionalPressure = 2; @@ -2870,7 +2870,7 @@ client cluster PumpConfigurationAndControl = 512 { kAutomatic = 7; } - enum PumpOperationMode : ENUM8 { + enum OperationModeEnum : ENUM8 { kNormal = 0; kMinimum = 1; kMaximum = 2; @@ -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; @@ -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; diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index efe89791b7d774..cc6fbe2bd7f9cc 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -1,5 +1,5 @@ { - "featureLevel": 90, + "featureLevel": 92, "creator": "zap", "keyValuePairs": [ { @@ -12015,7 +12015,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "PumpStatus", + "type": "PumpStatusBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -12031,7 +12031,7 @@ "code": 17, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -12047,7 +12047,7 @@ "code": 18, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -12143,7 +12143,7 @@ "code": 32, "mfgCode": null, "side": "server", - "type": "PumpOperationMode", + "type": "OperationModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -12159,7 +12159,7 @@ "code": 33, "mfgCode": null, "side": "server", - "type": "PumpControlMode", + "type": "ControlModeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -15823,7 +15823,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancyBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -15839,7 +15839,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "enum8", + "type": "OccupancySensorTypeEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -15855,7 +15855,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "OccupancySensorTypeBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index e23ebb7e895319..388e69d741964e 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -17395,15 +17395,15 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="minConstTemp", Tag=0x0000000B, Type=typing.Union[None, Nullable, int]), ClusterObjectFieldDescriptor(Label="maxConstTemp", Tag=0x0000000C, Type=typing.Union[None, Nullable, int]), ClusterObjectFieldDescriptor(Label="pumpStatus", Tag=0x00000010, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="effectiveOperationMode", Tag=0x00000011, Type=PumpConfigurationAndControl.Enums.PumpOperationMode), - ClusterObjectFieldDescriptor(Label="effectiveControlMode", Tag=0x00000012, Type=PumpConfigurationAndControl.Enums.PumpControlMode), + ClusterObjectFieldDescriptor(Label="effectiveOperationMode", Tag=0x00000011, Type=PumpConfigurationAndControl.Enums.OperationModeEnum), + ClusterObjectFieldDescriptor(Label="effectiveControlMode", Tag=0x00000012, Type=PumpConfigurationAndControl.Enums.ControlModeEnum), ClusterObjectFieldDescriptor(Label="capacity", Tag=0x00000013, Type=typing.Union[Nullable, int]), ClusterObjectFieldDescriptor(Label="speed", Tag=0x00000014, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="lifetimeRunningHours", Tag=0x00000015, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="power", Tag=0x00000016, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="lifetimeEnergyConsumed", Tag=0x00000017, Type=typing.Union[None, Nullable, uint]), - ClusterObjectFieldDescriptor(Label="operationMode", Tag=0x00000020, Type=PumpConfigurationAndControl.Enums.PumpOperationMode), - ClusterObjectFieldDescriptor(Label="controlMode", Tag=0x00000021, Type=typing.Optional[PumpConfigurationAndControl.Enums.PumpControlMode]), + ClusterObjectFieldDescriptor(Label="operationMode", Tag=0x00000020, Type=PumpConfigurationAndControl.Enums.OperationModeEnum), + ClusterObjectFieldDescriptor(Label="controlMode", Tag=0x00000021, Type=typing.Optional[PumpConfigurationAndControl.Enums.ControlModeEnum]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]), @@ -17426,15 +17426,15 @@ def descriptor(cls) -> ClusterObjectDescriptor: minConstTemp: 'typing.Union[None, Nullable, int]' = None maxConstTemp: 'typing.Union[None, Nullable, int]' = None pumpStatus: 'typing.Optional[uint]' = None - effectiveOperationMode: 'PumpConfigurationAndControl.Enums.PumpOperationMode' = None - effectiveControlMode: 'PumpConfigurationAndControl.Enums.PumpControlMode' = None + effectiveOperationMode: 'PumpConfigurationAndControl.Enums.OperationModeEnum' = None + effectiveControlMode: 'PumpConfigurationAndControl.Enums.ControlModeEnum' = None capacity: 'typing.Union[Nullable, int]' = None speed: 'typing.Union[None, Nullable, uint]' = None lifetimeRunningHours: 'typing.Union[None, Nullable, uint]' = None power: 'typing.Union[None, Nullable, uint]' = None lifetimeEnergyConsumed: 'typing.Union[None, Nullable, uint]' = None - operationMode: 'PumpConfigurationAndControl.Enums.PumpOperationMode' = None - controlMode: 'typing.Optional[PumpConfigurationAndControl.Enums.PumpControlMode]' = None + operationMode: 'PumpConfigurationAndControl.Enums.OperationModeEnum' = None + controlMode: 'typing.Optional[PumpConfigurationAndControl.Enums.ControlModeEnum]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None eventList: 'typing.List[uint]' = None @@ -17443,7 +17443,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class PumpControlMode(MatterIntEnum): + class ControlModeEnum(MatterIntEnum): kConstantSpeed = 0x00 kConstantPressure = 0x01 kProportionalPressure = 0x02 @@ -17456,7 +17456,7 @@ class PumpControlMode(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 4, - class PumpOperationMode(MatterIntEnum): + class OperationModeEnum(MatterIntEnum): kNormal = 0x00 kMinimum = 0x01 kMaximum = 0x02 @@ -17476,9 +17476,9 @@ class PumpFeature(IntFlag): kConstantSpeed = 0x8 kConstantTemperature = 0x10 kAutomatic = 0x20 - kLocal = 0x40 + kLocalOperation = 0x40 - class PumpStatus(IntFlag): + class PumpStatusBitmap(IntFlag): kDeviceFault = 0x1 kSupplyfault = 0x2 kSpeedLow = 0x4 @@ -17729,9 +17729,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=PumpConfigurationAndControl.Enums.PumpOperationMode) + return ClusterObjectFieldDescriptor(Type=PumpConfigurationAndControl.Enums.OperationModeEnum) - value: 'PumpConfigurationAndControl.Enums.PumpOperationMode' = 0 + value: 'PumpConfigurationAndControl.Enums.OperationModeEnum' = 0 @dataclass class EffectiveControlMode(ClusterAttributeDescriptor): @@ -17745,9 +17745,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=PumpConfigurationAndControl.Enums.PumpControlMode) + return ClusterObjectFieldDescriptor(Type=PumpConfigurationAndControl.Enums.ControlModeEnum) - value: 'PumpConfigurationAndControl.Enums.PumpControlMode' = 0 + value: 'PumpConfigurationAndControl.Enums.ControlModeEnum' = 0 @dataclass class Capacity(ClusterAttributeDescriptor): @@ -17841,9 +17841,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=PumpConfigurationAndControl.Enums.PumpOperationMode) + return ClusterObjectFieldDescriptor(Type=PumpConfigurationAndControl.Enums.OperationModeEnum) - value: 'PumpConfigurationAndControl.Enums.PumpOperationMode' = 0 + value: 'PumpConfigurationAndControl.Enums.OperationModeEnum' = 0 @dataclass class ControlMode(ClusterAttributeDescriptor): @@ -17857,9 +17857,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[PumpConfigurationAndControl.Enums.PumpControlMode]) + return ClusterObjectFieldDescriptor(Type=typing.Optional[PumpConfigurationAndControl.Enums.ControlModeEnum]) - value: 'typing.Optional[PumpConfigurationAndControl.Enums.PumpControlMode]' = None + value: 'typing.Optional[PumpConfigurationAndControl.Enums.ControlModeEnum]' = None @dataclass class GeneratedCommandList(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 143606547a17e3..3e0a06643b259b 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -6698,6 +6698,9 @@ WiFiNetworkDiagnostics: - ConnectionStatusEnum - WiFiVersionEnum + PumpConfigurationAndControl: + - ControlModeEnum + - OperationModeEnum enum values: DoorLock: LockDataTypeEnum: @@ -6734,10 +6737,25 @@ - N - Ac - Ax + PumpConfigurationAndControl: + ControlModeEnum: + - ConstantSpeed + - ConstantPressure + - ProportionalPressure + - ConstantFlow + - ConstantTemperature + - Automatic + OperationModeEnum: + - Normal + - Minimum + - Maximum + - Local bitmaps: OccupancySensing: - OccupancyBitmap - OccupancySensorTypeBitmap + PumpConfigurationAndControl: + - PumpStatusBitmap bitmap values: OccupancySensing: OccupancyBitmap: @@ -6746,6 +6764,19 @@ - PIR - Ultrasonic - PhysicalContact + PumpConfigurationAndControl: + PumpFeature: + - LocalOperation + PumpStatusBitmap: + - DeviceFault + - Supplyfault + - SpeedLow + - SpeedHigh + - LocalOverride + - Running + - RemotePressure + - RemoteFlow + - RemoteTemperature deprecated: attributes: TimeSynchronization: @@ -6762,6 +6793,16 @@ WiFiNetworkDiagnostics: - WiFiConnectionStatus - WiFiVersionType + PumpConfigurationAndControl: + - PumpControlMode + - PumpOperationMode + bitmaps: + PumpConfigurationAndControl: + - PumpStatus + bitmap values: + PumpConfigurationAndControl: + PumpFeature: + - Local removed: enum values: DoorLock: @@ -6786,3 +6827,13 @@ WiFiNetworkDiagnostics: ConnectionStatusEnum: WiFiConnectionStatus WiFiVersionEnum: WiFiVersionType + PumpConfigurationAndControl: + ControlModeEnum: PumpControlMode + OperationModeEnum: PumpOperationMode + bitmaps: + PumpConfigurationAndControl: + PumpStatusBitmap: PumpStatus + bitmap values: + PumpConfigurationAndControl: + PumpFeature: + LocalOperation: Local diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index c703ab8c3135a1..0a5ad245e5f3f9 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -21468,27 +21468,59 @@ typedef NS_OPTIONS(uint16_t, MTRWindowCoveringSafetyStatus) { MTRWindowCoveringSafetyStatusProtection API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x800, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_ENUM(uint8_t, MTRPumpConfigurationAndControlControlMode) { + MTRPumpConfigurationAndControlControlModeConstantSpeed MTR_NEWLY_AVAILABLE = 0x00, + MTRPumpConfigurationAndControlControlModeConstantPressure MTR_NEWLY_AVAILABLE = 0x01, + MTRPumpConfigurationAndControlControlModeProportionalPressure MTR_NEWLY_AVAILABLE = 0x02, + MTRPumpConfigurationAndControlControlModeConstantFlow MTR_NEWLY_AVAILABLE = 0x03, + MTRPumpConfigurationAndControlControlModeConstantTemperature MTR_NEWLY_AVAILABLE = 0x05, + MTRPumpConfigurationAndControlControlModeAutomatic MTR_NEWLY_AVAILABLE = 0x07, +} MTR_NEWLY_AVAILABLE; + typedef NS_ENUM(uint8_t, MTRPumpConfigurationAndControlPumpControlMode) { MTRPumpConfigurationAndControlPumpControlModeConstantSpeed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlControlModeConstantSpeed") = 0x00, MTRPumpConfigurationAndControlPumpControlModeConstantPressure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlControlModeConstantPressure") = 0x01, - MTRPumpConfigurationAndControlPumpControlModeProportionalPressure API_AVAILABLE( - ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTRPumpConfigurationAndControlPumpControlModeProportionalPressure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), + tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlControlModeProportionalPressure") = 0x02, MTRPumpConfigurationAndControlPumpControlModeConstantFlow API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlControlModeConstantFlow") = 0x03, MTRPumpConfigurationAndControlPumpControlModeConstantTemperature API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlControlModeConstantTemperature") = 0x05, - MTRPumpConfigurationAndControlPumpControlModeAutomatic API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRPumpConfigurationAndControlPumpControlModeAutomatic API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlControlModeAutomatic") + = 0x07, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlControlMode"); + +typedef NS_ENUM(uint8_t, MTRPumpConfigurationAndControlOperationMode) { + MTRPumpConfigurationAndControlOperationModeNormal MTR_NEWLY_AVAILABLE = 0x00, + MTRPumpConfigurationAndControlOperationModeMinimum MTR_NEWLY_AVAILABLE = 0x01, + MTRPumpConfigurationAndControlOperationModeMaximum MTR_NEWLY_AVAILABLE = 0x02, + MTRPumpConfigurationAndControlOperationModeLocal MTR_NEWLY_AVAILABLE = 0x03, +} MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRPumpConfigurationAndControlPumpOperationMode) { - MTRPumpConfigurationAndControlPumpOperationModeNormal API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, - MTRPumpConfigurationAndControlPumpOperationModeMinimum API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTRPumpConfigurationAndControlPumpOperationModeMaximum API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, - MTRPumpConfigurationAndControlPumpOperationModeLocal API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTRPumpConfigurationAndControlPumpOperationModeNormal API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlOperationModeNormal") + = 0x00, + MTRPumpConfigurationAndControlPumpOperationModeMinimum API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlOperationModeMinimum") + = 0x01, + MTRPumpConfigurationAndControlPumpOperationModeMaximum API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlOperationModeMaximum") + = 0x02, + MTRPumpConfigurationAndControlPumpOperationModeLocal API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlOperationModeLocal") + = 0x03, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlOperationMode"); typedef NS_OPTIONS(uint32_t, MTRPumpConfigurationAndControlPumpFeature) { MTRPumpConfigurationAndControlPumpFeatureConstantPressure API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x1, @@ -21499,21 +21531,54 @@ typedef NS_OPTIONS(uint32_t, MTRPumpConfigurationAndControlPumpFeature) { MTRPumpConfigurationAndControlPumpFeatureConstantTemperature API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x10, MTRPumpConfigurationAndControlPumpFeatureAutomatic API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x20, - MTRPumpConfigurationAndControlPumpFeatureLocal API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x40, + MTRPumpConfigurationAndControlPumpFeatureLocalOperation MTR_NEWLY_AVAILABLE = 0x40, + MTRPumpConfigurationAndControlPumpFeatureLocal API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpFeatureLocalOperation") + = 0x40, } API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); +typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatusBitmap) { + MTRPumpConfigurationAndControlPumpStatusBitmapDeviceFault MTR_NEWLY_AVAILABLE = 0x1, + MTRPumpConfigurationAndControlPumpStatusBitmapSupplyfault MTR_NEWLY_AVAILABLE = 0x2, + MTRPumpConfigurationAndControlPumpStatusBitmapSpeedLow MTR_NEWLY_AVAILABLE = 0x4, + MTRPumpConfigurationAndControlPumpStatusBitmapSpeedHigh MTR_NEWLY_AVAILABLE = 0x8, + MTRPumpConfigurationAndControlPumpStatusBitmapLocalOverride MTR_NEWLY_AVAILABLE = 0x10, + MTRPumpConfigurationAndControlPumpStatusBitmapRunning MTR_NEWLY_AVAILABLE = 0x20, + MTRPumpConfigurationAndControlPumpStatusBitmapRemotePressure MTR_NEWLY_AVAILABLE = 0x40, + MTRPumpConfigurationAndControlPumpStatusBitmapRemoteFlow MTR_NEWLY_AVAILABLE = 0x80, + MTRPumpConfigurationAndControlPumpStatusBitmapRemoteTemperature MTR_NEWLY_AVAILABLE = 0x100, +} MTR_NEWLY_AVAILABLE; + typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatus) { - MTRPumpConfigurationAndControlPumpStatusDeviceFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, - MTRPumpConfigurationAndControlPumpStatusSupplyfault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2, - MTRPumpConfigurationAndControlPumpStatusSpeedLow API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4, - MTRPumpConfigurationAndControlPumpStatusSpeedHigh API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x8, - MTRPumpConfigurationAndControlPumpStatusLocalOverride API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x10, - MTRPumpConfigurationAndControlPumpStatusRunning API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x20, - MTRPumpConfigurationAndControlPumpStatusRemotePressure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x40, - MTRPumpConfigurationAndControlPumpStatusRemoteFlow API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x80, + MTRPumpConfigurationAndControlPumpStatusDeviceFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapDeviceFault") + = 0x1, + MTRPumpConfigurationAndControlPumpStatusSupplyfault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSupplyfault") + = 0x2, + MTRPumpConfigurationAndControlPumpStatusSpeedLow API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSpeedLow") + = 0x4, + MTRPumpConfigurationAndControlPumpStatusSpeedHigh API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSpeedHigh") + = 0x8, + MTRPumpConfigurationAndControlPumpStatusLocalOverride API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapLocalOverride") + = 0x10, + MTRPumpConfigurationAndControlPumpStatusRunning API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapRunning") + = 0x20, + MTRPumpConfigurationAndControlPumpStatusRemotePressure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapRemotePressure") + = 0x40, + MTRPumpConfigurationAndControlPumpStatusRemoteFlow API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapRemoteFlow") + = 0x80, MTRPumpConfigurationAndControlPumpStatusRemoteTemperature API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapRemoteTemperature") = 0x100, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmap"); typedef NS_ENUM(uint8_t, MTRThermostatSetpointAdjustMode) { MTRThermostatSetpointAdjustModeHeat API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 760362d0194706..087b588ccfe506 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -58436,7 +58436,7 @@ - (void)readAttributeEffectiveOperationModeWithCompletion:(void (^)( { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveOperationMode::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -58447,7 +58447,7 @@ - (void)subscribeAttributeEffectiveOperationModeWithParams:(MTRSubscribeParams * (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveOperationMode::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -58458,9 +58458,9 @@ + (void)readAttributeEffectiveOperationModeWithClusterStateCache:(MTRClusterStat completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(PumpConfigurationAndControlClusterOperationModeEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveOperationMode::TypeInfo; @@ -58482,7 +58482,7 @@ - (void)readAttributeEffectiveControlModeWithCompletion:(void (^)(NSNumber * _Nu { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveControlMode::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -58493,7 +58493,7 @@ - (void)subscribeAttributeEffectiveControlModeWithParams:(MTRSubscribeParams * _ (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveControlMode::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -58504,9 +58504,9 @@ + (void)readAttributeEffectiveControlModeWithClusterStateCache:(MTRClusterStateC completion: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(PumpConfigurationAndControlClusterPumpControlModeAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(PumpConfigurationAndControlClusterControlModeEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = PumpConfigurationAndControl::Attributes::EffectiveControlMode::TypeInfo; @@ -58832,7 +58832,7 @@ - (void)readAttributeOperationModeWithCompletion:(void (^)(NSNumber * _Nullable { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -58879,7 +58879,7 @@ - (void)subscribeAttributeOperationModeWithParams:(MTRSubscribeParams * _Nonnull reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -58889,9 +58889,9 @@ + (void)readAttributeOperationModeWithClusterStateCache:(MTRClusterStateCacheCon queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(PumpConfigurationAndControlClusterOperationModeEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = PumpConfigurationAndControl::Attributes::OperationMode::TypeInfo; @@ -58913,7 +58913,7 @@ - (void)readAttributeControlModeWithCompletion:(void (^)(NSNumber * _Nullable va { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -58960,7 +58960,7 @@ - (void)subscribeAttributeControlModeWithParams:(MTRSubscribeParams * _Nonnull)p reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -58970,9 +58970,9 @@ + (void)readAttributeControlModeWithClusterStateCache:(MTRClusterStateCacheConta queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(PumpConfigurationAndControlClusterPumpControlModeAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(PumpConfigurationAndControlClusterControlModeEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = PumpConfigurationAndControl::Attributes::ControlMode::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 5e1c137c498eff..b5759a2a17d698 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -418,14 +418,14 @@ typedef void (*NullableWindowCoveringClusterEndProductTypeAttributeCallback)( typedef void (*WindowCoveringClusterTypeAttributeCallback)(void *, chip::app::Clusters::WindowCovering::Type); typedef void (*NullableWindowCoveringClusterTypeAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*PumpConfigurationAndControlClusterPumpControlModeAttributeCallback)( - void *, chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode); -typedef void (*NullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*PumpConfigurationAndControlClusterPumpOperationModeAttributeCallback)( - void *, chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode); -typedef void (*NullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*PumpConfigurationAndControlClusterControlModeEnumAttributeCallback)( + void *, chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum); +typedef void (*NullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*PumpConfigurationAndControlClusterOperationModeEnumAttributeCallback)( + void *, chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum); +typedef void (*NullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*ThermostatClusterSetpointAdjustModeAttributeCallback)(void *, chip::app::Clusters::Thermostat::SetpointAdjustMode); typedef void (*NullableThermostatClusterSetpointAdjustModeAttributeCallback)( void *, const chip::app::DataModel::Nullable &); @@ -975,7 +975,7 @@ typedef void (*BarrierControlEventListListAttributeCallback)(void * context, typedef void (*BarrierControlAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*PumpConfigurationAndControlPumpStatusAttributeCallback)( - void *, chip::BitMask); + void *, chip::BitMask); typedef void (*PumpConfigurationAndControlGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*PumpConfigurationAndControlAcceptedCommandListListAttributeCallback)( @@ -8715,7 +8715,8 @@ class MTRPumpConfigurationAndControlPumpStatusAttributeCallbackBridge MTRActionBlock action) : MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::BitMask value); + static void OnSuccessFn(void * context, + chip::BitMask value); }; class MTRPumpConfigurationAndControlPumpStatusAttributeCallbackSubscriptionBridge @@ -19383,147 +19384,147 @@ class MTRNullableWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value); + static void OnSuccessFn(void * context, chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value); }; -class MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge - : public MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge +class MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackSubscriptionBridge + : public MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge { public: - MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge( + MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(queue, handler, action), + MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge::OnDone; + using MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(dispatch_queue_t queue, + MTRNullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(dispatch_queue_t queue, + MTRNullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge - : public MTRNullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge +class MTRNullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallbackSubscriptionBridge + : public MTRNullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge { public: - MTRNullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge( + MTRNullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge(queue, handler, action), + MTRNullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge::OnDone; + using MTRNullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value); + static void OnSuccessFn(void * context, chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value); }; -class MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge - : public MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge +class MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackSubscriptionBridge + : public MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge { public: - MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge( + MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(queue, handler, action), + MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge::OnDone; + using MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(dispatch_queue_t queue, + MTRNullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(dispatch_queue_t queue, + MTRNullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge - : public MTRNullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge +class MTRNullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackSubscriptionBridge + : public MTRNullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge { public: - MTRNullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge( + MTRNullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge(queue, handler, action), + MTRNullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge::OnDone; + using MTRNullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index dfe50dd7293698..bc027fe230faca 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -8525,7 +8525,7 @@ } void MTRPumpConfigurationAndControlPumpStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::BitMask value) + void * context, chip::BitMask value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedShort:value.Raw()]; @@ -19595,15 +19595,15 @@ } } -void MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value) +void MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRPumpConfigurationAndControlClusterControlModeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -19618,8 +19618,8 @@ } } -void MTRNullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -19630,7 +19630,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullablePumpConfigurationAndControlClusterControlModeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -19645,15 +19645,15 @@ } } -void MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value) +void MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRPumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRPumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -19668,8 +19668,8 @@ } } -void MTRNullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value) +void MTRNullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -19680,7 +19680,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullablePumpConfigurationAndControlClusterPumpOperationModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullablePumpConfigurationAndControlClusterOperationModeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index 956e1628f22048..cbf740c561d0fb 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -14680,9 +14680,10 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl namespace PumpStatus { -EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask * value) +EmberAfStatus Get(chip::EndpointId endpoint, + chip::BitMask * value) { - using Traits = NumericAttributeTraits>; + using Traits = NumericAttributeTraits>; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, readable, sizeof(temp)); @@ -14694,9 +14695,10 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask value) +EmberAfStatus Set(chip::EndpointId endpoint, + chip::BitMask value) { - using Traits = NumericAttributeTraits>; + using Traits = NumericAttributeTraits>; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -14711,9 +14713,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, readable, sizeof(temp)); @@ -14725,9 +14727,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurat *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -14742,9 +14744,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurat namespace EffectiveControlMode { -EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, readable, sizeof(temp)); @@ -14756,9 +14758,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurat *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -15038,9 +15040,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl namespace OperationMode { -EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, readable, sizeof(temp)); @@ -15052,9 +15054,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurat *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -15069,9 +15071,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurat namespace ControlMode { -EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::PumpConfigurationAndControl::Id, Id, readable, sizeof(temp)); @@ -15083,9 +15085,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurat *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index a34bcdffbef3bb..5139803de5504e 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -2527,20 +2527,21 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl namespace PumpStatus { EmberAfStatus Get(chip::EndpointId endpoint, - chip::BitMask * value); // PumpStatus -EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask value); + chip::BitMask * value); // PumpStatusBitmap +EmberAfStatus Set(chip::EndpointId endpoint, + chip::BitMask value); } // namespace PumpStatus namespace EffectiveOperationMode { EmberAfStatus Get(chip::EndpointId endpoint, - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode * value); // PumpOperationMode -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value); + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum * value); // OperationModeEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value); } // namespace EffectiveOperationMode namespace EffectiveControlMode { EmberAfStatus Get(chip::EndpointId endpoint, - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode * value); // PumpControlMode -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value); + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum * value); // ControlModeEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value); } // namespace EffectiveControlMode namespace Capacity { @@ -2580,14 +2581,14 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl namespace OperationMode { EmberAfStatus Get(chip::EndpointId endpoint, - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode * value); // PumpOperationMode -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value); + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum * value); // OperationModeEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value); } // namespace OperationMode namespace ControlMode { EmberAfStatus Get(chip::EndpointId endpoint, - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode * value); // PumpControlMode -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value); + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum * value); // ControlModeEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value); } // namespace ControlMode namespace FeatureMap { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index e3c28c52eabe28..74da3d8191b43d 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -1435,9 +1435,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(WindowCovering::Type va } } -static auto __attribute__((unused)) EnsureKnownEnumValue(PumpConfigurationAndControl::PumpControlMode val) +static auto __attribute__((unused)) EnsureKnownEnumValue(PumpConfigurationAndControl::ControlModeEnum val) { - using EnumType = PumpConfigurationAndControl::PumpControlMode; + using EnumType = PumpConfigurationAndControl::ControlModeEnum; switch (val) { case EnumType::kConstantSpeed: @@ -1451,9 +1451,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(PumpConfigurationAndCon return static_cast(4); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(PumpConfigurationAndControl::PumpOperationMode val) +static auto __attribute__((unused)) EnsureKnownEnumValue(PumpConfigurationAndControl::OperationModeEnum val) { - using EnumType = PumpConfigurationAndControl::PumpOperationMode; + using EnumType = PumpConfigurationAndControl::OperationModeEnum; switch (val) { case EnumType::kNormal: diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index f72e77a6624ebf..cbc6c8c091df54 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -1862,8 +1862,8 @@ namespace BarrierControl {} // namespace BarrierControl namespace PumpConfigurationAndControl { -// Enum for PumpControlMode -enum class PumpControlMode : uint8_t +// Enum for ControlModeEnum +enum class ControlModeEnum : uint8_t { kConstantSpeed = 0x00, kConstantPressure = 0x01, @@ -1878,8 +1878,8 @@ enum class PumpControlMode : uint8_t kUnknownEnumValue = 4, }; -// Enum for PumpOperationMode -enum class PumpOperationMode : uint8_t +// Enum for OperationModeEnum +enum class OperationModeEnum : uint8_t { kNormal = 0x00, kMinimum = 0x01, @@ -1901,11 +1901,11 @@ enum class PumpFeature : uint32_t kConstantSpeed = 0x8, kConstantTemperature = 0x10, kAutomatic = 0x20, - kLocal = 0x40, + kLocalOperation = 0x40, }; -// Bitmap for PumpStatus -enum class PumpStatus : uint16_t +// Bitmap for PumpStatusBitmap +enum class PumpStatusBitmap : uint16_t { kDeviceFault = 0x1, kSupplyfault = 0x2, diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 3f7322050702d4..e33172adbc8772 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -16227,9 +16227,9 @@ struct TypeInfo namespace PumpStatus { struct TypeInfo { - using Type = chip::BitMask; - using DecodableType = chip::BitMask; - using DecodableArgType = chip::BitMask; + using Type = chip::BitMask; + using DecodableType = chip::BitMask; + using DecodableArgType = chip::BitMask; static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::PumpStatus::Id; } @@ -16239,9 +16239,9 @@ struct TypeInfo namespace EffectiveOperationMode { struct TypeInfo { - using Type = chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode; - using DecodableType = chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode; - using DecodableArgType = chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode; + using Type = chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum; + using DecodableType = chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum; + using DecodableArgType = chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum; static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::EffectiveOperationMode::Id; } @@ -16251,9 +16251,9 @@ struct TypeInfo namespace EffectiveControlMode { struct TypeInfo { - using Type = chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode; - using DecodableType = chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode; - using DecodableArgType = chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode; + using Type = chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum; + using DecodableType = chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum; + using DecodableArgType = chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum; static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::EffectiveControlMode::Id; } @@ -16323,9 +16323,9 @@ struct TypeInfo namespace OperationMode { struct TypeInfo { - using Type = chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode; - using DecodableType = chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode; - using DecodableArgType = chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode; + using Type = chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum; + using DecodableType = chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum; + using DecodableArgType = chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum; static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OperationMode::Id; } @@ -16335,9 +16335,9 @@ struct TypeInfo namespace ControlMode { struct TypeInfo { - using Type = chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode; - using DecodableType = chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode; - using DecodableArgType = chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode; + using Type = chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum; + using DecodableType = chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum; + using DecodableArgType = chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum; static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ControlMode::Id; } @@ -16403,20 +16403,20 @@ struct TypeInfo Attributes::MinConstTemp::TypeInfo::DecodableType minConstTemp; Attributes::MaxConstTemp::TypeInfo::DecodableType maxConstTemp; Attributes::PumpStatus::TypeInfo::DecodableType pumpStatus = - static_cast>(0); + static_cast>(0); Attributes::EffectiveOperationMode::TypeInfo::DecodableType effectiveOperationMode = - static_cast(0); + static_cast(0); Attributes::EffectiveControlMode::TypeInfo::DecodableType effectiveControlMode = - static_cast(0); + static_cast(0); Attributes::Capacity::TypeInfo::DecodableType capacity; Attributes::Speed::TypeInfo::DecodableType speed; Attributes::LifetimeRunningHours::TypeInfo::DecodableType lifetimeRunningHours; Attributes::Power::TypeInfo::DecodableType power; Attributes::LifetimeEnergyConsumed::TypeInfo::DecodableType lifetimeEnergyConsumed; Attributes::OperationMode::TypeInfo::DecodableType operationMode = - static_cast(0); + static_cast(0); Attributes::ControlMode::TypeInfo::DecodableType controlMode = - static_cast(0); + static_cast(0); Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; Attributes::EventList::TypeInfo::DecodableType eventList; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 39592423078f0c..98409d06a311fe 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -12539,12 +12539,12 @@ void registerClusterPumpConfigurationAndControl(Commands & commands, CredentialI make_unique>>(Id, "max-const-temp", INT16_MIN, INT16_MAX, Attributes::MaxConstTemp::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>>( + make_unique>>( Id, "pump-status", 0, UINT16_MAX, Attributes::PumpStatus::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>( + make_unique>( Id, "effective-operation-mode", 0, UINT8_MAX, Attributes::EffectiveOperationMode::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>( + make_unique>( Id, "effective-control-mode", 0, UINT8_MAX, Attributes::EffectiveControlMode::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( @@ -12559,9 +12559,9 @@ void registerClusterPumpConfigurationAndControl(Commands & commands, CredentialI make_unique>>(Id, "lifetime-energy-consumed", 0, UINT32_MAX, Attributes::LifetimeEnergyConsumed::Id, WriteCommandType::kWrite, credsIssuerConfig), // - make_unique>( + make_unique>( Id, "operation-mode", 0, UINT8_MAX, Attributes::OperationMode::Id, WriteCommandType::kWrite, credsIssuerConfig), // - make_unique>( + make_unique>( Id, "control-mode", 0, UINT8_MAX, Attributes::ControlMode::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 16b35f0739e84d..8fc9b5f18904d5 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -7413,17 +7413,17 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("MaxConstTemp", 1, value); } case PumpConfigurationAndControl::Attributes::PumpStatus::Id: { - chip::BitMask value; + chip::BitMask value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("PumpStatus", 1, value); } case PumpConfigurationAndControl::Attributes::EffectiveOperationMode::Id: { - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("EffectiveOperationMode", 1, value); } case PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id: { - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("EffectiveControlMode", 1, value); } @@ -7453,12 +7453,12 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("LifetimeEnergyConsumed", 1, value); } case PumpConfigurationAndControl::Attributes::OperationMode::Id: { - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("OperationMode", 1, value); } case PumpConfigurationAndControl::Attributes::ControlMode::Id: { - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ControlMode", 1, value); } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 691d46a2ddfcc2..284505b8973e85 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -39988,7 +39988,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::BitMask value; + chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "bitmap16", "bitmap16")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -39998,7 +39998,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -40008,7 +40008,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -40068,7 +40068,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand case 22: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -40078,7 +40078,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand case 23: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); @@ -40296,7 +40296,7 @@ class Test_TC_PCC_2_2Suite : public TestCommand case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("effectiveOperationMode", value, 0U)); } @@ -40307,7 +40307,7 @@ class Test_TC_PCC_2_2Suite : public TestCommand case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("effectiveOperationMode", value, 1U)); } @@ -40318,7 +40318,7 @@ class Test_TC_PCC_2_2Suite : public TestCommand case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("effectiveOperationMode", value, 2U)); } @@ -40329,7 +40329,7 @@ class Test_TC_PCC_2_2Suite : public TestCommand case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("effectiveOperationMode", value, 3U)); } @@ -40360,8 +40360,8 @@ class Test_TC_PCC_2_2Suite : public TestCommand LogStep(1, "TH write 0 (Normal) to the OperationMode attribute to DUT"); VerifyOrDo(!ShouldSkip("PCC.S.A0020"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; - value = static_cast(0); + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; + value = static_cast(0); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id, PumpConfigurationAndControl::Attributes::OperationMode::Id, value, chip::NullOptional, chip::NullOptional); @@ -40376,8 +40376,8 @@ class Test_TC_PCC_2_2Suite : public TestCommand LogStep(3, "TH write 1 (Minimum) to the OperationMode attribute to DUT"); VerifyOrDo(!ShouldSkip("PCC.S.F03 && PCC.S.A0020"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; - value = static_cast(1); + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; + value = static_cast(1); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id, PumpConfigurationAndControl::Attributes::OperationMode::Id, value, chip::NullOptional, chip::NullOptional); @@ -40392,8 +40392,8 @@ class Test_TC_PCC_2_2Suite : public TestCommand LogStep(5, "TH write 2 (Maximum) to the OperationMode attribute to DUT one at a time."); VerifyOrDo(!ShouldSkip("PCC.S.F03 && PCC.S.A0020"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; - value = static_cast(2); + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; + value = static_cast(2); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id, PumpConfigurationAndControl::Attributes::OperationMode::Id, value, chip::NullOptional, chip::NullOptional); @@ -40408,8 +40408,8 @@ class Test_TC_PCC_2_2Suite : public TestCommand LogStep(7, "TH write 3 (Local) to the OperationMode attribute to DUT"); VerifyOrDo(!ShouldSkip("PCC.S.F06 && PCC.S.A0020"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; - value = static_cast(3); + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; + value = static_cast(3); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id, PumpConfigurationAndControl::Attributes::OperationMode::Id, value, chip::NullOptional, chip::NullOptional); @@ -40471,7 +40471,7 @@ class Test_TC_PCC_2_3Suite : public TestCommand case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("effectiveOperationMode", value, 0U)); } @@ -40482,7 +40482,7 @@ class Test_TC_PCC_2_3Suite : public TestCommand case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("effectiveControlMode", value, 0U)); } @@ -40493,7 +40493,7 @@ class Test_TC_PCC_2_3Suite : public TestCommand case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("effectiveControlMode", value, 1U)); } @@ -40504,7 +40504,7 @@ class Test_TC_PCC_2_3Suite : public TestCommand case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("effectiveControlMode", value, 2U)); } @@ -40515,7 +40515,7 @@ class Test_TC_PCC_2_3Suite : public TestCommand case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("effectiveControlMode", value, 3U)); } @@ -40526,7 +40526,7 @@ class Test_TC_PCC_2_3Suite : public TestCommand case 12: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("effectiveControlMode", value, 5U)); } @@ -40537,7 +40537,7 @@ class Test_TC_PCC_2_3Suite : public TestCommand case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("effectiveControlMode", value, 7U)); } @@ -40568,8 +40568,8 @@ class Test_TC_PCC_2_3Suite : public TestCommand LogStep(1, "Write 0 to the OperationMode attribute to DUT"); VerifyOrDo(!ShouldSkip("PCC.S.A0020"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; - chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; - value = static_cast(0); + chip::app::Clusters::PumpConfigurationAndControl::OperationModeEnum value; + value = static_cast(0); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id, PumpConfigurationAndControl::Attributes::OperationMode::Id, value, chip::NullOptional, chip::NullOptional); @@ -40584,8 +40584,8 @@ class Test_TC_PCC_2_3Suite : public TestCommand LogStep(3, "Write 0 to the ControlMode attribute to DUT"); VerifyOrDo(!ShouldSkip("PCC.S.F03 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; - value = static_cast(0); + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; + value = static_cast(0); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id, PumpConfigurationAndControl::Attributes::ControlMode::Id, value, chip::NullOptional, chip::NullOptional); @@ -40600,8 +40600,8 @@ class Test_TC_PCC_2_3Suite : public TestCommand LogStep(5, "Write 1 to the ControlMode attribute to DUT"); VerifyOrDo(!ShouldSkip("PCC.S.F00 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; - value = static_cast(1); + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; + value = static_cast(1); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id, PumpConfigurationAndControl::Attributes::ControlMode::Id, value, chip::NullOptional, chip::NullOptional); @@ -40616,8 +40616,8 @@ class Test_TC_PCC_2_3Suite : public TestCommand LogStep(7, "Write 2 to the ControlMode attribute to DUT"); VerifyOrDo(!ShouldSkip("PCC.S.F01 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; - value = static_cast(2); + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; + value = static_cast(2); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id, PumpConfigurationAndControl::Attributes::ControlMode::Id, value, chip::NullOptional, chip::NullOptional); @@ -40632,8 +40632,8 @@ class Test_TC_PCC_2_3Suite : public TestCommand LogStep(9, "Write 3 to the ControlMode attribute to DUT"); VerifyOrDo(!ShouldSkip("PCC.S.F02 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; - value = static_cast(3); + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; + value = static_cast(3); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id, PumpConfigurationAndControl::Attributes::ControlMode::Id, value, chip::NullOptional, chip::NullOptional); @@ -40648,8 +40648,8 @@ class Test_TC_PCC_2_3Suite : public TestCommand LogStep(11, "Write 5 to the ControlMode attribute to DUT"); VerifyOrDo(!ShouldSkip("PCC.S.F04 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; - value = static_cast(5); + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; + value = static_cast(5); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id, PumpConfigurationAndControl::Attributes::ControlMode::Id, value, chip::NullOptional, chip::NullOptional); @@ -40664,8 +40664,8 @@ class Test_TC_PCC_2_3Suite : public TestCommand LogStep(13, "Write 7 to the ControlMode attribute to DUT"); VerifyOrDo(!ShouldSkip("PCC.S.F05 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; - chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; - value = static_cast(7); + chip::app::Clusters::PumpConfigurationAndControl::ControlModeEnum value; + value = static_cast(7); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id, PumpConfigurationAndControl::Attributes::ControlMode::Id, value, chip::NullOptional, chip::NullOptional);