jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change units from KW to W (#8761)

Browse Source 
* Change units from KW to W

Change power unit from KW to W to be consistent with other energy sensors.

* Change units from kW to W
This commit is contained in:
emlt 2017-08-01 05:41:45 +02:00 committed by Paulus Schoutsen
parent 775185896a
commit e57d6f679a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/sensor/efergy.py
View File

@ -33,11 +33,11 @@ CONF_CURRENT_VALUES = 'current_values'
DEFAULT_PERIOD = 'year' DEFAULT_PERIOD = 'year'
SENSOR_TYPES = { SENSOR_TYPES = {
CONF_INSTANT: ['Energy Usage', 'kW'], CONF_INSTANT: ['Energy Usage', 'W'],
CONF_AMOUNT: ['Energy Consumed', 'kWh'], CONF_AMOUNT: ['Energy Consumed', 'kWh'],
CONF_BUDGET: ['Energy Budget', None], CONF_BUDGET: ['Energy Budget', None],
CONF_COST: ['Energy Cost', None], CONF_COST: ['Energy Cost', None],
CONF_CURRENT_VALUES: ['Per-Device Usage', 'kW'] CONF_CURRENT_VALUES: ['Per-Device Usage', 'W']
} }
TYPES_SCHEMA = vol.In(SENSOR_TYPES) TYPES_SCHEMA = vol.In(SENSOR_TYPES)
@ -120,7 +120,7 @@ class EfergySensor(Entity):
if self.type == 'instant_readings': if self.type == 'instant_readings':
url_string = _RESOURCE + 'getInstant?token=' + self.app_token url_string = _RESOURCE + 'getInstant?token=' + self.app_token
response = get(url_string, timeout=10) response = get(url_string, timeout=10)
self._state = response.json()['reading'] / 1000 self._state = response.json()['reading']
elif self.type == 'amount': elif self.type == 'amount':
url_string = _RESOURCE + 'getEnergy?token=' + self.app_token \ url_string = _RESOURCE + 'getEnergy?token=' + self.app_token \
+ '&offset=' + self.utc_offset + '&period=' \ + '&offset=' + self.utc_offset + '&period=' \
@ -144,7 +144,7 @@ class EfergySensor(Entity):
for sensor in response.json(): for sensor in response.json():
if self.sid == sensor['sid']: if self.sid == sensor['sid']:
measurement = next(iter(sensor['data'][0].values())) measurement = next(iter(sensor['data'][0].values()))
self._state = measurement / 1000 self._state = measurement
else: else:
self._state = 'Unknown' self._state = 'Unknown'
except (RequestException, ValueError, KeyError): except (RequestException, ValueError, KeyError):

10
tests/components/sensor/test_efergy.py
View File

@ -85,13 +85,13 @@ class TestEfergySensor(unittest.TestCase):
'sensor': ONE_SENSOR_CONFIG}) 'sensor': ONE_SENSOR_CONFIG})
self.assertEqual('38.21', self.assertEqual('38.21',
self.hass.states.get('sensor.energy_consumed').state) self.hass.states.get('sensor.energy_consumed').state)
self.assertEqual('1.58', self.assertEqual('1580',
self.hass.states.get('sensor.energy_usage').state) self.hass.states.get('sensor.energy_usage').state)
self.assertEqual('ok', self.assertEqual('ok',
self.hass.states.get('sensor.energy_budget').state) self.hass.states.get('sensor.energy_budget').state)
self.assertEqual('5.27', self.assertEqual('5.27',
self.hass.states.get('sensor.energy_cost').state) self.hass.states.get('sensor.energy_cost').state)
self.assertEqual('1.628', self.assertEqual('1628',
self.hass.states.get('sensor.efergy_728386').state) self.hass.states.get('sensor.efergy_728386').state)
@requests_mock.Mocker() @requests_mock.Mocker()
@ -100,9 +100,9 @@ class TestEfergySensor(unittest.TestCase):
mock_responses(mock) mock_responses(mock)
assert setup_component(self.hass, 'sensor', { assert setup_component(self.hass, 'sensor', {
'sensor': MULTI_SENSOR_CONFIG}) 'sensor': MULTI_SENSOR_CONFIG})
self.assertEqual('0.218', self.assertEqual('218',
self.hass.states.get('sensor.efergy_728386').state) self.hass.states.get('sensor.efergy_728386').state)
self.assertEqual('1.808', self.assertEqual('1808',
self.hass.states.get('sensor.efergy_0').state) self.hass.states.get('sensor.efergy_0').state)
self.assertEqual('0.312', self.assertEqual('312',
self.hass.states.get('sensor.efergy_728387').state) self.hass.states.get('sensor.efergy_728387').state)