Skip to content

Commit

Permalink
Update ZAP to v2024.03.14-nightly. (#32564)
Browse files Browse the repository at this point in the history
This fixes the endpoint_config representation of "endpoint with no specific
parent endpoint set" to match the SDK internal representation, so we can remove
some code that was working around the representation mismatch.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Mar 20, 2024
1 parent 7c07f29 commit 84e81e6
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 16 deletions.
4 changes: 2 additions & 2 deletions scripts/setup/zap.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"mac-amd64",
"windows-amd64"
],
"tags": ["version:2@v2024.02.29-nightly.1"]
"tags": ["version:2@v2024.03.14-nightly.1"]
},
{
"_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
"path": "fuchsia/third_party/zap/mac-amd64",
"platforms": ["mac-arm64"],
"tags": ["version:2@v2024.02.29-nightly.1"]
"tags": ["version:2@v2024.03.14-nightly.1"]
}
]
}
2 changes: 1 addition & 1 deletion scripts/setup/zap.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2024.02.29-nightly
v2024.03.14-nightly
Original file line number Diff line number Diff line change
Expand Up @@ -3072,5 +3072,5 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
// Array of parent endpoints for each endpoint
#define FIXED_PARENT_ENDPOINTS \
{ \
0, 0, 0, 0 \
kInvalidEndpointId, kInvalidEndpointId, kInvalidEndpointId, kInvalidEndpointId \
}
Original file line number Diff line number Diff line change
Expand Up @@ -1210,5 +1210,5 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
// Array of parent endpoints for each endpoint
#define FIXED_PARENT_ENDPOINTS \
{ \
0, 0 \
kInvalidEndpointId, kInvalidEndpointId \
}
2 changes: 1 addition & 1 deletion scripts/tools/zap/zap_execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '2024.2.29'
MIN_ZAP_VERSION = '2024.3.14'


class ZapTool:
Expand Down
13 changes: 3 additions & 10 deletions src/app/util/attribute-storage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,16 +214,9 @@ void emberAfEndpointConfigure()
emAfEndpoints[ep].endpoint = fixedEndpoints[ep];
emAfEndpoints[ep].deviceTypeList =
Span<const EmberAfDeviceType>(&fixedDeviceTypeList[fixedDeviceTypeListOffsets[ep]], fixedDeviceTypeListLengths[ep]);
emAfEndpoints[ep].endpointType = &generatedEmberAfEndpointTypes[fixedEmberAfEndpointTypes[ep]];
emAfEndpoints[ep].dataVersions = currentDataVersions;
if (fixedParentEndpoints[ep] == 0)
{
emAfEndpoints[ep].parentEndpointId = kInvalidEndpointId;
}
else
{
emAfEndpoints[ep].parentEndpointId = fixedParentEndpoints[ep];
}
emAfEndpoints[ep].endpointType = &generatedEmberAfEndpointTypes[fixedEmberAfEndpointTypes[ep]];
emAfEndpoints[ep].dataVersions = currentDataVersions;
emAfEndpoints[ep].parentEndpointId = fixedParentEndpoints[ep];

emAfEndpoints[ep].bitmask.Set(EmberAfEndpointOptions::isEnabled);
emAfEndpoints[ep].bitmask.Set(EmberAfEndpointOptions::isFlatComposition);
Expand Down

0 comments on commit 84e81e6

Please sign in to comment.