Update 2.5-branch with relevant 2.4-branch cherry-picks #344
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
…ustom callback Signed-off-by: Marcin Kajor <[email protected]>
…odel.* (#27886)
zap_cluster_list.py raises an error when the ZAP file
enables a cluster that is not implemented in the SDK. This
forces users to patch the SDK in order to use custom,
vendor-specific clusters.
Add EXTERNAL_CLUSTERS argument to chip_configure_data_model()
CMake function that takes a list of external cluster names
for which the default implementation should not included nor
required.
Usage example:
chip_configure_data_model(app
INCLUDE_SERVER
ZAP_FILE lock-app.zap
EXTERNAL_CLUSTERS BASIC_INFORMATION_CLUSTER MY_CUSTOM_CLUSTER
)
Replace the existing zap_clusters_with_custom_implementation
argument of chip_data_model() GN template with new one:
external_clusters. The previous argument took a list of
cluster implementation directories to be skipped, so it was
only useful for bypassing the default implementations, but
could not be used for custom, vendor-specific clusters.
The new argument addresses both scenarios.
Usage example:
chip_data_model("lock-common") {
zap_file = "lock-app.zap"
...
external_clusters = [
"BASIC_INFORMATION_CLUSTER",
"MY_CUSTOM_CLUSTER",
]
}
…-server (#29857) The current implementation of the door-lock server supports emitting the LockOperationEvent only if the credential has been provided remotely. In case we use a custom handling lock credential in the application code the event is emitted only on the correct credential, but we also need a mechanism that allows the door lock server to handle a lock operation error when the wrong credential has been provided. Added handling local lock operation error to emit LockOperationEvent and call HandleWrongCodeEntry. cherry-picked from b9d525e
Damian-Nordic
approved these changes
Nov 2, 2023
kkasperczyk-no
approved these changes
Nov 2, 2023
LuDuda
approved these changes
Nov 3, 2023
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.
List of cherry-picked commits:
5841923
66a5f33
e89b123
Reason: these should have been ported to the
masterbranch prior to thev2.5.0tag.The
masterwill be populated with these patches as a result of upcoming upmerge.