Restyled by clang-format

Fix XML errors

Author: restyled-commits

data_model/clusters/MeterIdentification.xml

@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 
 :xrefstyle: short
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0B01" name="Meter Identification" revision="1">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0B01" name="Meter Identification Cluster" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial version"/>
   </revisionHistory>

examples/all-clusters-app/all-clusters-common/src/meter-identification-stub.cpp

@@ -34,9 +34,8 @@ void emberAfMeterIdentificationClusterInitCallback(chip::EndpointId endpointId)
     gMIDelegate = std::make_unique<MeterIdentificationDelegate>();
     if (gMIDelegate)
     {
-        gMIInstance = std::make_unique<MeterIdentificationInstance>(
-            endpointId, *gMIDelegate,
-            BitMask<Feature, uint32_t>(Feature::kPowerThreshold));
+        gMIInstance = std::make_unique<MeterIdentificationInstance>(endpointId, *gMIDelegate,
+                                                                    BitMask<Feature, uint32_t>(Feature::kPowerThreshold));
 
         gMIInstance->Init();
     }

examples/energy-management-app/energy-management-common/include/MeterIdentificationDelegate.h

@@ -40,12 +40,12 @@ class MeterIdentificationDelegate : public MeterIdentification::Delegate
     DataModel::Nullable<uint64_t> GetPowerThreshold() override { return mPowerThreshold; };
     DataModel::Nullable<PowerThresholdSourceEnum> GetPowerThresholdSource() override { return mPowerThresholdSource; };
 
-    CHIP_ERROR SetCustomerName(CharSpan &value) override;
+    CHIP_ERROR SetCustomerName(CharSpan & value) override;
 
     // Internal Application API to set attribute values
     CHIP_ERROR SetMeterType(DataModel::Nullable<MeterTypeEnum>);
-    CHIP_ERROR SetUtilityName(CharSpan &value);
-    CHIP_ERROR SetPointOfDelivery(CharSpan &value);
+    CHIP_ERROR SetUtilityName(CharSpan & value);
+    CHIP_ERROR SetPointOfDelivery(CharSpan & value);
     CHIP_ERROR GetPowerThreshold(DataModel::Nullable<uint64_t>);
     CHIP_ERROR GetPowerThresholdSource(DataModel::Nullable<PowerThresholdSourceEnum>);
 

examples/energy-management-app/energy-management-common/src/MeterIdentificationDelegate.cpp

@@ -32,7 +32,6 @@ using namespace chip::app::Clusters::MeterIdentification::Structs;
 using chip::app::Clusters::MeterIdentification::MeterTypeEnum;
 using chip::app::Clusters::MeterIdentification::PowerThresholdSourceEnum;
 
