8000 Fix for OSRAM lights connected to hue bridge by groth-its · Pull Request #6122 · home-assistant/core · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix for OSR 8000 AM lights connected to hue bridge #6122

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Feb 27, 2017
Merged

Fix for OSRAM lights connected to hue bridge #6122

merged 2 commits into from
Feb 27, 2017

Conversation

groth-its
Copy link
Contributor

Do not send command "effect = none" to OSRAM lights
Osram lights connected to a hue bridge do not seem to handle "effect =
none" very well. Most of the times they jump to the selected color and
then change to red within a second.

Osram lights connected to a hue bridge do not handle xy values outside
of their gamut. Since they just stay at their old color value, handling
the UI is very unpredictable. Sending HSV values to the lights fixes this.

@mention-bot
Copy link

@groth-its, thanks for your PR! By analyzing the history of the files in this pull request, we identified @balloob, @fabaff and @michaelarnauts to be potential reviewers.

@homeassistant
Copy link
Contributor

Hello @groth-its,

When attempting to inspect the commits of your pull request for CLA signature status among all authors we encountered commit(s) which were not linked to a GitHub account, thus not allowing us to determine their status(es).

The commits that are missing a linked GitHub account are the following:

Unfortunately, we are unable to accept this pull request until this situation is corrected.

Here are your options:

  1. If you had an email address set for the commit that simply wasn't linked to your GitHub account you can link that email now and it will retroactively apply to your commits. The simplest way to do this is to click the link to one of the above commits and look for a blue question mark in a blue circle in the top left. Hovering over that bubble will show you what email address you used. Clicking on that button will take you to your email address settings on GitHub. Just add the email address on that page and you're all set. GitHub has more information about this option in their help center.

  2. If you didn't use an email address at all, it was an invalid email, or it's one you can't link to your GitHub, you will need to change the authorship information of the commit and your global Git settings so this doesn't happen again going forward. GitHub provides some great instructions on how to change your authorship information in their help center.

    • If you only made a single commit you should be able to run 
      git commit --amend --author="Author Name <email@address.com>"
      (substituting Author Name and email@address.com for your actual information) to set the authorship information.
    • If you made more than one commit and the commit with the missing authorship information is not the most recent one you have two options:
      1. You can re-create all commits missing authorship information. This is going to be the easiest solution for developers that aren't extremely confident in their Git and command line skills.
      2. You can use this script that GitHub provides to rewrite history. Please note: this should be used only if you are very confident in your abilities and understand its impacts.
    • Whichever method you choose, I will come by to re-check the pull request once you push the fixes to this branch.

We apologize for this inconvenience, especially since it usually bites new contributors to Home Assistant. We hope you understand the need for us to protect ourselves and the great community we all have built legally. The best thing to come out of this is that you only need to fix this once and it benefits the entire Home Assistant and GitHub community.

Thanks, I look forward to checking this PR again soon! ❤️

houndci-bot
houndci-bot reviewed Feb 20, 2017
View reviewed changes
homeassistant/util/color.py Outdated
def color_xy_brightness_to_hsv(vX: float, vY: float,
ibrightness: int) -> Tuple[int, int, int]:
return color_RGB_to_hsv(color_xy_brightness_to_RGB(vX, vY, ibrightness))

Copy link

Choose a reason for hiding this comment

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

indentation contains tabs
indentation contains mixed spaces and tabs
blank line contains whitespace

homeassistant/util/color.py Outdated

