Address PR review comments

project-chip · May 24, 2023 · af58c1a · af58c1a
1 parent 394387f
commit af58c1a
Show file tree

Hide file tree

Showing 6 changed files with 184 additions and 182 deletions.
diff --git a/...darwin/Framework/CHIP/MTRAttributeUtils.h → ...amework/CHIP/MTRAttributeSpecifiedCheck.h b/...darwin/Framework/CHIP/MTRAttributeUtils.h → ...amework/CHIP/MTRAttributeSpecifiedCheck.h
diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -18,7 +18,7 @@
 #import <os/lock.h>
 
 #import "MTRAsyncCallbackWorkQueue.h"
-#import "MTRAttributeUtils.h"
+#import "MTRAttributeSpecifiedCheck.h"
 #import "MTRBaseDevice_Internal.h"
 #import "MTRBaseSubscriptionCallback.h"
 #import "MTRCluster.h"
@@ -629,7 +629,7 @@ - (void)_setupSubscription
 // Helper function to determine whether an attribute has "Changes Omitted" quality, which indicates that past the priming report in
 // a subscription, this attribute is not expected to be reported when its value changes
 //   * TODO: xml+codegen version to replace this hardcoded list.
-static BOOL _MTRAttributeHasChangesOmittedQuality(MTRAttributePath * attributePath)
+static BOOL AttributeHasChangesOmittedQuality(MTRAttributePath * attributePath)
 {
     switch (attributePath.cluster.unsignedLongValue) {
     case MTRClusterEthernetNetworkDiagnosticsID:
@@ -638,6 +638,7 @@ static BOOL _MTRAttributeHasChangesOmittedQuality(MTRAttributePath * attributePa
         case MTRClusterEthernetNetworkDiagnosticsAttributePacketTxCountID:
         case MTRClusterEthernetNetworkDiagnosticsAttributeTxErrCountID:
         case MTRClusterEthernetNetworkDiagnosticsAttributeCollisionCountID:
+        case MTRClusterEthernetNetworkDiagnosticsAttributeOverrunCountID:
         case MTRClusterEthernetNetworkDiagnosticsAttributeCarrierDetectID:
         case MTRClusterEthernetNetworkDiagnosticsAttributeTimeSinceResetID:
             return YES;
@@ -682,6 +683,7 @@ static BOOL _MTRAttributeHasChangesOmittedQuality(MTRAttributePath * attributePa
         case MTRClusterThreadNetworkDiagnosticsAttributeTxErrBusyChannelCountID:
         case MTRClusterThreadNetworkDiagnosticsAttributeRxTotalCountID:
         case MTRClusterThreadNetworkDiagnosticsAttributeRxUnicastCountID:
+        case MTRClusterThreadNetworkDiagnosticsAttributeRxBroadcastCountID:
         case MTRClusterThreadNetworkDiagnosticsAttributeRxDataCountID:
         case MTRClusterThreadNetworkDiagnosticsAttributeRxDataPollCountID:
         case MTRClusterThreadNetworkDiagnosticsAttributeRxBeaconCountID:
@@ -761,7 +763,7 @@ static BOOL _MTRAttributeHasChangesOmittedQuality(MTRAttributePath * attributePa
                                                                          attributeID:attributeID];
 
     BOOL attributeIsSpecified = MTRAttributeIsSpecified(clusterID.unsignedIntValue, attributeID.unsignedIntValue);
-    BOOL hasChangesOmittedQuality = _MTRAttributeHasChangesOmittedQuality(attributePath);
+    BOOL hasChangesOmittedQuality = AttributeHasChangesOmittedQuality(attributePath);
 
     // Return current known / expected value right away
     NSDictionary<NSString *, id> * attributeValueToReturn = [self _attributeValueDictionaryForAttributePath:attributePath];

diff --git a/...CHIP/templates/MTRAttributeUtils-src.zapt → ...lates/MTRAttributeSpecifiedCheck-src.zapt b/...CHIP/templates/MTRAttributeUtils-src.zapt → ...lates/MTRAttributeSpecifiedCheck-src.zapt
@@ -1,6 +1,6 @@
 {{> header excludeZapComment=true}}
 
-#import "MTRAttributeUtils.h"
+#import "MTRAttributeSpecifiedCheck.h"
 
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
@@ -10,7 +10,7 @@ using namespace chip::app;
 
 {{#zcl_clusters}}
 {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
-static BOOL MTRAttributeIsSpecifiedIn{{asUpperCamelCase name preserveAcronyms=true}}Cluster(AttributeId aAttributeId)
+static BOOL AttributeIsSpecifiedIn{{asUpperCamelCase name preserveAcronyms=true}}Cluster(AttributeId aAttributeId)
 {
     using namespace Clusters::{{asUpperCamelCase name}};
     switch (aAttributeId) {
@@ -36,7 +36,7 @@ BOOL MTRAttributeIsSpecified(ClusterId aClusterId, AttributeId aAttributeId)
         {{#zcl_clusters}}
         {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
         case Clusters::{{asUpperCamelCase name}}::Id: {
-            return MTRAttributeIsSpecifiedIn{{asUpperCamelCase name preserveAcronyms=true}}Cluster(aAttributeId);
+            return AttributeIsSpecifiedIn{{asUpperCamelCase name preserveAcronyms=true}}Cluster(aAttributeId);
         }
         {{/if}}
         {{/zcl_clusters}}

diff --git a/src/darwin/Framework/CHIP/templates/templates.json b/src/darwin/Framework/CHIP/templates/templates.json
@@ -134,9 +134,9 @@
             "output": "src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h"
         },
         {
-            "path": "MTRAttributeUtils-src.zapt",
-            "name": "Utility functions for attributes",
-            "output": "src/darwin/Framework/CHIP/zap-generated/MTRAttributeUtils.mm"
+            "path": "MTRAttributeSpecifiedCheck-src.zapt",
+            "name": "Function to check if attribute is specified",
+            "output": "src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm"
         }
     ]
 }