-
 CHIP_ERROR MeterIdentificationInstance::Init()
 {
     return Instance::Init();
@@ -59,7 +58,7 @@ CHIP_ERROR MeterIdentificationDelegate::SetMeterType(DataModel::Nullable<MeterTy
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR MeterIdentificationDelegate::SetCustomerName(CharSpan &newValue)
+CHIP_ERROR MeterIdentificationDelegate::SetCustomerName(CharSpan & newValue)
 {
     CharSpan oldValue = mCustomerName;
 
@@ -73,7 +72,7 @@ CHIP_ERROR MeterIdentificationDelegate::SetCustomerName(CharSpan &newValue)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR MeterIdentificationDelegate::SetUtilityName(CharSpan &newValue)
+CHIP_ERROR MeterIdentificationDelegate::SetUtilityName(CharSpan & newValue)
 {
     CharSpan oldValue = mUtilityName;
 
@@ -87,7 +86,7 @@ CHIP_ERROR MeterIdentificationDelegate::SetUtilityName(CharSpan &newValue)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR MeterIdentificationDelegate::SetPointOfDelivery(CharSpan &newValue)
+CHIP_ERROR MeterIdentificationDelegate::SetPointOfDelivery(CharSpan & newValue)
 {
     CharSpan oldValue = mPointOfDelivery;
 

src/app/clusters/meter-identification-server/meter-identification-server.h

@@ -23,6 +23,7 @@
 
 #include <app-common/zap-generated/cluster-enums.h>
 #include <app-common/zap-generated/cluster-objects.h>
+#include <app/AttributeAccessInterface.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPError.h>
 
@@ -42,14 +43,14 @@ struct Delegate
 
     void SetEndpointId(EndpointId aEndpoint) { mEndpointId = aEndpoint; }
 
-    virtual DataModel::Nullable<MeterTypeEnum> GetMeterType() = 0;
-    virtual CharSpan GetCustomerName() = 0;
-    virtual CharSpan GetUtilityName() = 0;
-    virtual CharSpan GetPointOfDelivery() = 0;
-    virtual DataModel::Nullable<uint64_t> GetPowerThreshold() = 0;
+    virtual DataModel::Nullable<MeterTypeEnum> GetMeterType()                       = 0;
+    virtual CharSpan GetCustomerName()                                              = 0;
+    virtual CharSpan GetUtilityName()                                               = 0;
+    virtual CharSpan GetPointOfDelivery()                                           = 0;
+    virtual DataModel::Nullable<uint64_t> GetPowerThreshold()                       = 0;
     virtual DataModel::Nullable<PowerThresholdSourceEnum> GetPowerThresholdSource() = 0;
 
-    virtual CHIP_ERROR SetCustomerName(char *value) = 0;
+    virtual CHIP_ERROR SetCustomerName(char * value) = 0;
 
 protected:
     EndpointId mEndpointId = 0;
@@ -59,8 +60,7 @@ class Instance : public AttributeAccessInterface
 {
 public:
     Instance(EndpointId aEndpointId, Delegate & aDelegate, BitMask<Feature> aFeature) :
-        AttributeAccessInterface(MakeOptional(aEndpointId), Id),
-        mDelegate(aDelegate), mFeature(aFeature)
+        AttributeAccessInterface(MakeOptional(aEndpointId), Id), mDelegate(aDelegate), mFeature(aFeature)
     {
         /* set the base class delegates endpointId */
         mDelegate.SetEndpointId(aEndpointId);

src/app/zap-templates/zcl/data-model/chip/meter-identification-cluster.xml

@@ -11,9 +11,25 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
+
 <configurator>
   <domain name="Energy Management"/>
-  <cluster apiMaturity="provisional">
+
+  <enum name="MeterTypeEnum" type="enum8">
+    <cluster code="0x0B01"/>
+    <item name="Utility" value="0x00"/>
+    <item name="Private" value="0x01"/>
+    <item name="Generic" value="0x02"/>
+  </enum>
+
+  <enum name="PowerThresholdSourceEnum" type="enum8">
+    <cluster code="0x0B01"/>
+    <item name="Contract" value="0x00"/>
+    <item name="Regulator" value="0x01"/>
+    <item name="Equipment" value="0x02"/>
+  </enum>
+
+  <cluster>
     <name>Meter Identification</name>
     <domain>Energy Management</domain>
     <code>0x0B01</code>
@@ -24,7 +40,7 @@ limitations under the License.
 
     <features>
       <feature bit="0" code="PWRTHLD" name="PowerThreshold" summary="Supports information about power threshold">
-        <optionalConform/>
+        <provisionalConform/>
       </feature>
     </features>
 
@@ -36,22 +52,8 @@ limitations under the License.
     </attribute>
     <attribute code="0x0002" side="server" define="UTILITY_NAME" type="char_string" length="16" isNullable="true">UtilityName</attribute>
     <attribute code="0x0003" side="server" define="POINT_OF_DELIVERY" type="char_string" length="16" isNullable="true">PointOfDelivery</attribute>
-    <attribute code="0x0004" side="server" define="POWER_THRESHOLD" type="power-mW" isNullable="true">PowerThreshold</attribute>
+    <attribute code="0x0004" side="server" define="POWER_THRESHOLD" type="power_mw" isNullable="true">PowerThreshold</attribute>
     <attribute code="0x0005" side="server" define="POWER_THRESHOLD_SOURCE" type="PowerThresholdSourceEnum" isNullable="true">PowerThresholdSource</attribute>
   </cluster>
 
-  <enum name="MeterTypeEnum" type="enum8">
-    <cluster code="0x0B01"/>
-    <item name="Utility" value="0x00"/>
-    <item name="Private" value="0x01"/>
-    <item name="Generic" value="0x02"/>
-  </enum>
-
-  <enum name="PowerThresholdSourceEnum" type="enum8">
-    <cluster code="0x0B01"/>
-    <item name="Contract" value="0x00"/>
-    <item name="Regulator" value="0x01"/>
-    <item name="Equipment" value="0x02"/>
-  </enum>
-
 </configurator>

src/controller/data_model/controller-clusters.matter

@@ -8810,6 +8810,40 @@ provisional cluster ContentAppObserver = 1296 {
   command ContentAppMessage(ContentAppMessageRequest): ContentAppMessageResponse = 0;
 }
 
+/** This cluster provides attributes for determining advanced information about utility metering device. */
+cluster MeterIdentification = 2817 {
+  revision 1; // NOTE: Default/not specifically set
+
+  enum MeterTypeEnum : enum8 {
+    kUtility = 0;
+    kPrivate = 1;
+    kGeneric = 2;
+  }
+
+  enum PowerThresholdSourceEnum : enum8 {
+    kContract = 0;
+    kRegulator = 1;
+    kEquipment = 2;
+  }
+
+  bitmap Feature : bitmap32 {
+    kPowerThreshold = 0x1;
+  }
+
+  readonly attribute nullable MeterTypeEnum meterType = 0;
+  attribute nullable char_string<64> customerName = 1;
+  readonly attribute nullable char_string<16> utilityName = 2;
+  readonly attribute nullable char_string<16> pointOfDelivery = 3;
+  readonly attribute nullable power_mw powerThreshold = 4;
+  readonly attribute nullable PowerThresholdSourceEnum powerThresholdSource = 5;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+}
+
 /** Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster.. */
 deprecated cluster ElectricalMeasurement = 2820 {
   revision 3;