def color_xy_brightness_to_hsv(vX: float, vY: float,
Copy link

Choose a reason for hiding this comment

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

expected 2 blank lines, found 1

homeassistant/util/color.py Outdated
@@ -258,7 +259,14 @@ def color_xy_brightness_to_RGB(vX: float, vY: float,

return (ir, ig, ib)

def color_RGB_to_hsv(iR: int, iG: int, iB: int) -> Tuple[int, int, int]:
Copy link

Choose a reason for hiding this comment

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

expected 2 blank lines, found 1

homeassistant/components/light/hue.py Outdated
8000
@@ -369,12 +369,25 @@ def turn_on(self, **kwargs):
command['transitiontime'] = kwargs[ATTR_TRANSITION] * 10

if ATTR_XY_COLOR in kwargs:
command['xy'] = kwargs[ATTR_XY_COLOR]
if self.info['manufacturername'] == "OSRAM":
hsv = color_xy_brightness_to_hsv(kwargs[ATTR_XY_COLOR], ibrightness=self.info['bri'])
Copy link

Choose a reason for hiding this comment

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

undefined name 'color_xy_brightness_to_hsv'
line too long (101 > 79 characters)

@homeassistant
Copy link
Contributor

Hi @groth-its,

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

houndci-bot
houndci-bot reviewed Feb 20, 2017
View reviewed changes
homeassistant/components/light/hue.py Outdated
command['xy'] = kwargs[ATTR_XY_COLOR]
if self.info['manufacturername'] == "OSRAM":
hsv = color_xy_brightness_to_hsv(kwargs[ATTR_XY_COLOR],
ibrightness=self.info['bri'])
Copy link

Choose a reason for hiding this comment

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

continuation line under-indented for visual indent

houndci-bot
houndci-bot reviewed Feb 20, 2017
View reviewed changes
homeassistant/components/light/hue.py Outdated
@@ -369,12 +369,26 @@ def turn_on(self, **kwargs):
command['transitiontime'] = kwargs[ATTR_TRANSITION] * 10

if ATTR_XY_COLOR in kwargs:
command['xy'] = kwargs[ATTR_XY_COLOR]
if self.info['manufacturername'] == "OSRAM":
hsv = color_util.color_xy_brightness_to_hsv(kwargs[ATTR_XY_COLOR],
Copy link

Choose a reason for hiding this comment

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

line too long (82 > 79 characters)

houndci-bot
houndci-bot reviewed Feb 20, 2017
View reviewed changes
homeassistant/util/color.py Outdated
@@ -372,4 +385,4 @@ def color_temperature_mired_to_kelvin(mired_temperature):

def color_temperature_kelvin_to_mired(kelvin_temperature):
"""Convert degrees kelvin to mired shift."""
return 1000000 / kelvin_temperature
return 1000000 / kelvin_temperature
Copy link

Choose a reason for hiding this comment

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

no newline at end of file

homeassistant/components/light/hue.py Outdated
@@ -439,4 +455,4 @@ def device_state_attributes(self):
attributes[ATTR_EMULATED_HUE] = self.allow_in_emulated_hue
if self.is_group:
attributes[ATTR_IS_HUE_GROUP] = self.is_group
return attributes
return attributes
Copy link

Choose a reason for hiding this comment

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

no newline at end of file

@groth-its
Fix for OSRAM lights connected to hue bridge
5809035 
Do not send command "effect = none" to OSRAM lights
Osram lights connected to a hue bridge do not seem to handle "effect =
none" very well. Most of the times they jump to the selected color and
then change to red within a second.

Osram lights connected to a hue bridge do not handle xy values outside
of their gamut. Since they just stay at their old color value, handling
the UI is very unpredictable. Sending HSV values to the lights fixes this.
balloob
balloob requested changes Feb 22, 2017
View reviewed changes
homeassistant/util/color.py
@@ -259,6 +260,18 @@ def color_xy_brightness_to_RGB(vX: float, vY: float,
return (ir, ig, ib)


def color_RGB_to_hsv(iR: int, iG: int, iB: int) -> Tuple[int, int, int]:
Copy link
Member

Choose a reason for hiding this comment

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

Can you add a test for these util methods.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@homeassistant
Copy link
Contributor

Hello @groth-its,

When attempting to inspect the commits of your pull request for CLA signature status among all authors we encountered commit(s) which were not linked to a GitHub account, thus not allowing us to determine their status(es).

The commits that are missing a linked GitHub account are the following:

Unfortunately, we are unable to accept this pull request until this situation is corrected.

Here are your options:

  1. If you had an email address set for the commit that simply wasn't linked to your GitHub account you can link that email now and it will retroactively apply to your commits. The simplest way to do this is to click the link to one of the above commits and look for a blue question mark in a blue circle in the top left. Hovering over that bubble will show you what email address you used. Clicking on that button will take you to your email address settings on GitHub. Just add the email address on that page and you're all set. GitHub has more information about this option in their help center.

  2. If you didn't use an email address at all, it was an invalid email, or it's one you can't link to your GitHub, you will need to change the authorship information of the commit and your global Git settings so this doesn't happen again going forward. GitHub provides some great instructions on how to change your authorship information in their help center.

    • If you only made a single commit you should be able to run 
      git commit --amend --author="Author Name <email@address.com>"
      (substituting Author Name and email@address.com for your actual information) to set the authorship information.
    • If you made more than one commit and the commit with the missing authorship information is not the most recent one you have two options:
      1. You can re-create all commits missing authorship information. This is going to be the easiest solution for developers that aren't extremely confident in their Git and command line skills.
      2. You can use this script that GitHub provides to rewrite history. Please note: this should be used only if you are very confident in your abilities and understand its impacts.
    • Whichever method you choose, I will come by to re-check the pull request once you push the fixes to this branch.

We apologize for this inconvenience, especially since it usually bites new contributors to Home Assistant. We hope you understand the need for us to protect ourselves and the great community we all have built legally. The best thing to come out of this is that you only need to fix this once and it benefits the entire Home Assistant and GitHub community.

Thanks, I look forward to checking this PR again soon! ❤️

houndci-bot
houndci-bot reviewed Feb 22, 2017
View reviewed changes
tests/util/test_color.py Outdated
color_util.color_RGB_to_hsv(0, 255, 0))

self.assertEqual((0, 255, 255),
color_util.color_RGB_to_hsv(255, 0, 0))
Copy link

Choose a reason for hiding this comment

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

trailing whitespace

@balloob
Copy link
Member
balloob commented Feb 27, 2017

Thanks! 🐬

@balloob balloob merged commit 6ea74ce into home-assistant:dev Feb 27, 2017
@home-assistant home-assistant locked and limited conversation to collaborators Jun 2, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@houndci-bot houndci-bot houndci-bot left review comments

@balloob balloob balloob approved these changes

Assignees
No one assigned
Labels
cla-signed integration: hue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@groth-its @mention-bot @homeassistant @balloob @houndci-bot @robbiet480
0