Skip to content

Commit 13a358c

Browse files
authored
Merge pull request #67 from fronzbot/celcius-support
Add celcius property for cameras
2 parents 65dd547 + 3897455 commit 13a358c

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

CHANGES.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ A list of changes between each release
55

66
0.8.0.dev (Development version)
77
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8-
- Added support for battery voltage level
8+
- Added support for battery voltage level (fixes `#64 <https://github.com/fronzbot/blinkpy/issues/64>`_)
99
- Added motion detection per camera
1010
- Added fully accessible camera configuration dict
11+
- Added celcius property to camera (fixes `#60 <https://github.com/fronzbot/blinkpy/issues/60>`_)
1112

1213
0.7.0 (2018-02-08)
1314
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

blinkpy/blinkpy.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ def attributes(self):
128128
'status': self._status,
129129
'armed': self.armed,
130130
'temperature': self.temperature,
131+
'temperature_c': self.temperature_c,
131132
'battery': self.battery,
132133
'thumbnail': self.thumbnail,
133134
'video': self.clip,
@@ -163,6 +164,11 @@ def battery_string(self):
163164
status = "Low"
164165
return status
165166

167+
@property
168+
def temperature_c(self):
169+
"""Return temperature in celcius."""
170+
return round((self.temperature - 32) / 9.0 * 5.0, 1)
171+
166172
def snap_picture(self):
167173
"""Take a picture with camera to create a new thumbnail."""
168174
_request(self.blink, url=self.image_link,

tests/test_blink_cameras.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ def test_camera_properties(self, mock_get, mock_post, mock_cfg):
8383
"https://rest.test.{}/test/clip/clip.mp4".format(BLINK_URL)
8484
)
8585
self.assertEqual(camera.temperature, 68)
86+
self.assertEqual(camera.temperature_c, 20.0)
8687
self.assertEqual(camera.battery, 50)
8788
self.assertEqual(camera.battery_string, "OK")
8889
self.assertEqual(camera.notifications, 2)
@@ -149,6 +150,7 @@ def test_camera_attributes(self, mock_cfg):
149150
"https://rest.test.{}/test/clip/clip.mp4".format(BLINK_URL)
150151
)
151152
self.assertEqual(camera_attr['temperature'], 68)
153+
self.assertEqual(camera_attr['temperature_c'], 20.0)
152154
self.assertEqual(camera_attr['battery'], 50)
153155
self.assertEqual(camera_attr['notifications'], 2)
154156
self.assertEqual(camera_attr['network_id'], '0000')

0 commit comments

Comments
 (0)