Skip to content

Allow the utility_meter to net meter rather than only allow increases. #21204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgomes merged 7 commits into from
Feb 23, 2019
Merged

Allow the utility_meter to net meter rather than only allow increases. #21204

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5cd08f7
Allow the utility_meter to net meter rather than only allow increases.
JBassett Feb 19, 2019
2b6267b
Fix PR issues around CI.
JBassett Feb 19, 2019
67e66ac
Fix line length fallout.
JBassett Feb 19, 2019
7ec29cb
Change rollover to net_consumption. Add unit tests.
JBassett Feb 20, 2019
b38c32b
Fix test style issues.
JBassett Feb 20, 2019
b1910b6
Merge remote-tracking branch 'origin/dev' into feature/utiliyMeter-Ne…
JBassett Feb 21, 2019
dd09d6d
Fix style in tests.
JBassett Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions homeassistant/components/utility_meter/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
from .const import (
DOMAIN, SIGNAL_RESET_METER, METER_TYPES, CONF_SOURCE_SENSOR,
CONF_METER_TYPE, CONF_METER_OFFSET, CONF_TARIFF_ENTITY, CONF_TARIFF,
CONF_TARIFFS, CONF_METER, DATA_UTILITY, SERVICE_RESET,
SERVICE_SELECT_TARIFF, SERVICE_SELECT_NEXT_TARIFF,
ATTR_TARIFF)
CONF_METER_TYPE, CONF_METER_OFFSET, CONF_METER_ROLLOVER, CONF_TARIFF_ENTITY,
Comment thread
JBassett marked this conversation as resolved.
Outdated
CONF_TARIFF, CONF_TARIFFS, CONF_METER, DATA_UTILITY, SERVICE_RESET,
SERVICE_SELECT_TARIFF, SERVICE_SELECT_NEXT_TARIFF, ATTR_TARIFF)

_LOGGER = logging.getLogger(__name__)

Expand All @@ -36,6 +35,7 @@
vol.Optional(CONF_NAME): cv.string,
vol.Optional(CONF_METER_TYPE): vol.In(METER_TYPES),
vol.Optional(CONF_METER_OFFSET, default=0): cv.positive_int,
vol.Optional(CONF_METER_ROLLOVER, default=True): cv.boolean,
vol.Optional(CONF_TARIFFS, default=[]): vol.All(
cv.ensure_list, [cv.string]),
})
Expand Down
1 change: 1 addition & 0 deletions homeassistant/components/utility_meter/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
CONF_SOURCE_SENSOR = 'source'
CONF_METER_TYPE = 'cycle'
CONF_METER_OFFSET = 'offset'
CONF_METER_ROLLOVER = 'rollover'
Comment thread
dgomes marked this conversation as resolved.
Outdated
CONF_PAUSED = 'paused'
CONF_TARIFFS = 'tariffs'
CONF_TARIFF = 'tariff'
Expand Down
11 changes: 7 additions & 4 deletions homeassistant/components/utility_meter/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
DATA_UTILITY, SIGNAL_RESET_METER,
HOURLY, DAILY, WEEKLY, MONTHLY, YEARLY,
CONF_SOURCE_SENSOR, CONF_METER_TYPE, CONF_METER_OFFSET,
CONF_TARIFF, CONF_TARIFF_ENTITY, CONF_METER)
CONF_METER_ROLLOVER, CONF_TARIFF, CONF_TARIFF_ENTITY, CONF_METER)

_LOGGER = logging.getLogger(__name__)

Expand Down Expand Up @@ -48,12 +48,14 @@ async def async_setup_platform(
conf_meter_source = hass.data[DATA_UTILITY][meter][CONF_SOURCE_SENSOR]
conf_meter_type = hass.data[DATA_UTILITY][meter].get(CONF_METER_TYPE)
conf_meter_offset = hass.data[DATA_UTILITY][meter][CONF_METER_OFFSET]
conf_meter_rollover = hass.data[DATA_UTILITY][meter]
[CONF_METER_ROLLOVER]
Comment thread
JBassett marked this conversation as resolved.
Outdated
conf_meter_tariff_entity = hass.data[DATA_UTILITY][meter].get(
CONF_TARIFF_ENTITY)

meters.append(UtilityMeterSensor(
conf_meter_source, conf.get(CONF_NAME), conf_meter_type,
conf_meter_offset, conf.get(CONF_TARIFF),
conf_meter_offset, conf_meter_rollover, conf.get(CONF_TARIFF),
conf_meter_tariff_entity))

async_add_entities(meters)
Expand All @@ -63,7 +65,7 @@ class UtilityMeterSensor(RestoreEntity):
"""Representation of an utility meter sensor."""

def __init__(self, source_entity, name, meter_type, meter_offset=0,
tariff=None, tariff_entity=None):
rollover=True, tariff=None, tariff_entity=None):
Comment thread
dgomes marked this conversation as resolved.
Outdated
"""Initialize the Utility Meter sensor."""
self._sensor_source_id = source_entity
self._state = 0
Expand All @@ -77,6 +79,7 @@ def __init__(self, source_entity, name, meter_type, meter_offset=0,
self._unit_of_measurement = None
self._period = meter_type
self._period_offset = meter_offset
self._sensor_rollsover = rollover
self._tariff = tariff
self._tariff_entity = tariff_entity

Expand All @@ -96,7 +99,7 @@ def async_reading(self, entity, old_state, new_state):
try:
diff = Decimal(new_state.state) - Decimal(old_state.state)

if diff < 0:
if self._sensor_rollsover and diff < 0:
# Source sensor just rolled over for unknow reasons,
return
self._state += diff
Expand Down