Use percentage constant in more integrations (#40165)

This commit is contained in:
springstan 2020-09-19 17:30:22 +02:00 committed by GitHub
parent 711ca6aff5
commit 7de1fe7416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions

View File

@ -22,6 +22,7 @@ from homeassistant.const import (
ELECTRICAL_CURRENT_AMPERE, ELECTRICAL_CURRENT_AMPERE,
ENERGY_KILO_WATT_HOUR, ENERGY_KILO_WATT_HOUR,
FREQUENCY_HERTZ, FREQUENCY_HERTZ,
PERCENTAGE,
POWER_WATT, POWER_WATT,
TEMP_CELSIUS, TEMP_CELSIUS,
VOLT, VOLT,
@ -231,7 +232,7 @@ STORAGE_SENSOR_TYPES = {
), ),
"storage_battery_percentage": ( "storage_battery_percentage": (
"Battery percentage", "Battery percentage",
"%", PERCENTAGE,
"capacity", "capacity",
{"device_class": DEVICE_CLASS_BATTERY}, {"device_class": DEVICE_CLASS_BATTERY},
), ),
@ -339,7 +340,7 @@ STORAGE_SENSOR_TYPES = {
), ),
"storage_load_percentage": ( "storage_load_percentage": (
"Load percentage", "Load percentage",
"%", PERCENTAGE,
"loadPercent", "loadPercent",
{"device_class": DEVICE_CLASS_BATTERY, "round": 2}, {"device_class": DEVICE_CLASS_BATTERY, "round": 2},
), ),

View File

@ -12,6 +12,7 @@ from homeassistant.const import (
CONF_SWITCHES, CONF_SWITCHES,
EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_START,
EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_STOP,
PERCENTAGE,
) )
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.discovery import load_platform from homeassistant.helpers.discovery import load_platform
@ -31,7 +32,6 @@ CONF_DST_UNIT = "unit"
DEFAULT_INVERT_LOGIC = False DEFAULT_INVERT_LOGIC = False
DEFAULT_SRC_RANGE = [0, 1024] DEFAULT_SRC_RANGE = [0, 1024]
DEFAULT_DST_RANGE = [0.0, 100.0] DEFAULT_DST_RANGE = [0.0, 100.0]
DEFAULT_UNIT = "%"
DEFAULT_DEV = [f"/dev/ttyACM{i}" for i in range(10)] DEFAULT_DEV = [f"/dev/ttyACM{i}" for i in range(10)]
PORT_RANGE = range(1, 8) # ports 0-7 are ADC capable PORT_RANGE = range(1, 8) # ports 0-7 are ADC capable
@ -82,7 +82,7 @@ ADC_SCHEMA = vol.Schema(
vol.Required(CONF_NAME): cv.string, vol.Required(CONF_NAME): cv.string,
vol.Optional(CONF_SRC_RANGE, default=DEFAULT_SRC_RANGE): int_range, vol.Optional(CONF_SRC_RANGE, default=DEFAULT_SRC_RANGE): int_range,
vol.Optional(CONF_DST_RANGE, default=DEFAULT_DST_RANGE): float_range, vol.Optional(CONF_DST_RANGE, default=DEFAULT_DST_RANGE): float_range,
vol.Optional(CONF_DST_UNIT, default=DEFAULT_UNIT): cv.string, vol.Optional(CONF_DST_UNIT, default=PERCENTAGE): cv.string,
} }
) )

View File

@ -72,7 +72,7 @@ async def test_5e850i(hass):
"device_class": "battery", "device_class": "battery",
"friendly_name": "Ups1 Battery Charge", "friendly_name": "Ups1 Battery Charge",
"state": "Online", "state": "Online",
"unit_of_measurement": "%", "unit_of_measurement": PERCENTAGE,
} }
# Only test for a subset of attributes in case # Only test for a subset of attributes in case
# HA changes the implementation and a new one appears # HA changes the implementation and a new one appears
@ -97,7 +97,7 @@ async def test_5e650i(hass):
"device_class": "battery", "device_class": "battery",
"friendly_name": "Ups1 Battery Charge", "friendly_name": "Ups1 Battery Charge",
"state": "Online Battery Charging", "state": "Online Battery Charging",
"unit_of_measurement": "%", "unit_of_measurement": PERCENTAGE,
} }
# Only test for a subset of attributes in case # Only test for a subset of attributes in case
# HA changes the implementation and a new one appears # HA changes the implementation and a new one appears
@ -125,7 +125,7 @@ async def test_backupsses600m1(hass):
"device_class": "battery", "device_class": "battery",
"friendly_name": "Ups1 Battery Charge", "friendly_name": "Ups1 Battery Charge",
"state": "Online", "state": "Online",
"unit_of_measurement": "%", "unit_of_measurement": PERCENTAGE,
} }
# Only test for a subset of attributes in case # Only test for a subset of attributes in case
# HA changes the implementation and a new one appears # HA changes the implementation and a new one appears

View File

@ -22,7 +22,7 @@ UNITS_OF_MEASUREMENT = {
sensor.DEVICE_CLASS_POWER: "kW", # power (W/kW) sensor.DEVICE_CLASS_POWER: "kW", # power (W/kW)
sensor.DEVICE_CLASS_CURRENT: "A", # current (A) sensor.DEVICE_CLASS_CURRENT: "A", # current (A)
sensor.DEVICE_CLASS_ENERGY: "kWh", # energy (Wh/kWh) sensor.DEVICE_CLASS_ENERGY: "kWh", # energy (Wh/kWh)
sensor.DEVICE_CLASS_POWER_FACTOR: "%", # power factor (no unit, min: -1.0, max: 1.0) sensor.DEVICE_CLASS_POWER_FACTOR: PERCENTAGE, # power factor (no unit, min: -1.0, max: 1.0)
sensor.DEVICE_CLASS_VOLTAGE: "V", # voltage (V) sensor.DEVICE_CLASS_VOLTAGE: "V", # voltage (V)
} }