Stop generating attribute accessors for AttributeAccessInterface-only…

… attributes. Those accessors can't work correctly and are just a bug waiting to happen if someone tries to use them.
project-chip · Apr 27, 2023 · e8dee4d · e8dee4d
1 parent cc6c414
commit e8dee4d
Show file tree

Hide file tree

Showing 6 changed files with 1,618 additions and 6,656 deletions.
diff --git a/src/app/zap-templates/templates/app/attributes/Accessors-src.zapt b/src/app/zap-templates/templates/app/attributes/Accessors-src.zapt
@@ -25,8 +25,10 @@ namespace {{asUpperCamelCase parent.label}} {
 namespace Attributes {
 
 {{/first}}
+{{#unless (isStrEqual storagePolicy "attributeAccessInterface")}}
 {{#if_is_struct type}}
-{{else if (canHaveSimpleAccessors this)}}
+#error Attribute "{{name}}" in cluster "{{../name}}" is struct-typed and must be added to the attributeAccessInterfaceAttributes object in src/app/zap-templates/zcl/zcl.json and src/app/zap-templates/zcl/zcl-with-test-extensions.json
+{{/if_is_struct}}
 namespace {{asUpperCamelCase label}} {
 
 {{#*inline "clusterId"}}Clusters::{{asUpperCamelCase parent.label}}::Id{{/inline}}
@@ -133,7 +135,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectTy
 
 } // namespace {{asUpperCamelCase label}}
 
-{{/if_is_struct}}
+{{/unless}}
 {{#last}}
 } // namespace Attributes
 } // {{asUpperCamelCase parent.label}}

diff --git a/src/app/zap-templates/templates/app/attributes/Accessors.zapt b/src/app/zap-templates/templates/app/attributes/Accessors.zapt
@@ -23,8 +23,7 @@ namespace {{asUpperCamelCase parent.label}} {
 namespace Attributes {
 
 {{/first}}
-{{#if_is_struct type}}
-{{else if (canHaveSimpleAccessors this)}}
+{{#unless (isStrEqual storagePolicy "attributeAccessInterface")}}
 namespace {{asUpperCamelCase label}} {
 EmberAfStatus Get(chip::EndpointId endpoint, {{accessorGetterType this}} value); // {{type}}
 EmberAfStatus Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectType type ns=parent.name forceNotNullable=true forceNotOptional=true}} value);
@@ -34,7 +33,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, {{zapTypeToEncodableClusterObjectTy
 {{/if}}
 } // namespace {{asUpperCamelCase label}}
 
-{{/if_is_struct}}
+{{/unless}}
 {{#last}}
 } // namespace Attributes
 } // {{asUpperCamelCase parent.label}}

diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -269,6 +269,19 @@
             "PacketUnicastTxCount",
             "CurrentMaxRate",
             "OverrunCount"
+        ],
+        "Channel": [
+            "Lineup",
+            "CurrentChannel"
+        ],
+        "Media Playback": [
+            "SampledPosition"
+        ],
+        "Application Launcher": [
+            "CurrentApp"
+        ],
+        "Application Basic": [
+            "Application"
         ]
     },
     "defaultReportingPolicy": "mandatory",

diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
@@ -267,6 +267,19 @@
             "PacketUnicastTxCount",
             "CurrentMaxRate",
             "OverrunCount"
+        ],
+        "Channel": [
+            "Lineup",
+            "CurrentChannel"
+        ],
+        "Media Playback": [
+            "SampledPosition"
+        ],
+        "Application Launcher": [
+            "CurrentApp"
+        ],
+        "Application Basic": [
+            "Application"
         ]
     },
     "defaultReportingPolicy": "mandatory",