Skip to content

Commit

Permalink
Re-order members of EmberAfAttributeMetadata to improve packing.
Browse files Browse the repository at this point in the history
  • Loading branch information
tima-q authored and bzbarsky-apple committed Jan 10, 2023
1 parent d08e56e commit aa1f1ca
Show file tree
Hide file tree
Showing 47 changed files with 11,167 additions and 11,277 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/zap_regeneration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

runs-on: ubuntu-20.04
container:
image: connectedhomeip/chip-build:0.6.30
image: connectedhomeip/chip-build:0.6.31
defaults:
run:
shell: sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zap_templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

runs-on: ubuntu-20.04
container:
image: connectedhomeip/chip-build:0.6.30
image: connectedhomeip/chip-build:0.6.31
defaults:
run:
shell: sh
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-cert-bins/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG COMMITHASH=451e602649b8b37ba6c9aab8ba5e30747293f778
# 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.01.06-nightly
ARG ZAP_VERSION=v2023.01.09-nightly

# Ensure TARGETPLATFORM is set
RUN case ${TARGETPLATFORM} in \
Expand Down
Empty file modified scripts/tools/zap_convert_all.py
100644 → 100755
Empty file.
22 changes: 13 additions & 9 deletions src/app/util/attribute-metadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,27 +132,31 @@ union EmberAfDefaultOrMinMaxAttributeValue
struct EmberAfAttributeMetadata
{
/**
* Attribute ID, according to ZCL specs.
* Pointer to the default value union. Actual value stored
* depends on the mask.
*/
chip::AttributeId attributeId;
EmberAfDefaultOrMinMaxAttributeValue defaultValue;

/**
* Attribute type, according to ZCL specs.
* Attribute ID, according to ZCL specs.
*/
EmberAfAttributeType attributeType;
chip::AttributeId attributeId;

/**
* Size of this attribute in bytes.
*/
uint16_t size;

/**
* Attribute type, according to ZCL specs.
*/
EmberAfAttributeType attributeType;

/**
* Attribute mask, tagging attribute with specific
* functionality.
*/
EmberAfAttributeMask mask;
/**
* Pointer to the default value union. Actual value stored
* depends on the mask.
*/
EmberAfDefaultOrMinMaxAttributeValue defaultValue;

/**
* Check whether this attribute is nullable.
Expand Down
4 changes: 2 additions & 2 deletions src/app/util/attribute-storage.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@

#define DECLARE_DYNAMIC_ATTRIBUTE_LIST_END() \
{ \
0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() \
ZAP_EMPTY_DEFAULT(), 0xFFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) \
} /* cluster revision */ \
}

#define DECLARE_DYNAMIC_ATTRIBUTE(attId, attType, attSizeBytes, attrMask) \
{ \
attId, ZAP_TYPE(attType), attSizeBytes, attrMask | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() \
ZAP_EMPTY_DEFAULT(), attId, attSizeBytes, ZAP_TYPE(attType), attrMask | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) \
}

#define CLUSTER_TICK_FREQ_ALL (0x00)
Expand Down
1,934 changes: 962 additions & 972 deletions zzz_generated/all-clusters-app/zap-generated/endpoint_config.h

Large diffs are not rendered by default.

1,146 changes: 571 additions & 575 deletions zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h

Large diffs are not rendered by default.

717 changes: 357 additions & 360 deletions zzz_generated/bridge-app/zap-generated/endpoint_config.h

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

646 changes: 322 additions & 324 deletions zzz_generated/contact-sensor-app/zap-generated/endpoint_config.h

Large diffs are not rendered by default.

717 changes: 357 additions & 360 deletions zzz_generated/dynamic-bridge-app/zap-generated/endpoint_config.h

Large diffs are not rendered by default.

672 changes: 335 additions & 337 deletions zzz_generated/light-switch-app/zap-generated/endpoint_config.h

Large diffs are not rendered by default.

480 changes: 239 additions & 241 deletions zzz_generated/lighting-app/nxp/zap-generated/endpoint_config.h

Large diffs are not rendered by default.

767 changes: 382 additions & 385 deletions zzz_generated/lighting-app/zap-generated/endpoint_config.h

Large diffs are not rendered by default.

749 changes: 373 additions & 376 deletions zzz_generated/lock-app/zap-generated/endpoint_config.h

Large diffs are not rendered by default.

62 changes: 31 additions & 31 deletions zzz_generated/log-source-app/zap-generated/endpoint_config.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit aa1f1ca

Please sign in to comment.