Added support for multiple efergy sensors in the same household. (#6630)
* Added support for multiple efergy sensors in the same household. Also added inital tests for the efergy platform. * Fixed current_values units. Changed name to include efergy_ prefix.
This commit is contained in:
1 parent
ced3cd2616
commit
b5149dfba6
9 files changed
+191
-4
No files matched your search
@@ -28,12 +28,14 @@ CONF_INSTANT = 'instant_readings'
|
||||
CONF_AMOUNT = 'amount'
|
||||
CONF_BUDGET = 'budget'
|
||||
CONF_COST = 'cost'
|
||||
CONF_CURRENT_VALUES = 'current_values'
|
||||
|
||||
SENSOR_TYPES = {
|
||||
CONF_INSTANT: ['Energy Usage', 'kW'],
|
||||
CONF_AMOUNT: ['Energy Consumed', 'kWh'],
|
||||
CONF_BUDGET: ['Energy Budget', None],
|
||||
CONF_COST: ['Energy Cost', None],
|
||||
CONF_CURRENT_VALUES: ['Per-Device Usage', 'kW']
|
||||
}
|
||||
|
||||
TYPES_SCHEMA = vol.In(SENSOR_TYPES)
|
||||
@@ -57,19 +59,33 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
utc_offset = str(config.get(CONF_UTC_OFFSET))
|
||||
dev = []
|
||||
for variable in config[CONF_MONITORED_VARIABLES]:
|
||||
if variable[CONF_SENSOR_TYPE] == CONF_CURRENT_VALUES:
|
||||
url_string = _RESOURCE + 'getCurrentValuesSummary?token=' \
|
||||
+ app_token
|
||||
response = get(url_string, timeout=10)
|
||||
for sensor in response.json():
|
||||
sid = sensor['sid']
|
||||
dev.append(EfergySensor(variable[CONF_SENSOR_TYPE], app_token,
|
||||
utc_offset, variable[CONF_PERIOD],
|
||||
variable[CONF_CURRENCY], sid))
|
||||
dev.append(EfergySensor(
|
||||
variable[CONF_SENSOR_TYPE], app_token, utc_offset,
|
||||
variable[CONF_PERIOD], variable[CONF_CURRENCY]))
|
||||
|
||||
add_devices(dev)
|
||||
add_devices(dev, True)
|
||||
|
||||
|
||||
class EfergySensor(Entity):
|
||||
"""Implementation of an Efergy sensor."""
|
||||
|
||||
def __init__(self, sensor_type, app_token, utc_offset, period, currency):
|
||||
def __init__(self, sensor_type, app_token, utc_offset, period,
|
||||
currency, sid=None):
|
||||
"""Initialize the sensor."""
|
||||
self._name = SENSOR_TYPES[sensor_type][0]
|
||||
self.sid = sid
|
||||
if sid:
|
||||
self._name = 'efergy_' + sid
|
||||
else:
|
||||
self._name = SENSOR_TYPES[sensor_type][0]
|
||||
self.type = sensor_type
|
||||
self.app_token = app_token
|
||||
self.utc_offset = utc_offset
|
||||
@@ -119,6 +135,14 @@ class EfergySensor(Entity):
|
||||
+ self.period
|
||||
response = get(url_string, timeout=10)
|
||||
self._state = response.json()['sum']
|
||||
elif self.type == 'current_values':
|
||||
url_string = _RESOURCE + 'getCurrentValuesSummary?token=' \
|
||||
+ self.app_token
|
||||
response = get(url_string, timeout=10)
|
||||
for sensor in response.json():
|
||||
if self.sid == sensor['sid']:
|
||||
measurement = next(iter(sensor['data'][0].values()))
|
||||
self._state = measurement / 1000
|
||||
else:
|
||||
self._state = 'Unknown'
|
||||
except (RequestException, ValueError, KeyError):
|
||||
|
||||
Reference in new issue
Block a user