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

Add proper support for zwave_js Indicator CC #90248

Merged
merged 27 commits into from May 24, 2023

Conversation

raman325
Copy link
Contributor

@raman325 raman325 commented Mar 24, 2023

Breaking change

On/Off properties for the Indicator CC are no longer discovered as entities. They were previously discovered as sensor entities which were not useful in cases where you wanted to change these values, and you would need to change the value for all three On/Off properties simultaneously in order for them to work which wasn't supported with our existing discovery model.

Proposed change

Resolves #90049

Note that I couldn't find real test data for all of the cases so I created a fake device to test them. We can replace these with real devices if/when we get proper fixtures for them.

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

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

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 Black (black --fast 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
Copy link

Hey there @home-assistant/z-wave, mind taking a look at this pull request as it has been labeled with an integration (zwave_js) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of zwave_js 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 zwave_js Removes the current integration label and assignees on the pull request, add the integration domain after the command.

Copy link
Contributor

@kpine kpine left a comment

Choose a reason for hiding this comment

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

For a Zooz ZEN72 device, this generates a few new number entities (previously they were disabled sensors):

image

Unfortunately, these entities are not usable. According to the Z-Wave specification, these particular indicator properties must be set at the same time (in the same command). With a compliant device, these commands will either fail or be ignored. The only way to set them currently is to use the CC API Indicator.set command passing in multiple identifier properties (which is how the Identify button works). I would suggest either not discovering these specific properties, or disabling them by default, as they are currently non-functional. Or Z-Wave JS needs to be updated to set all of these correctly when a single value is changed.

image

homeassistant/components/zwave_js/button.py Outdated Show resolved Hide resolved
homeassistant/components/zwave_js/button.py Outdated Show resolved Hide resolved
homeassistant/components/zwave_js/button.py Show resolved Hide resolved
@kpine
Copy link
Contributor

kpine commented Mar 26, 2023

Also, maybe this is a frontend issue, but I can't set the number entity value to 0. I don't see the setting ever reaching HA.

@kpine
Copy link
Contributor

kpine commented Mar 26, 2023

image

You can also see that properties 3 and 5 units are 100 ms. If you examine the rest of the properties, you'll see there are other time units and not all ranges of 0-255 are allowed.

Z-Wave JS does not consistently provide max-min values for these properties, nor does it provide any units.

Copy link
Member

@MartinHjelmare MartinHjelmare left a comment

Choose a reason for hiding this comment

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

Requesting changes to reflect the PR status. I only had a question and a side note though.

homeassistant/components/zwave_js/button.py Outdated Show resolved Hide resolved
@@ -122,6 +123,8 @@ class ZwaveDiscoveryInfo:
platform_data_template: BaseDiscoverySchemaDataTemplate | None = None
# bool to specify whether entity should be enabled by default
entity_registry_enabled_default: bool = True
# the entity category for the discovered entity
entity_category: EntityCategory | None = None
Copy link
Member

Choose a reason for hiding this comment

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

Side note: I think we should refactor the discovery and design it like we do in the matter integration. There we attach an Entity class and an EntityDescription to each schema instance and define the schema instances in each platform.

entity_category and entity_registry_enabled_default are entity details and belong in the entity description not in the discovery info.

It's a bigger refactor so something for a separate PR of course.

@home-assistant home-assistant bot marked this pull request as draft March 27, 2023 16:48
@home-assistant
Copy link

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@raman325
Copy link
Contributor Author

image

You can also see that properties 3 and 5 units are 100 ms. If you examine the rest of the properties, you'll see there are other time units and not all ranges of 0-255 are allowed.

Z-Wave JS does not consistently provide max-min values for these properties, nor does it provide any units.

I'm not sure how to address this. To me this seems like a driver issue as we rely on the driver to tell us these things. The 0 and 255 came from this comment: #46956 (comment)

Open to changing the defaults but the better option would be to get an accurate min and max

@kpine
Copy link
Contributor

kpine commented Mar 28, 2023

I'm not sure how to address this. To me this seems like a driver issue as we rely on the driver to tell us these things. The 0 and 255 came from this comment: #46956 (comment)

Open to changing the defaults but the better option would be to get an accurate min and max

There's nothing you can really do without help from the driver (unless you want to manually add everything yourself based on the property IDs), this was just an observation. The entities as they currently are will allow the setting of invalid values.

The bigger problem is that these v2 property entities just won't work, and for them to work properly also requires help from the driver. I would suggest omitting these until a solution is reached. Is adding these new non-functional entities better than doing nothing? I also don't think the user model works. These values need to be set at the same time, and separate entities don't allow that.

v1 indicator value and identity button are a good start. The latter is the only one required for certification.

@raman325 raman325 marked this pull request as ready for review March 28, 2023 06:25
homeassistant/components/zwave_js/discovery.py Outdated Show resolved Hide resolved
homeassistant/components/zwave_js/discovery.py Outdated Show resolved Hide resolved
homeassistant/components/zwave_js/discovery.py Outdated Show resolved Hide resolved
@raman325 raman325 marked this pull request as ready for review March 29, 2023 20:10
@raman325 raman325 marked this pull request as draft April 30, 2023 08:02
@MartinHjelmare
Copy link
Member

Besides the merge conflict, is this PR waiting for anything?

@raman325
Copy link
Contributor Author

Besides the merge conflict, is this PR waiting for anything?

no, I will mark this as ready for review as soon as I fix the merge conflict

…icator

* 'dev' of https://github.com/home-assistant/core: (400 commits)
  Fix todoist state updates (home-assistant#91915)
  Bump pydeconz to v112 (home-assistant#91924)
  Fix directv attribute media_position_updated_at (home-assistant#92383)
  Add a DataUpdateCoordinator to Hydrawise (home-assistant#93223)
  Add UDP listener in Lightwave (home-assistant#85385)
  Prevent SensorEntity and RestoreEntity inheritance (home-assistant#88971)
  Implement OpenSky library (home-assistant#92814)
  Bump pygti and change the request for the new api version (home-assistant#92283)
  Fully Kiosk: Truncate long URLs (home-assistant#92347)
  Enable strict type checks of cloud (home-assistant#92576)
  Remove legacy translations from electrasmart (home-assistant#93446)
  Update aioairzone-cloud to v0.1.3 (home-assistant#93443)
  Add backup location and mount failed repair (home-assistant#93126)
  Remove unused zwave discovery logic (home-assistant#93436)
  Bump PySwitchbee to 1.8.0 (home-assistant#92348)
  remove template deprecated function `device_trigger.py` (home-assistant#93419)
  Fix reference string in data disk repair (home-assistant#93220)
  Use SnapshotAssertion in Renault tests (part 2) (home-assistant#92395)
  Add ability to unload demo integration (home-assistant#92515)
  Move Twitch constants to separate file (home-assistant#92605)
  ...
@raman325 raman325 marked this pull request as ready for review May 24, 2023 12:53
@raman325 raman325 merged commit 872cd47 into home-assistant:dev May 24, 2023
20 checks passed
@raman325 raman325 deleted the indicator branch May 24, 2023 13:09
@github-actions github-actions bot locked and limited conversation to collaborators May 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Z-Wave JS: Necessary changes to Indicator CC values
4 participants