Skip to content

Commit

Permalink
Merge remote-tracking branch 'blueprint/master' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	custom_components/integration_blueprint/api.py
  • Loading branch information
Limych committed Jan 4, 2022
2 parents 2062c9e + 907de1a commit e230af4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ File | Purpose
`.devcontainer/*` | Used for development/testing with VSCODE, more info in the readme file in that dir.
`.github/ISSUE_TEMPLATE/feature_request.md` | Template for Feature Requests
`.github/ISSUE_TEMPLATE/issue.md` | Template for issues
`.github/settings.yml` | Probot settings to control the repository settings.
`.vscode/tasks.json` | Tasks for the devcontainer.
`custom_components/integration_blueprint/translations/*` | [Translation files.](https://developers.home-assistant.io/docs/internationalization/custom_integration)
`custom_components/integration_blueprint/__init__.py` | The component file for the integration.
Expand Down Expand Up @@ -149,7 +148,7 @@ Platform | Description
1. Search for "Blueprint".
1. Click Install below the found integration.
1. _If you want to configure component via Home Assistant UI..._\
in the HA UI go to "Configuration" -> "Integrations" click "+" and search for "Blueprint".
in the HA UI go to "Configuration" -> "Integrations" click "+" and search for "Integration blueprint".
1. _If you want to configure component via `configuration.yaml`..._\
follow instructions below, then restart Home Assistant.

Expand Down
2 changes: 1 addition & 1 deletion custom_components/integration_blueprint/entity.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def device_info(self):
}

@property
def device_state_attributes(self):
def extra_state_attributes(self):
"""Return the state attributes."""
return {
ATTR_ATTRIBUTION: ATTRIBUTION,
Expand Down

0 comments on commit e230af4

Please sign in to comment.