fix: OTA should use develcoPrimarySwVersion for Develco devices #23129
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
|
Right I somehow need to mock a Develco device for the tests, I'm pretty bad at that stuff. |
|
Ok this isn't working, not sure how to get the test to hit line 141, override the manufacturerCode in the extra tests hit the added if, but I can't get it to hit the resturn at all. |
|
I'm wondering if we can push this down to the definition |
|
Reworked it based on our conversation on Discord. This is not a perfect fix, but it should at least not leave the device with a empty sw version. Edit: now we have test failures :| |
This fix is not perfect, as it will still print that it got updated from null to null. We just moved the reconfigure later, which will trigger this https://github.com/Koenkk/zigbee-herdsman-converters/blob/000041cba216822dab151151c493b560678da91a/src/devices/develco.ts#L36 for develco/frient devices that have it in their configure. (Which should be all of them) Of note though, ZCL marks both dateCode and swBuildId as optional attributes, so Develco/Frient returning UNSUPPORTED_ATTRIBUTE here is not outside of spec. Although I'm not sure there is a cleaner way to do this.
|
Fixed the tests, thanks! |
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.
@Koenkk as mentioned on discord, we need to read develcoPrimarySwVersion for develco/frient devices instead of swBuildId as that is always returns null otherwise.
I found no clean way to check if we have the develcoPrimarySwVersion on genBasic or not.
I opted to check for the Develco/Frient manufacturerID and just read the right attribute, currently we are hitting the catch branch. If the attributes move from zh -> zhc in the future and a new develco device would be missing the modernExtend we'd still have the same situation a today. I think for now this is fine to do.