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

Hyperion: Fix fatal error in last merge #11793

Merged
merged 1 commit into from Jan 19, 2018

Conversation

@starkillerOG
Copy link
Contributor

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

This comment has been minimized.

Copy link
Contributor Author

starkillerOG commented Jan 19, 2018

@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?

@starkillerOG starkillerOG mentioned this pull request Jan 19, 2018
9 of 9 tasks complete
Copy link
Member

MartinHjelmare left a comment

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

@starkillerOG

This comment has been minimized.

Copy link
Contributor Author

starkillerOG commented Jan 19, 2018

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

@MartinHjelmare MartinHjelmare merged commit 2ca4bde into home-assistant:dev Jan 19, 2018
5 checks passed
5 checks passed
WIP ready for review
Details
cla-bot Everyone involved has signed the CLA
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage remained the same at 93.867%
Details
hound No violations found. Woof!
@starkillerOG starkillerOG deleted the starkillerOG:patch-2 branch Jan 19, 2018
@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
3 participants
You can’t perform that action at this time.