Skip to content

Commit

Permalink
Updated valid range to 360 (with passing tests) (#153)
Browse files Browse the repository at this point in the history
* Updated valid range to 360

with it set to 359 it will not show the color red. Just tested this with a buddies bulb - same model/fw
https://imgur.com/a/kSNZIuL

* Updated valid range to 360

with it set to 359 it will not show the color red. Just tested this with a buddies bulb - same model/fw
https://imgur.com/a/kSNZIuL

* Update valid range to 360

* Fix tests
  • Loading branch information
annikajayuk authored and rytilahti committed Jan 16, 2019
1 parent 6115d96 commit 4cb28a3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ if bulb.is_variable_color_temp:

### Setting the color

Hue is given in degrees (0-359) and saturation and value in percentage.
Hue is given in degrees (0-360) and saturation and value in percentage.

```python
print(bulb.hsv)
Expand Down
4 changes: 2 additions & 2 deletions pyHS100/smartbulb.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ def hsv(self, state: Tuple[int, int, int]):
if not self.is_color:
return None

if not isinstance(state[0], int) or not (0 <= state[0] <= 359):
if not isinstance(state[0], int) or not (0 <= state[0] <= 360):
raise SmartDeviceException(
'Invalid hue value: {} '
'(valid range: 0-359)'.format(state[0]))
'(valid range: 0-360)'.format(state[0]))

if not isinstance(state[1], int) or not (0 <= state[1] <= 100):
raise SmartDeviceException(
Expand Down
8 changes: 4 additions & 4 deletions pyHS100/tests/test_bulb.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class TestSmartBulb(TestCase):
'light_state': {
'brightness': All(int, Range(min=0, max=100)),
'color_temp': int,
'hue': All(int, Range(min=0, max=359)),
'hue': All(int, Range(min=0, max=360)),
'mode': str,
'on_off': check_int_bool,
'saturation': All(int, Range(min=0, max=255)),
Expand All @@ -63,7 +63,7 @@ class TestSmartBulb(TestCase):
'preferred_state': [{
'brightness': All(int, Range(min=0, max=100)),
'color_temp': int,
'hue': All(int, Range(min=0, max=359)),
'hue': All(int, Range(min=0, max=360)),
'index': int,
'saturation': All(int, Range(min=0, max=255)),
}],
Expand Down Expand Up @@ -210,10 +210,10 @@ def test_temperature_range(self):

def test_hsv(self):
hue, saturation, brightness = self.bulb.hsv
self.assertTrue(0 <= hue <= 359)
self.assertTrue(0 <= hue <= 360)
self.assertTrue(0 <= saturation <= 100)
self.assertTrue(0 <= brightness <= 100)
for invalid_hue in [-1, 360, 0.5]:
for invalid_hue in [-1, 361, 0.5]:
with self.assertRaises(SmartDeviceException):
self.bulb.hsv = (invalid_hue, 0, 0)

Expand Down

0 comments on commit 4cb28a3

Please sign in to comment.