Update ZAP. (#19812)

* Update ZAP. Fixes type sizes for external attributes for which a size is known. Fixes #19647 The darwin-framework-tool change for bitmaps was needed because presumably something changed on the ZAP side in terms of weak bitmaps suddenly testing true for if_is_bitmap, which I thought they had already been doing... * Ignore the size of external attributes when computing offsets into the singleton store. External attributes are not actually stored in the singleton store.
project-chip · Aug 22, 2023 · 1978146 · 1978146
1 parent f985bac
commit 1978146
Show file tree

Hide file tree

Showing 48 changed files with 3,083 additions and 3,076 deletions.
diff --git a/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/...ples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/endpoint_config.h b/...ples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/...ples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/endpoint_config.h b/...ples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/endpoint_config.h b/examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/...chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/endpoint_config.h b/...chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/...les/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/endpoint_config.h b/...les/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/...es/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/endpoint_config.h b/...es/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/...s/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/endpoint_config.h b/...s/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/...es/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/endpoint_config.h b/...es/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/...les/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/endpoint_config.h b/...les/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/endpoint_config.h b/examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/.../chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/endpoint_config.h b/.../chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/endpoint_config.h b/examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/endpoint_config.h
diff --git a/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/ZAPSHA.txt b/examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/ZAPSHA.txt
@@ -1 +1 @@
-fd3adabbb2ac031d765da028fb51475260b7cfaf
+9a4e455c3a4956842d11971148b2d5ee0ccead53
diff --git a/...les/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/endpoint_config.h b/...les/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/endpoint_config.h
diff --git a/examples/darwin-framework-tool/templates/partials/decodable_value.zapt b/examples/darwin-framework-tool/templates/partials/decodable_value.zapt
@@ -30,15 +30,15 @@
     {{#if_chip_enum type}}
       {{target}} = [NSNumber numberWith{{asObjectiveCNumberType "" type false}}:chip::to_underlying({{source}})];
     {{else}}
-      {{#if_is_bitmap type}}
+      {{#if_is_strongly_typed_bitmap type}}
         {{target}} = [NSNumber numberWith{{asObjectiveCNumberType "" type false}}:{{source}}.Raw()];
       {{else if (isOctetString type)}}
         {{target}} = [NSData dataWithBytes:{{source}}.data() length:{{source}}.size()];
       {{else if (isCharString type)}}
         {{target}} = [[NSString alloc] initWithBytes:{{source}}.data() length:{{source}}.size() encoding:NSUTF8StringEncoding];
       {{else}}
         {{target}} = [NSNumber numberWith{{asObjectiveCNumberType "" type false}}:{{source}}];
-      {{/if_is_bitmap}}
+      {{/if_is_strongly_typed_bitmap}}
     {{/if_chip_enum}}
   {{/if_is_struct}}
 {{/if}}
diff --git a/src/app/util/attribute-metadata.h b/src/app/util/attribute-metadata.h
@@ -191,6 +191,13 @@ struct EmberAfAttributeMetadata
      */
     bool IsExternal() const { return mask & ATTRIBUTE_MASK_EXTERNAL_STORAGE; }
 
+    /**
+     * Check whether this is a "singleton" attribute, in the sense that it has a
+     * single value across multiple instances of the cluster.  This is not
+     * mutually exclusive with the attribute being external.
+     */
+    bool IsSingleton() const { return mask & ATTRIBUTE_MASK_SINGLETON; }
+
     /**
      * Check whether this attribute is automatically stored in non-volatile
      * memory.

diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp
@@ -435,7 +435,7 @@ static uint8_t * singletonAttributeLocation(const EmberAfAttributeMetadata * am)
     uint16_t index                     = 0;
     while (m < am)
     {
-        if ((m->mask & ATTRIBUTE_MASK_SINGLETON) != 0U)
+        if (m->IsSingleton() && !m->IsExternal())
         {
             index = static_cast<uint16_t>(index + m->size);
         }

diff --git a/third_party/zap/repo b/third_party/zap/repo
diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h
diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h
diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h
diff --git a/zzz_generated/log-source-app/zap-generated/endpoint_config.h b/zzz_generated/log-source-app/zap-generated/endpoint_config.h