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

Extending efergy component for get the amount of energy consumed (#4202)

Browse source 
* Extending efergy component for get the amount of energy consumed

* Changing units from kW to kWh

* Chaning units for Instant Consumption from kWh to kW

* Adding timeout for get and removing pylint config

* Update efergy.py
This commit is contained in:
Javier González Calleja 2016-12-02 00:00:17 -06:00 • committed by Paulus Schoutsen
parent 51e20c92f9
commit 801a69be3a
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
homeassistant/components/sensor/efergy.py
View file

@ -25,17 +25,18 @@ CONF_CURRENCY = 'currency'
CONF_PERIOD = 'period' CONF_PERIOD = 'period'
CONF_INSTANT = 'instant_readings' CONF_INSTANT = 'instant_readings'
CONF_AMOUNT = 'amount'
CONF_BUDGET = 'budget' CONF_BUDGET = 'budget'
CONF_COST = 'cost' CONF_COST = 'cost'
SENSOR_TYPES = { SENSOR_TYPES = {
CONF_INSTANT: ['Energy Usage', 'kW'], CONF_INSTANT: ['Energy Usage', 'kW'],
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],
} }
TYPES_SCHEMA = vol.In( TYPES_SCHEMA = vol.In(SENSOR_TYPES)
[CONF_INSTANT, CONF_BUDGET, CONF_COST])
SENSORS_SCHEMA = vol.Schema({ SENSORS_SCHEMA = vol.Schema({
vol.Required(CONF_SENSOR_TYPE): TYPES_SCHEMA, vol.Required(CONF_SENSOR_TYPE): TYPES_SCHEMA,
@ -100,17 +101,23 @@ class EfergySensor(Entity):
try: try:
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) response = get(url_string, timeout=10)
self._state = response.json()['reading'] / 1000 self._state = response.json()['reading'] / 1000
elif self.type == 'amount':
url_string = _RESOURCE + 'getEnergy?token=' + self.app_token \
+ '&offset=' + self.utc_offset + '&period=' \
+ self.period
response = get(url_string, timeout=10)
self._state = response.json()['sum']
elif self.type == 'budget': elif self.type == 'budget':
url_string = _RESOURCE + 'getBudget?token=' + self.app_token url_string = _RESOURCE + 'getBudget?token=' + self.app_token
response = get(url_string) response = get(url_string, timeout=10)
self._state = response.json()['status'] self._state = response.json()['status']
elif self.type == 'cost': elif self.type == 'cost':
url_string = _RESOURCE + 'getCost?token=' + self.app_token \ url_string = _RESOURCE + 'getCost?token=' + self.app_token \
+ '&offset=' + self.utc_offset + '&period=' \ + '&offset=' + self.utc_offset + '&period=' \
+ self.period + self.period
response = get(url_string) response = get(url_string, timeout=10)
self._state = response.json()['sum'] self._state = response.json()['sum']
else: else:
self._state = 'Unknown' self._state = 'Unknown'