Skip to content

Hyperion: Fix fatal error in last merge#11793

Merged
MartinHjelmare merged 1 commit into
home-assistant:devfrom
starkillerOG:patch-2
Jan 19, 2018
Merged

Hyperion: Fix fatal error in last merge#11793
MartinHjelmare merged 1 commit into
home-assistant:devfrom
starkillerOG:patch-2

Conversation

@starkillerOG
Copy link
Copy Markdown
Contributor

@starkillerOG starkillerOG commented Jan 19, 2018

Description:

In the last commit the self._brightness has been removed and named brightness.
However if the brightness is not in the current command this breaks the turn_on action because it is required for the cal_rgb.
This fixes that by using the self._brightness if it is not in the current command.

My last commit is alreay merged in this pull request:
#11543

Related issue (if applicable): fixes #

Pull request in home-assistant.github.io with documentation (if applicable): home-assistant/home-assistant.github.io#<home-assistant.github.io PR number goes here>

Example entry for configuration.yaml (if applicable):

Checklist:

  • The code change is tested and works locally.

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

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

  • Local tests with tox run successfully. Your PR cannot be merged unless tests pass
  • New dependencies have been added to the REQUIREMENTS variable (example).
  • New dependencies are only imported inside functions that use them (example).
  • New dependencies have been added to requirements_all.txt by running script/gen_requirements_all.py.
  • New files were added to .coveragerc.

If the code does not interact with devices:

  • Local tests with tox run successfully. Your PR cannot be merged unless tests pass
  • Tests have been added to verify that the new code works.

@starkillerOG
Copy link
Copy Markdown
Contributor Author

@MartinHjelmare alright I think I have got it now.
The problem is that I use Git online on the website and not from command line.
But I think this one is clean and up to date with the dev branch.

Sorry for creating such a mess with clossed pull requests.

Can this now be merged?

Copy link
Copy Markdown
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.

Great, thanks! This can be merged when build passes.

@starkillerOG
Copy link
Copy Markdown
Contributor Author

@MartinHjelmare the build hass passed, can you now merge?
Thank you!

@MartinHjelmare MartinHjelmare merged commit 2ca4bde into home-assistant:dev Jan 19, 2018
@starkillerOG starkillerOG deleted the patch-2 branch January 19, 2018 10:20
@balloob balloob mentioned this pull request Jan 26, 2018
@home-assistant home-assistant locked and limited conversation to collaborators May 29, 2018
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.

3 participants