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

Fix Shelly Gen1 entity description restore #108052

Merged
merged 2 commits into from
Jan 15, 2024
Merged

Fix Shelly Gen1 entity description restore #108052

merged 2 commits into from
Jan 15, 2024

Conversation

thecode
Copy link
Member

@thecode thecode commented Jan 14, 2024

Proposed change

Correctly restore entity descriptions similar to Gen2 implementation. Existing implementation partiality restored the entity descriptions (legacy, when we started we entity descriptions did not exists) and was causing incorrect device class & state class until device was online.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

home-assistant[bot]

This comment was marked as outdated.

@home-assistant
Copy link

Hey there @balloob, @bieniu, @chemelli74, @bdraco, mind taking a look at this pull request as it has been labeled with an integration (shelly) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of shelly can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign shelly Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

home-assistant[bot]

This comment was marked as off-topic.

home-assistant[bot]

This comment was marked as outdated.

@bdraco
Copy link
Member

bdraco commented Jan 14, 2024

It looks like there is actually a literal ~ in the email address in the commit somehow

@thecode
Copy link
Member Author

thecode commented Jan 14, 2024

It looks like there is actually a literal ~ in the email address in the commit somehow

Indeed, fixing

Co-authored-by: J. Nick Koston <nick@koston.org>
@bdraco bdraco added this to the 2024.1.4 milestone Jan 14, 2024
@bdraco
Copy link
Member

bdraco commented Jan 14, 2024

Tested with gen1 h&t

Now testing with the battery removed

Copy link
Member

@bdraco bdraco left a comment

Choose a reason for hiding this comment

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

Tested with battery in and out

Screen shots with battery removed:
Screenshot 2024-01-14 at 11 50 40 AM
Screenshot 2024-01-14 at 11 50 59 AM

@bdraco
Copy link
Member

bdraco commented Jan 14, 2024

Added brand new out of box H&T, all good

Restarted, all good

Updated firmware on H&T, all good

Restarted again, all good

@thecode thecode marked this pull request as ready for review January 14, 2024 22:28
@thecode
Copy link
Member Author

thecode commented Jan 14, 2024

Tested on Shelly HT & Shelly DW2

Copy link
Member

@bieniu bieniu left a comment

Choose a reason for hiding this comment

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

Tested with Shelly Flood and state_class and device_class are restored correctly when the device is sleeping.
Screenshot 2024-01-15 at 09-44-12 Narzędzia deweloperskie – Home Assistant
Great work @thecode

@chemelli74
Copy link
Contributor

Works fine also here. Well done @thecode !

@thecode thecode merged commit 28e18ce into dev Jan 15, 2024
23 checks passed
@thecode thecode deleted the shelly-fix-block-desc branch January 15, 2024 18:53
@github-actions github-actions bot locked and limited conversation to collaborators Jan 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
6 participants