Stop generating attribute accessors for AttributeAccessInterface-only…

… attributes. (#26279) Those accessors can't work correctly and are just a bug waiting to happen if someone tries to use them. The code in the Infineon examples that did ManufacturingDate::Set was not really doing anything useful, since the attribute value is read from GetDeviceInstanceInfoProvider()->GetManufacturingDate() in the Basic Information cluster implementation anyway, ignoring the attribute store.
project-chip · Aug 3, 2023 · 610586b · 610586b
1 parent 721d180
commit 610586b
Show file tree

Hide file tree

Showing 12 changed files with 1,605 additions and 6,703 deletions.
diff --git a/examples/light-switch-app/infineon/cyw30739/src/ZclCallbacks.cpp b/examples/light-switch-app/infineon/cyw30739/src/ZclCallbacks.cpp
@@ -24,20 +24,6 @@ using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::DeviceLayer;
 
-void emberAfBasicInformationClusterInitCallback(EndpointId endpoint)
-{
-    uint16_t year;
-    uint8_t month;
-    uint8_t dayOfMonth;
-    char cString[16] = "00000000";
-
-    if (GetDeviceInstanceInfoProvider()->GetManufacturingDate(year, month, dayOfMonth) == CHIP_NO_ERROR)
-    {
-        snprintf(cString, sizeof(cString), "%04u%02u%02u", year, month, dayOfMonth);
-    }
-    BasicInformation::Attributes::ManufacturingDate::Set(endpoint, CharSpan(cString));
-}
-
 void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
                                        uint8_t * value)
 {

diff --git a/examples/lighting-app/infineon/cyw30739/src/ZclCallbacks.cpp b/examples/lighting-app/infineon/cyw30739/src/ZclCallbacks.cpp
@@ -26,20 +26,6 @@ using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::DeviceLayer;
 
-void emberAfBasicInformationClusterInitCallback(EndpointId endpoint)
-{
-    uint16_t year;
-    uint8_t month;
-    uint8_t dayOfMonth;
-    char cString[16] = "00000000";
-
-    if (GetDeviceInstanceInfoProvider()->GetManufacturingDate(year, month, dayOfMonth) == CHIP_NO_ERROR)
-    {
-        snprintf(cString, sizeof(cString), "%04u%02u%02u", year, month, dayOfMonth);
-    }
-    BasicInformation::Attributes::ManufacturingDate::Set(endpoint, CharSpan(cString));
-}
-
 void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
                                        uint8_t * value)
 

diff --git a/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp b/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp
@@ -27,20 +27,6 @@ using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::DeviceLayer;
 
-void emberAfBasicInformationClusterInitCallback(EndpointId endpoint)
-{
-    uint16_t year;
-    uint8_t month;
-    uint8_t dayOfMonth;
-    char cString[16] = "00000000";
-
-    if (GetDeviceInstanceInfoProvider()->GetManufacturingDate(year, month, dayOfMonth) == CHIP_NO_ERROR)
-    {
-        snprintf(cString, sizeof(cString), "%04u%02u%02u", year, month, dayOfMonth);
-    }
-    BasicInformation::Attributes::ManufacturingDate::Set(endpoint, CharSpan(cString));
-}
-
 void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
                                        uint8_t * value)
 {

diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile
@@ -7,7 +7,7 @@ ARG COMMITHASH=7b99e6399c6069037c613782d78132c69b9dcabb
 # ZAP Development install, so that it runs on both x64 and arm64
 # Generally this should match with the ZAP version that is used for codegen within the
 # specified SHA
-ARG ZAP_VERSION=v2023.04.21-nightly
+ARG ZAP_VERSION=v2023.04.27-nightly
 
 # Ensure TARGETPLATFORM is set
 RUN case ${TARGETPLATFORM} in \

diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json
@@ -8,7 +8,7 @@
                 "mac-arm64",
                 "windows-amd64"
             ],
-            "tags": ["version:[email protected].21-nightly.1"]
+            "tags": ["version:[email protected].27-nightly.1"]
         }
     ]
 }
diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py
@@ -23,7 +23,7 @@
 # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
 # files may need updating for versions
 #
-MIN_ZAP_VERSION = '2023.4.21'
+MIN_ZAP_VERSION = '2023.4.27'
 
 
 class ZapTool:

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
@@ -270,7 +270,11 @@
             "PacketUnicastTxCount",
             "CurrentMaxRate",
             "OverrunCount"
-        ]
+        ],
+        "Channel": ["Lineup", "CurrentChannel"],
+        "Media Playback": ["SampledPosition"],
+        "Application Launcher": ["CurrentApp"],
+        "Application Basic": ["Application"]
     },
     "defaultReportingPolicy": "mandatory",
     "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],

diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
@@ -268,7 +268,11 @@
             "PacketUnicastTxCount",
             "CurrentMaxRate",
             "OverrunCount"
-        ]
+        ],
+        "Channel": ["Lineup", "CurrentChannel"],
+        "Media Playback": ["SampledPosition"],
+        "Application Launcher": ["CurrentApp"],
+        "Application Basic": ["Application"]
     },
     "defaultReportingPolicy": "mandatory",
     "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],