Centrally define Energy Units (kWh and Wh) (#21719)

* centralize energy units kWh and Wh

* lint
This commit is contained in:
Diogo Gomes authored and Robbie Trencheny committed 2019-03-12 18:46:41 -07:00
1 parent c0b859d8da
commit a99d83390e
19 files changed
+70 -51

No files matched your search

+3 -2
View File
@@ -10,7 +10,8 @@ import requests
import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import CONF_CURRENCY, POWER_WATT
from homeassistant.const import (CONF_CURRENCY, POWER_WATT,
ENERGY_KILO_WATT_HOUR)
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import Entity
@@ -35,7 +36,7 @@ DEFAULT_UTC_OFFSET = '0'
SENSOR_TYPES = {
CONF_INSTANT: ['Energy Usage', POWER_WATT],
CONF_AMOUNT: ['Energy Consumed', 'kWh'],
CONF_AMOUNT: ['Energy Consumed', ENERGY_KILO_WATT_HOUR],
CONF_BUDGET: ['Energy Budget', None],
CONF_COST: ['Energy Cost', None],
CONF_CURRENT_VALUES: ['Per-Device Usage', POWER_WATT]
@@ -14,7 +14,7 @@ import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import (
CONF_USERNAME, CONF_PASSWORD,
CONF_USERNAME, CONF_PASSWORD, ENERGY_KILO_WATT_HOUR,
CONF_NAME, CONF_MONITORED_VARIABLES, TEMP_CELSIUS)
from homeassistant.helpers.entity import Entity
from homeassistant.util import Throttle
@@ -24,7 +24,7 @@ REQUIREMENTS = ['pyhydroquebec==2.2.2']
_LOGGER = logging.getLogger(__name__)
KILOWATT_HOUR = 'kWh' # type: str
KILOWATT_HOUR = ENERGY_KILO_WATT_HOUR
PRICE = 'CAD' # type: str
DAYS = 'days' # type: str
CONF_CONTRACT = 'contract' # type: str
+3 -2
View File
@@ -10,7 +10,8 @@ from datetime import timedelta
import voluptuous as vol
from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, CONF_TIMEOUT
from homeassistant.const import (CONF_USERNAME, CONF_PASSWORD, CONF_TIMEOUT,
ENERGY_KILO_WATT_HOUR)
from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.helpers.entity import Entity
from homeassistant.util import Throttle
@@ -71,7 +72,7 @@ class LinkySensor(Entity):
@property
def unit_of_measurement(self):
"""Return the unit of measurement."""
return 'kWh'
return ENERGY_KILO_WATT_HOUR
@Throttle(SCAN_INTERVAL)
def update(self):
@@ -11,7 +11,8 @@ import requests.exceptions
import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import (CONF_API_KEY, POWER_WATT)
from homeassistant.const import (CONF_API_KEY, POWER_WATT,
ENERGY_KILO_WATT_HOUR)
from homeassistant.helpers.entity import Entity
from homeassistant.util import Throttle
import homeassistant.helpers.config_validation as cv
@@ -150,7 +151,7 @@ class NeurioEnergy(Entity):
if sensor_type == ACTIVE_TYPE:
self._unit_of_measurement = POWER_WATT
elif sensor_type == DAILY_TYPE:
self._unit_of_measurement = 'kWh'
self._unit_of_measurement = ENERGY_KILO_WATT_HOUR
@property
def name(self):
+5 -4
View File
@@ -11,8 +11,9 @@ import voluptuous as vol
import homeassistant.helpers.config_validation as cv
from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import TEMP_CELSIUS, CONF_HOST
from homeassistant.const import CONF_MONITORED_VARIABLES
from homeassistant.const import (
TEMP_CELSIUS, CONF_HOST, ENERGY_KILO_WATT_HOUR,
CONF_MONITORED_VARIABLES)
from homeassistant.helpers.entity import Entity
REQUIREMENTS = ['openevsewifi==0.4']
@@ -25,8 +26,8 @@ SENSOR_TYPES = {
'ambient_temp': ['Ambient Temperature', TEMP_CELSIUS],
'ir_temp': ['IR Temperature', TEMP_CELSIUS],
'rtc_temp': ['RTC Temperature', TEMP_CELSIUS],
'usage_session': ['Usage this Session', 'kWh'],
'usage_total': ['Total Usage', 'kWh']
'usage_session': ['Usage this Session', ENERGY_KILO_WATT_HOUR],
'usage_total': ['Total Usage', ENERGY_KILO_WATT_HOUR]
}
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+12 -11
View File
@@ -12,7 +12,8 @@ import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import (
CONF_API_KEY, CONF_MONITORED_CONDITIONS, CONF_NAME, POWER_WATT)
CONF_API_KEY, CONF_MONITORED_CONDITIONS, CONF_NAME, POWER_WATT,
ENERGY_WATT_HOUR)
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import Entity
from homeassistant.util import Throttle
@@ -28,16 +29,16 @@ SCAN_INTERVAL = timedelta(minutes=10)
# Supported sensor types:
# Key: ['json_key', 'name', unit, icon]
SENSOR_TYPES = {
'lifetime_energy': ['lifeTimeData', "Lifetime energy", 'Wh',
'mdi:solar-power'],
'energy_this_year': ['lastYearData', "Energy this year", 'Wh',
'mdi:solar-power'],
'energy_this_month': ['lastMonthData', "Energy this month", 'Wh',
'mdi:solar-power'],
'energy_today': ['lastDayData', "Energy today", 'Wh',
'mdi:solar-power'],
'current_power': ['currentPower', "Current Power", POWER_WATT,
'mdi:solar-power']
'lifetime_energy': ['lifeTimeData', "Lifetime energy",
ENERGY_WATT_HOUR, 'mdi:solar-power'],
'energy_this_year': ['lastYearData', "Energy this year",
ENERGY_WATT_HOUR, 'mdi:solar-power'],
'energy_this_month': ['lastMonthData', "Energy this month",
ENERGY_WATT_HOUR, 'mdi:solar-power'],
'energy_today': ['lastDayData', "Energy today",
ENERGY_WATT_HOUR, 'mdi:solar-power'],
'current_power': ['currentPower', "Current Power",
POWER_WATT, 'mdi:solar-power']
}
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -12,7 +12,7 @@ from requests.exceptions import (
import voluptuous as vol
from homeassistant.const import (
CONF_NAME, CONF_PASSWORD,
CONF_NAME, CONF_PASSWORD, ENERGY_KILO_WATT_HOUR,
CONF_USERNAME, CONF_ID)
import homeassistant.helpers.config_validation as cv
from homeassistant.util import Throttle
@@ -27,7 +27,7 @@ ATTRIBUTION = "Powered by SRP Energy"
DEFAULT_NAME = 'SRP Energy'
MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=1440)
ENERGY_KWH = 'kWh'
ENERGY_KWH = ENERGY_KILO_WATT_HOUR
ATTR_READING_COST = "reading_cost"
ATTR_READING_TIME = 'datetime'
@@ -11,7 +11,8 @@ import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import (
CONF_HOST, CONF_NAME, CONF_PORT, CONF_MONITORED_CONDITIONS, POWER_WATT)
CONF_HOST, CONF_NAME, CONF_PORT, CONF_MONITORED_CONDITIONS, POWER_WATT,
ENERGY_WATT_HOUR)
from homeassistant.exceptions import PlatformNotReady
from homeassistant.helpers.aiohttp_client import async_get_clientsession
import homeassistant.helpers.config_validation as cv
@@ -32,7 +33,7 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=1)
SENSOR_TYPES = {
'average': ['Average', POWER_WATT, 'mdi:power-off'],
'consumption': ['Consumption', 'Wh', 'mdi:power-plug'],
'consumption': ['Consumption', ENERGY_WATT_HOUR, 'mdi:power-plug'],
'max': ['Max', POWER_WATT, 'mdi:arrow-up'],
'min': ['Min', POWER_WATT, 'mdi:arrow-down'],
}