-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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
fix(ignore): move ubisys clusters/attributes out of zh #7451
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
I don't understand the test failure, I don't think I've changed that code ? Edit this is also used in more locations, which does not seem to trip the assert???
Edit2: It seems this is triggered because J1 now has an 'extend: []' block, which it did not have before. |
I'll rebase after #7450 lands. |
ca8abc3
to
493520f
Compare
All seems good, I tested both TRV vacationMode changes, S1+C4+S2 input_action configuration and a full J1 calibration
All seems to still work, but the J1 calibration is the most complex so I focused mostly on that. I tested this with both ZH's cluster definition unchaged and with the ubisys entries removed in ZH. |
@sjorge So the idea here is for ZH to eventually only include what's actually in the ZCL spec, right? |
You can probably start by adding the new ones in zhc on the devices that need them, then moving the other ones out of zh into zhc can come after. It's fine to have some in zhc and some still in zh, so new ones don't get added to zh IMHO. Once @Koenkk merges #7463 I will rebase this PR and this one should be ready for merging too. |
Merged #7463 ! |
cec56c1
to
0412c73
Compare
I only give it another quick retest after changing the casing of the DataType, I just turned on/off some of the switches. I did not do a full J1 reconfigure as it's rather noisy to make the blinds go up and down a few times during calibration and it's already pretty late. |
Yea, sounds good. 👌 |
Thanks! |
Depends on modernExtend added in #7450, rebase and merge after that one.Also depends on #7463, this PR needs a rebase merge.After this, merge Koenkk/zigbee-herdsman#1034