evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4719 from home-assistant/device_tracker

Browse source 
device tracker
This commit is contained in:
Daniel Høyer Iversen 2016-12-05 16:32:29 +01:00 • committed by GitHub
commit 71fc446425
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
homeassistant/components/device_tracker/__init__.py
View file

@ -332,7 +332,6 @@ class Device(Entity):
gps = None # type: GPSType gps = None # type: GPSType
gps_accuracy = 0 gps_accuracy = 0
last_seen = None # type: dt_util.dt.datetime last_seen = None # type: dt_util.dt.datetime
battery = None # type: str
attributes = None # type: dict attributes = None # type: dict
vendor = None # type: str vendor = None # type: str
@ -396,9 +395,6 @@ class Device(Entity):
attr[ATTR_LONGITUDE] = self.gps[1] attr[ATTR_LONGITUDE] = self.gps[1]
attr[ATTR_GPS_ACCURACY] = self.gps_accuracy attr[ATTR_GPS_ACCURACY] = self.gps_accuracy
if self.battery:
attr[ATTR_BATTERY] = self.battery
if self.attributes: if self.attributes:
for key, value in self.attributes.items(): for key, value in self.attributes.items():
attr[key] = value attr[key] = value
@ -419,8 +415,13 @@ class Device(Entity):
self.host_name = host_name self.host_name = host_name
self.location_name = location_name self.location_name = location_name
self.gps_accuracy = gps_accuracy or 0 self.gps_accuracy = gps_accuracy or 0
self.battery = battery if (battery or attributes) and self.attributes is None:
self.attributes = attributes self.attributes = {}
if battery:
self.attributes[ATTR_BATTERY] = battery
if attributes:
for key, value in attributes.items():
self.attributes[key] = value
self.gps = None self.gps = None
if gps is not None: if gps is not None: