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

Revert changes to platforms using self.device (#16209)

Browse source 
* Revert tank_utility

* Fix Soundtouch

* Fix Plex

* Fix Emby

* Fix Radiotherm

* Fix Juicenet

* Fix Qwikswitch

* Fix Xiaomi miio

* Fix Nest

* Fix Tellduslive

* Fix KNX
This commit is contained in:
Robert Svensson 2018-08-26 21:25:39 +02:00 • committed by Paulus Schoutsen
parent 289b1802fd
commit 5341785aae
28 changed files with 256 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

20
homeassistant/components/sensor/juicenet.py
View file

@ -49,14 +49,14 @@ class JuicenetSensorDevice(JuicenetDevice, Entity):
@property
def name(self):
"""Return the name of the device."""
return '{} {}'.format(self._device.name(), self._name)
return '{} {}'.format(self.device.name(), self._name)
@property
def icon(self):
"""Return the icon of the sensor."""
icon = None
if self.type == 'status':
status = self._device.getStatus()
status = self.device.getStatus()
if status == 'standby':
icon = 'mdi:power-plug-off'
elif status == 'plugged':
@ -87,19 +87,19 @@ class JuicenetSensorDevice(JuicenetDevice, Entity):
"""Return the state."""
state = None
if self.type == 'status':
state = self._device.getStatus()
state = self.device.getStatus()
elif self.type == 'temperature':
state = self._device.getTemperature()
state = self.device.getTemperature()
elif self.type == 'voltage':
state = self._device.getVoltage()
state = self.device.getVoltage()
elif self.type == 'amps':
state = self._device.getAmps()
state = self.device.getAmps()
elif self.type == 'watts':
state = self._device.getWatts()
state = self.device.getWatts()
elif self.type == 'charge_time':
state = self._device.getChargeTime()
state = self.device.getChargeTime()
elif self.type == 'energy_added':
state = self._device.getEnergyAdded()
state = self.device.getEnergyAdded()
else:
state = 'Unknown'
return state
@ -109,7 +109,7 @@ class JuicenetSensorDevice(JuicenetDevice, Entity):
"""Return the state attributes."""
attributes = {}
if self.type == 'status':
man_dev_id = self._device.id()
man_dev_id = self.device.id()
if man_dev_id:
attributes["manufacturer_device_id"] = man_dev_id
return attributes