[CSA-CP] Rename CLUSTER_MASK_ and ATTIBUTE_MASK defines to differentiate with … #342
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…… (#37618) * Rename CLUSTER_MASK_ and ATTIBUTE_MASK defines to differentiate with the zigbee ones. Cleanup some scene defines and delete the now empty head att-storage.h * Address comment, replace _BITMAP_ by _FLAG_
jmartinez-silabs
added
the
csa-cp
…now don't exist in csa
jmartinez-silabs
force-pushed
the
cmp_redefinition_fixes
branch
from
3e42ad0 to
65c6381
Compare
mkardous-silabs
approved these changes
Mar 14, 2025
|
@mkardous-silabs This PR does not have any changes to our specific apps. so it doesn't apply here. If you apply a SL-ONLY from a release branch to Main, which contained a CSA-CP, the CP application will lead to no diff/drop commits on the CSA-CP part |
rcasallas-silabs
approved these changes
Mar 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
-- Cherry Pick of project-chip/connectedhomeip#37618 --
THIS fix multiple build warning for the cmp app due to redefinitions between Matter and Zigbee
…the Zigbee ones.
Clean up some scene defines and delete the now empty header att-storage.h.
CLUSTER_MASK_... -> MATTER_CLUSTER_FLAG_...
ATTRIBUTE_MASK_... -> MATTER_ATTRIBUTE_FLAG_...
Those defines are tightly coupled with the ZAP_CLUSTER_MASK and ZAP_ATTRIBUTE_MASK macros. Those public APIs are not easily modifiable to use more adequate bitflags. It would require some rework and zap changes.
Delete unused defines MATTER_DM_SCENE_TABLE_NULL_INDEX, MATTER_DM_SCENE_TABLE_UNUSED_ENDPOINT_ID and
ZCL_SCENES_CLUSTER_MAXIMUM_NAME_LENGTH
move ZCL_SCENES_GLOBAL_SCENE_GROUP_ID and ZCL_SCENES_GLOBAL_SCENE_SCENE_ID to be const members of the ScenesServer class
Testing
No behaviour change. Only a rename and/or move of defines or constants location.
Locally built for Silabs platform.
CI to validate other builds