Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dynamically enabling Matter/Zigbee only components for CMP #1427

Merged
merged 5 commits into from
Sep 20, 2024

Conversation

paulr34
Copy link
Collaborator

@paulr34 paulr34 commented Sep 17, 2024

CMP components cacheing

@@ -90,7 +90,7 @@ export default {
return this.enableMatterFeatures
},
enableServerOnly() {
return this.enableMatterFeatures && !this.enableZigbeeFeatures
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about client clusters which belong to endpoints with Zigbee's zcl device types? Those should still be configurable.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes it appears there is a bigger problem here

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this change not disable Zigbee client cluster configuration?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it does not disable it

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to be clear, ZAP master branch, as of now, when running CMP mode never distinguishes between Zigbee and Matter. That logic is broken. So this PR fixes that.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add cypress tests to make sure that client clusters of zigbee endpoint is still configurable but not matter endpoints in the case of CMP.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do not have the framework to make Zigbee or matter specific cypress tests, do you think that should block this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we definitely need cypress tests you're right!

Copy link
Collaborator

@tbrkollar tbrkollar Sep 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you know, but I had started to implement a solution for detecting zigbee and matter cases in cypress. It has not been finished yet but it is working now. So we have an attribute that helps me detect which mode is active in the Cypress test. This is the "mode" attribute. 

cy.fixture('data').then((data) => { if(data.mode === 'matter') { //code } if(data.mode === 'zigbee') { //code } })

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's great!

@paulr34 paulr34 changed the title enabling serverOnly for CMP dynamically enabling Matter/Zigbee only components for CMP Sep 18, 2024
@@ -415,9 +415,7 @@ export default {
sortBy: 'clientServer'
},
columns: [],
forcedExternal: [],
enableSingleton: false,
enableBounded: false
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are attribute manager settings changed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because that code is out of date with the changes to ui-options.js

@@ -90,7 +90,7 @@ export default {
return this.enableMatterFeatures
},
enableServerOnly() {
return this.enableMatterFeatures && !this.enableZigbeeFeatures
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this change not disable Zigbee client cluster configuration?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am confused. Which JIRA or Github issue is this solving?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is no ticket for this because while I was solving the 1499 I noticed the whole thing was broken

Copy link
Collaborator

@tbrkollar tbrkollar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've taken a look at this branch and I think my CMP changes are still working. So I approved this pr. Great job, @paulr34 .

@paulr34 paulr34 merged commit 2b71747 into project-chip:master Sep 20, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants