diff --git a/homeassistant/components/apcupsd/sensor.py b/homeassistant/components/apcupsd/sensor.py index 4748ae2476e..d30625ee793 100644 --- a/homeassistant/components/apcupsd/sensor.py +++ b/homeassistant/components/apcupsd/sensor.py @@ -8,15 +8,15 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity from homeassistant.const import ( CONF_RESOURCES, DEVICE_CLASS_TEMPERATURE, - ELECTRICAL_CURRENT_AMPERE, - ELECTRICAL_VOLT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, FREQUENCY_HERTZ, PERCENTAGE, + POWER_VOLT_AMPERE, POWER_WATT, TEMP_CELSIUS, TIME_MINUTES, TIME_SECONDS, - VOLT, ) import homeassistant.helpers.config_validation as cv @@ -33,7 +33,7 @@ SENSOR_TYPES = { "badbatts": ["Bad Batteries", "", "mdi:information-outline", None], "battdate": ["Battery Replaced", "", "mdi:calendar-clock", None], "battstat": ["Battery Status", "", "mdi:information-outline", None], - "battv": ["Battery Voltage", VOLT, "mdi:flash", None], + "battv": ["Battery Voltage", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], "bcharge": ["Battery", PERCENTAGE, "mdi:battery", None], "cable": ["Cable Type", "", "mdi:ethernet-cable", None], "cumonbatt": ["Total Time on Battery", "", "mdi:timer-outline", None], @@ -46,33 +46,33 @@ SENSOR_TYPES = { "endapc": ["Date and Time", "", "mdi:calendar-clock", None], "extbatts": ["External Batteries", "", "mdi:information-outline", None], "firmware": ["Firmware Version", "", "mdi:information-outline", None], - "hitrans": ["Transfer High", VOLT, "mdi:flash", None], + "hitrans": ["Transfer High", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], "hostname": ["Hostname", "", "mdi:information-outline", None], "humidity": ["Ambient Humidity", PERCENTAGE, "mdi:water-percent", None], "itemp": ["Internal Temperature", TEMP_CELSIUS, None, DEVICE_CLASS_TEMPERATURE], "lastxfer": ["Last Transfer", "", "mdi:transfer", None], "linefail": ["Input Voltage Status", "", "mdi:information-outline", None], "linefreq": ["Line Frequency", FREQUENCY_HERTZ, "mdi:information-outline", None], - "linev": ["Input Voltage", VOLT, "mdi:flash", None], + "linev": ["Input Voltage", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], "loadpct": ["Load", PERCENTAGE, "mdi:gauge", None], "loadapnt": ["Load Apparent Power", PERCENTAGE, "mdi:gauge", None], - "lotrans": ["Transfer Low", VOLT, "mdi:flash", None], + "lotrans": ["Transfer Low", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], "mandate": ["Manufacture Date", "", "mdi:calendar", None], "masterupd": ["Master Update", "", "mdi:information-outline", None], - "maxlinev": ["Input Voltage High", VOLT, "mdi:flash", None], + "maxlinev": ["Input Voltage High", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], "maxtime": ["Battery Timeout", "", "mdi:timer-off-outline", None], "mbattchg": ["Battery Shutdown", PERCENTAGE, "mdi:battery-alert", None], - "minlinev": ["Input Voltage Low", VOLT, "mdi:flash", None], + "minlinev": ["Input Voltage Low", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], "mintimel": ["Shutdown Time", "", "mdi:timer-outline", None], "model": ["Model", "", "mdi:information-outline", None], - "nombattv": ["Battery Nominal Voltage", VOLT, "mdi:flash", None], - "nominv": ["Nominal Input Voltage", VOLT, "mdi:flash", None], - "nomoutv": ["Nominal Output Voltage", VOLT, "mdi:flash", None], + "nombattv": ["Battery Nominal Voltage", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], + "nominv": ["Nominal Input Voltage", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], + "nomoutv": ["Nominal Output Voltage", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], "nompower": ["Nominal Output Power", POWER_WATT, "mdi:flash", None], - "nomapnt": ["Nominal Apparent Power", ELECTRICAL_VOLT_AMPERE, "mdi:flash", None], + "nomapnt": ["Nominal Apparent Power", POWER_VOLT_AMPERE, "mdi:flash", None], "numxfers": ["Transfer Count", "", "mdi:counter", None], - "outcurnt": ["Output Current", ELECTRICAL_CURRENT_AMPERE, "mdi:flash", None], - "outputv": ["Output Voltage", VOLT, "mdi:flash", None], + "outcurnt": ["Output Current", ELECTRIC_CURRENT_AMPERE, "mdi:flash", None], + "outputv": ["Output Voltage", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], "reg1": ["Register 1 Fault", "", "mdi:information-outline", None], "reg2": ["Register 2 Fault", "", "mdi:information-outline", None], "reg3": ["Register 3 Fault", "", "mdi:information-outline", None], @@ -99,9 +99,9 @@ INFERRED_UNITS = { " Minutes": TIME_MINUTES, " Seconds": TIME_SECONDS, " Percent": PERCENTAGE, - " Volts": VOLT, - " Ampere": ELECTRICAL_CURRENT_AMPERE, - " Volt-Ampere": ELECTRICAL_VOLT_AMPERE, + " Volts": ELECTRIC_POTENTIAL_VOLT, + " Ampere": ELECTRIC_CURRENT_AMPERE, + " Volt-Ampere": POWER_VOLT_AMPERE, " Watts": POWER_WATT, " Hz": FREQUENCY_HERTZ, " C": TEMP_CELSIUS, diff --git a/homeassistant/components/dsmr_reader/definitions.py b/homeassistant/components/dsmr_reader/definitions.py index d403f84e9b9..51aaca24c02 100644 --- a/homeassistant/components/dsmr_reader/definitions.py +++ b/homeassistant/components/dsmr_reader/definitions.py @@ -7,10 +7,10 @@ from homeassistant.const import ( DEVICE_CLASS_POWER, DEVICE_CLASS_TIMESTAMP, DEVICE_CLASS_VOLTAGE, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, ENERGY_KILO_WATT_HOUR, POWER_KILO_WATT, - VOLT, VOLUME_CUBIC_METERS, ) @@ -112,37 +112,37 @@ DEFINITIONS = { "name": "Current voltage L1", "enable_default": True, "device_class": DEVICE_CLASS_VOLTAGE, - "unit": VOLT, + "unit": ELECTRIC_POTENTIAL_VOLT, }, "dsmr/reading/phase_voltage_l2": { "name": "Current voltage L2", "enable_default": True, "device_class": DEVICE_CLASS_VOLTAGE, - "unit": VOLT, + "unit": ELECTRIC_POTENTIAL_VOLT, }, "dsmr/reading/phase_voltage_l3": { "name": "Current voltage L3", "enable_default": True, "device_class": DEVICE_CLASS_VOLTAGE, - "unit": VOLT, + "unit": ELECTRIC_POTENTIAL_VOLT, }, "dsmr/reading/phase_power_current_l1": { "name": "Phase power current L1", "enable_default": True, "device_class": DEVICE_CLASS_CURRENT, - "unit": ELECTRICAL_CURRENT_AMPERE, + "unit": ELECTRIC_CURRENT_AMPERE, }, "dsmr/reading/phase_power_current_l2": { "name": "Phase power current L2", "enable_default": True, "device_class": DEVICE_CLASS_CURRENT, - "unit": ELECTRICAL_CURRENT_AMPERE, + "unit": ELECTRIC_CURRENT_AMPERE, }, "dsmr/reading/phase_power_current_l3": { "name": "Phase power current L3", "enable_default": True, "device_class": DEVICE_CLASS_CURRENT, - "unit": ELECTRICAL_CURRENT_AMPERE, + "unit": ELECTRIC_CURRENT_AMPERE, }, "dsmr/reading/timestamp": { "name": "Telegram timestamp", diff --git a/homeassistant/components/elkm1/sensor.py b/homeassistant/components/elkm1/sensor.py index 4a75ccb242e..8f26af545b7 100644 --- a/homeassistant/components/elkm1/sensor.py +++ b/homeassistant/components/elkm1/sensor.py @@ -9,7 +9,7 @@ from elkm1_lib.util import pretty_const, username import voluptuous as vol from homeassistant.components.sensor import SensorEntity -from homeassistant.const import VOLT +from homeassistant.const import ELECTRIC_POTENTIAL_VOLT from homeassistant.exceptions import HomeAssistantError from homeassistant.helpers import entity_platform @@ -255,7 +255,7 @@ class ElkZone(ElkSensor): if self._element.definition == ZoneType.TEMPERATURE.value: return self._temperature_unit if self._element.definition == ZoneType.ANALOG_ZONE.value: - return VOLT + return ELECTRIC_POTENTIAL_VOLT return None def _element_changed(self, element, changeset): diff --git a/homeassistant/components/envirophat/sensor.py b/homeassistant/components/envirophat/sensor.py index 4e10b5e65d1..9bca552326a 100644 --- a/homeassistant/components/envirophat/sensor.py +++ b/homeassistant/components/envirophat/sensor.py @@ -10,9 +10,9 @@ from homeassistant.const import ( CONF_DISPLAY_OPTIONS, CONF_NAME, DEVICE_CLASS_TEMPERATURE, + ELECTRIC_POTENTIAL_VOLT, PRESSURE_HPA, TEMP_CELSIUS, - VOLT, ) import homeassistant.helpers.config_validation as cv from homeassistant.util import Throttle @@ -37,10 +37,10 @@ SENSOR_TYPES = { "magnetometer_z": ["magnetometer_z", " ", "mdi:magnet", None], "temperature": ["temperature", TEMP_CELSIUS, None, DEVICE_CLASS_TEMPERATURE], "pressure": ["pressure", PRESSURE_HPA, "mdi:gauge", None], - "voltage_0": ["voltage_0", VOLT, "mdi:flash", None], - "voltage_1": ["voltage_1", VOLT, "mdi:flash", None], - "voltage_2": ["voltage_2", VOLT, "mdi:flash", None], - "voltage_3": ["voltage_3", VOLT, "mdi:flash", None], + "voltage_0": ["voltage_0", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], + "voltage_1": ["voltage_1", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], + "voltage_2": ["voltage_2", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], + "voltage_3": ["voltage_3", ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], } PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( diff --git a/homeassistant/components/goalzero/const.py b/homeassistant/components/goalzero/const.py index 327a4f4833c..ce4b610b3f0 100644 --- a/homeassistant/components/goalzero/const.py +++ b/homeassistant/components/goalzero/const.py @@ -20,7 +20,8 @@ from homeassistant.const import ( ATTR_DEVICE_CLASS, ATTR_NAME, ATTR_UNIT_OF_MEASUREMENT, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, ENERGY_WATT_HOUR, PERCENTAGE, POWER_WATT, @@ -28,7 +29,6 @@ from homeassistant.const import ( TEMP_CELSIUS, TIME_MINUTES, TIME_SECONDS, - VOLT, ) ATTR_DEFAULT_ENABLED = "default_enabled" @@ -66,7 +66,7 @@ SENSOR_DICT = { "ampsIn": { ATTR_NAME: "Amps In", ATTR_DEVICE_CLASS: DEVICE_CLASS_CURRENT, - ATTR_UNIT_OF_MEASUREMENT: ELECTRICAL_CURRENT_AMPERE, + ATTR_UNIT_OF_MEASUREMENT: ELECTRIC_CURRENT_AMPERE, ATTR_STATE_CLASS: STATE_CLASS_MEASUREMENT, ATTR_DEFAULT_ENABLED: False, }, @@ -80,7 +80,7 @@ SENSOR_DICT = { "ampsOut": { ATTR_NAME: "Amps Out", ATTR_DEVICE_CLASS: DEVICE_CLASS_CURRENT, - ATTR_UNIT_OF_MEASUREMENT: ELECTRICAL_CURRENT_AMPERE, + ATTR_UNIT_OF_MEASUREMENT: ELECTRIC_CURRENT_AMPERE, ATTR_STATE_CLASS: STATE_CLASS_MEASUREMENT, ATTR_DEFAULT_ENABLED: False, }, @@ -101,7 +101,7 @@ SENSOR_DICT = { "volts": { ATTR_NAME: "Volts", ATTR_DEVICE_CLASS: DEVICE_CLASS_VOLTAGE, - ATTR_UNIT_OF_MEASUREMENT: VOLT, + ATTR_UNIT_OF_MEASUREMENT: ELECTRIC_POTENTIAL_VOLT, ATTR_DEFAULT_ENABLED: False, }, "socPercent": { diff --git a/homeassistant/components/greeneye_monitor/sensor.py b/homeassistant/components/greeneye_monitor/sensor.py index 0aa106e6801..fac11395c8b 100644 --- a/homeassistant/components/greeneye_monitor/sensor.py +++ b/homeassistant/components/greeneye_monitor/sensor.py @@ -5,11 +5,11 @@ from homeassistant.const import ( CONF_SENSOR_TYPE, CONF_TEMPERATURE_UNIT, DEVICE_CLASS_TEMPERATURE, + ELECTRIC_POTENTIAL_VOLT, POWER_WATT, TIME_HOURS, TIME_MINUTES, TIME_SECONDS, - VOLT, ) from . import ( @@ -270,7 +270,7 @@ class VoltageSensor(GEMSensor): """Entity showing voltage.""" _attr_icon = VOLTAGE_ICON - _attr_unit_of_measurement = VOLT + _attr_unit_of_measurement = ELECTRIC_POTENTIAL_VOLT def __init__(self, monitor_serial_number, number, name): """Construct the entity.""" diff --git a/homeassistant/components/growatt_server/sensor.py b/homeassistant/components/growatt_server/sensor.py index c8921d9e514..78fd24623d8 100644 --- a/homeassistant/components/growatt_server/sensor.py +++ b/homeassistant/components/growatt_server/sensor.py @@ -21,14 +21,14 @@ from homeassistant.const import ( DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_TIMESTAMP, DEVICE_CLASS_VOLTAGE, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, ENERGY_KILO_WATT_HOUR, FREQUENCY_HERTZ, PERCENTAGE, POWER_KILO_WATT, POWER_WATT, TEMP_CELSIUS, - VOLT, ) import homeassistant.helpers.config_validation as cv from homeassistant.util import Throttle, dt @@ -84,13 +84,13 @@ INVERTER_SENSOR_TYPES = { ), "inverter_voltage_input_1": ( "Input 1 voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "vpv1", {"round": 2, "device_class": DEVICE_CLASS_VOLTAGE}, ), "inverter_amperage_input_1": ( "Input 1 Amperage", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "ipv1", {"round": 1, "device_class": DEVICE_CLASS_CURRENT}, ), @@ -102,13 +102,13 @@ INVERTER_SENSOR_TYPES = { ), "inverter_voltage_input_2": ( "Input 2 voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "vpv2", {"round": 1, "device_class": DEVICE_CLASS_VOLTAGE}, ), "inverter_amperage_input_2": ( "Input 2 Amperage", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "ipv2", {"round": 1, "device_class": DEVICE_CLASS_CURRENT}, ), @@ -120,13 +120,13 @@ INVERTER_SENSOR_TYPES = { ), "inverter_voltage_input_3": ( "Input 3 voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "vpv3", {"round": 1, "device_class": DEVICE_CLASS_VOLTAGE}, ), "inverter_amperage_input_3": ( "Input 3 Amperage", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "ipv3", {"round": 1, "device_class": DEVICE_CLASS_CURRENT}, ), @@ -144,13 +144,13 @@ INVERTER_SENSOR_TYPES = { ), "inverter_reactive_voltage": ( "Reactive voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "vacr", {"round": 1, "device_class": DEVICE_CLASS_VOLTAGE}, ), "inverter_inverter_reactive_amperage": ( "Reactive amperage", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "iacr", {"round": 1, "device_class": DEVICE_CLASS_CURRENT}, ), @@ -280,13 +280,13 @@ STORAGE_SENSOR_TYPES = { ), "storage_grid_voltage": ( "AC input voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "vGrid", {"round": 2, "device_class": DEVICE_CLASS_VOLTAGE}, ), "storage_pv_charging_voltage": ( "PV charging voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "vpv", {"round": 2, "device_class": DEVICE_CLASS_VOLTAGE}, ), @@ -298,7 +298,7 @@ STORAGE_SENSOR_TYPES = { ), "storage_output_voltage": ( "Output voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "outPutVolt", {"round": 2, "device_class": DEVICE_CLASS_VOLTAGE}, ), @@ -310,31 +310,31 @@ STORAGE_SENSOR_TYPES = { ), "storage_current_PV": ( "Solar charge current", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "iAcCharge", {"round": 2, "device_class": DEVICE_CLASS_CURRENT}, ), "storage_current_1": ( "Solar current to storage", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "iChargePV1", {"round": 2, "device_class": DEVICE_CLASS_CURRENT}, ), "storage_grid_amperage_input": ( "Grid charge current", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "chgCurr", {"round": 2, "device_class": DEVICE_CLASS_CURRENT}, ), "storage_grid_out_current": ( "Grid out current", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "outPutCurrent", {"round": 2, "device_class": DEVICE_CLASS_CURRENT}, ), "storage_battery_voltage": ( "Battery voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "vBat", {"round": 2, "device_class": DEVICE_CLASS_VOLTAGE}, ), @@ -398,19 +398,19 @@ MIX_SENSOR_TYPES = { ), "mix_battery_voltage": ( "Battery voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "vbat", {"device_class": DEVICE_CLASS_VOLTAGE}, ), "mix_pv1_voltage": ( "PV1 voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "vpv1", {"device_class": DEVICE_CLASS_VOLTAGE}, ), "mix_pv2_voltage": ( "PV2 voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "vpv2", {"device_class": DEVICE_CLASS_VOLTAGE}, ), @@ -490,7 +490,7 @@ MIX_SENSOR_TYPES = { ), "mix_grid_voltage": ( "Grid voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "vAc1", {"device_class": DEVICE_CLASS_VOLTAGE}, ), diff --git a/homeassistant/components/homematic/sensor.py b/homeassistant/components/homematic/sensor.py index 2bc51f67896..ad62001d5f9 100644 --- a/homeassistant/components/homematic/sensor.py +++ b/homeassistant/components/homematic/sensor.py @@ -9,6 +9,7 @@ from homeassistant.const import ( DEVICE_CLASS_POWER, DEVICE_CLASS_TEMPERATURE, ELECTRIC_CURRENT_MILLIAMPERE, + ELECTRIC_POTENTIAL_VOLT, ENERGY_WATT_HOUR, FREQUENCY_HERTZ, LENGTH_MILLIMETERS, @@ -18,7 +19,6 @@ from homeassistant.const import ( PRESSURE_HPA, SPEED_KILOMETERS_PER_HOUR, TEMP_CELSIUS, - VOLT, VOLUME_CUBIC_METERS, ) @@ -49,7 +49,7 @@ HM_UNIT_HA_CAST = { "BRIGHTNESS": "#", "POWER": POWER_WATT, "CURRENT": ELECTRIC_CURRENT_MILLIAMPERE, - "VOLTAGE": VOLT, + "VOLTAGE": ELECTRIC_POTENTIAL_VOLT, "ENERGY_COUNTER": ENERGY_WATT_HOUR, "GAS_POWER": VOLUME_CUBIC_METERS, "GAS_ENERGY_COUNTER": VOLUME_CUBIC_METERS, diff --git a/homeassistant/components/isy994/const.py b/homeassistant/components/isy994/const.py index 03b1fa6c66b..343f01332f2 100644 --- a/homeassistant/components/isy994/const.py +++ b/homeassistant/components/isy994/const.py @@ -50,6 +50,7 @@ from homeassistant.const import ( DEGREE, ELECTRIC_CURRENT_MILLIAMPERE, ELECTRIC_POTENTIAL_MILLIVOLT, + ELECTRIC_POTENTIAL_VOLT, ENERGY_KILO_WATT_HOUR, ENERGY_WATT_HOUR, FREQUENCY_HERTZ, @@ -102,7 +103,6 @@ from homeassistant.const import ( TIME_SECONDS, TIME_YEARS, UV_INDEX, - VOLT, VOLUME_CUBIC_FEET, VOLUME_CUBIC_METERS, VOLUME_FLOW_RATE_CUBIC_FEET_PER_MINUTE, @@ -399,7 +399,7 @@ UOM_FRIENDLY_NAME = { "65": "SML", "69": VOLUME_GALLONS, "71": UV_INDEX, - "72": VOLT, + "72": ELECTRIC_POTENTIAL_VOLT, "73": POWER_WATT, "74": IRRADIATION_WATTS_PER_SQUARE_METER, "75": "weekday", diff --git a/homeassistant/components/juicenet/sensor.py b/homeassistant/components/juicenet/sensor.py index 81fabf17eea..51792daf38c 100644 --- a/homeassistant/components/juicenet/sensor.py +++ b/homeassistant/components/juicenet/sensor.py @@ -6,12 +6,12 @@ from homeassistant.const import ( DEVICE_CLASS_POWER, DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_VOLTAGE, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, ENERGY_WATT_HOUR, POWER_WATT, TEMP_CELSIUS, TIME_SECONDS, - VOLT, ) from .const import DOMAIN, JUICENET_API, JUICENET_COORDINATOR @@ -25,10 +25,10 @@ SENSOR_TYPES = { DEVICE_CLASS_TEMPERATURE, STATE_CLASS_MEASUREMENT, ], - "voltage": ["Voltage", VOLT, DEVICE_CLASS_VOLTAGE, None], + "voltage": ["Voltage", ELECTRIC_POTENTIAL_VOLT, DEVICE_CLASS_VOLTAGE, None], "amps": [ "Amps", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, DEVICE_CLASS_CURRENT, STATE_CLASS_MEASUREMENT, ], diff --git a/homeassistant/components/keba/sensor.py b/homeassistant/components/keba/sensor.py index 836785490e8..2792246d71c 100644 --- a/homeassistant/components/keba/sensor.py +++ b/homeassistant/components/keba/sensor.py @@ -2,7 +2,7 @@ from homeassistant.components.sensor import SensorEntity from homeassistant.const import ( DEVICE_CLASS_POWER, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, ENERGY_KILO_WATT_HOUR, ) @@ -23,7 +23,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info= "Max Current", "max_current", "mdi:flash", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, ), KebaSensor( keba, diff --git a/homeassistant/components/lcn/const.py b/homeassistant/components/lcn/const.py index 3458c78f853..faef86dc70a 100644 --- a/homeassistant/components/lcn/const.py +++ b/homeassistant/components/lcn/const.py @@ -3,11 +3,11 @@ from itertools import product from homeassistant.const import ( DEGREE, + ELECTRIC_POTENTIAL_VOLT, PERCENTAGE, TEMP_CELSIUS, TEMP_FAHRENHEIT, TEMP_KELVIN, - VOLT, ) PLATFORMS = ["binary_sensor", "climate", "cover", "light", "scene", "sensor", "switch"] @@ -171,7 +171,7 @@ VAR_UNITS = [ "PERCENT", "PPM", "VOLT", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "AMPERE", "AMP", "A", diff --git a/homeassistant/components/mysensors/sensor.py b/homeassistant/components/mysensors/sensor.py index f16f9e09c41..f2908567a14 100644 --- a/homeassistant/components/mysensors/sensor.py +++ b/homeassistant/components/mysensors/sensor.py @@ -11,20 +11,20 @@ from homeassistant.const import ( DEGREE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, + ELECTRIC_CURRENT_AMPERE, ELECTRIC_POTENTIAL_MILLIVOLT, - ELECTRICAL_CURRENT_AMPERE, - ELECTRICAL_VOLT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, ENERGY_KILO_WATT_HOUR, FREQUENCY_HERTZ, LENGTH_METERS, LIGHT_LUX, MASS_KILOGRAMS, PERCENTAGE, + POWER_VOLT_AMPERE, POWER_WATT, SOUND_PRESSURE_DB, TEMP_CELSIUS, TEMP_FAHRENHEIT, - VOLT, VOLUME_CUBIC_METERS, ) from homeassistant.core import HomeAssistant @@ -59,13 +59,13 @@ SENSORS: dict[str, list[str | None] | dict[str, list[str | None]]] = { "S_VIBRATION": [FREQUENCY_HERTZ, None, None], "S_LIGHT_LEVEL": [LIGHT_LUX, "mdi:white-balance-sunny", None], }, - "V_VOLTAGE": [VOLT, "mdi:flash", None], - "V_CURRENT": [ELECTRICAL_CURRENT_AMPERE, "mdi:flash-auto", None], + "V_VOLTAGE": [ELECTRIC_POTENTIAL_VOLT, "mdi:flash", None], + "V_CURRENT": [ELECTRIC_CURRENT_AMPERE, "mdi:flash-auto", None], "V_PH": ["pH", None, None], "V_ORP": [ELECTRIC_POTENTIAL_MILLIVOLT, None, None], "V_EC": [CONDUCTIVITY, None, None], "V_VAR": ["var", None, None], - "V_VA": [ELECTRICAL_VOLT_AMPERE, None, None], + "V_VA": [POWER_VOLT_AMPERE, None, None], } diff --git a/homeassistant/components/nut/const.py b/homeassistant/components/nut/const.py index 890ac3697dd..1f5fecdd219 100644 --- a/homeassistant/components/nut/const.py +++ b/homeassistant/components/nut/const.py @@ -7,14 +7,14 @@ from homeassistant.components.sensor import ( DEVICE_CLASS_VOLTAGE, ) from homeassistant.const import ( - ELECTRICAL_CURRENT_AMPERE, - ELECTRICAL_VOLT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, FREQUENCY_HERTZ, PERCENTAGE, + POWER_VOLT_AMPERE, POWER_WATT, TEMP_CELSIUS, TIME_SECONDS, - VOLT, ) DOMAIN = "nut" @@ -80,8 +80,8 @@ SENSOR_TYPES = { "ups.display.language": ["Language", "", "mdi:information-outline", None], "ups.contacts": ["External Contacts", "", "mdi:information-outline", None], "ups.efficiency": ["Efficiency", PERCENTAGE, "mdi:gauge", None], - "ups.power": ["Current Apparent Power", ELECTRICAL_VOLT_AMPERE, "mdi:flash", None], - "ups.power.nominal": ["Nominal Power", ELECTRICAL_VOLT_AMPERE, "mdi:flash", None], + "ups.power": ["Current Apparent Power", POWER_VOLT_AMPERE, "mdi:flash", None], + "ups.power.nominal": ["Nominal Power", POWER_VOLT_AMPERE, "mdi:flash", None], "ups.realpower": [ "Current Real Power", POWER_WATT, @@ -121,25 +121,40 @@ SENSOR_TYPES = { None, ], "battery.charger.status": ["Charging Status", "", "mdi:information-outline", None], - "battery.voltage": ["Battery Voltage", VOLT, None, DEVICE_CLASS_VOLTAGE], - "battery.voltage.nominal": [ - "Nominal Battery Voltage", - VOLT, + "battery.voltage": [ + "Battery Voltage", + ELECTRIC_POTENTIAL_VOLT, + None, + DEVICE_CLASS_VOLTAGE, + ], + "battery.voltage.nominal": [ + "Nominal Battery Voltage", + ELECTRIC_POTENTIAL_VOLT, + None, + DEVICE_CLASS_VOLTAGE, + ], + "battery.voltage.low": [ + "Low Battery Voltage", + ELECTRIC_POTENTIAL_VOLT, + None, + DEVICE_CLASS_VOLTAGE, + ], + "battery.voltage.high": [ + "High Battery Voltage", + ELECTRIC_POTENTIAL_VOLT, None, DEVICE_CLASS_VOLTAGE, ], - "battery.voltage.low": ["Low Battery Voltage", VOLT, None, DEVICE_CLASS_VOLTAGE], - "battery.voltage.high": ["High Battery Voltage", VOLT, None, DEVICE_CLASS_VOLTAGE], "battery.capacity": ["Battery Capacity", "Ah", "mdi:flash", None], "battery.current": [ "Battery Current", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "mdi:flash", None, ], "battery.current.total": [ "Total Battery Current", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "mdi:flash", None, ], @@ -184,18 +199,33 @@ SENSOR_TYPES = { "mdi:information-outline", None, ], - "input.transfer.low": ["Low Voltage Transfer", VOLT, None, DEVICE_CLASS_VOLTAGE], - "input.transfer.high": ["High Voltage Transfer", VOLT, None, DEVICE_CLASS_VOLTAGE], + "input.transfer.low": [ + "Low Voltage Transfer", + ELECTRIC_POTENTIAL_VOLT, + None, + DEVICE_CLASS_VOLTAGE, + ], + "input.transfer.high": [ + "High Voltage Transfer", + ELECTRIC_POTENTIAL_VOLT, + None, + DEVICE_CLASS_VOLTAGE, + ], "input.transfer.reason": [ "Voltage Transfer Reason", "", "mdi:information-outline", None, ], - "input.voltage": ["Input Voltage", VOLT, None, DEVICE_CLASS_VOLTAGE], + "input.voltage": [ + "Input Voltage", + ELECTRIC_POTENTIAL_VOLT, + None, + DEVICE_CLASS_VOLTAGE, + ], "input.voltage.nominal": [ "Nominal Input Voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, None, DEVICE_CLASS_VOLTAGE, ], @@ -212,17 +242,22 @@ SENSOR_TYPES = { "mdi:information-outline", None, ], - "output.current": ["Output Current", ELECTRICAL_CURRENT_AMPERE, "mdi:flash", None], + "output.current": ["Output Current", ELECTRIC_CURRENT_AMPERE, "mdi:flash", None], "output.current.nominal": [ "Nominal Output Current", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "mdi:flash", None, ], - "output.voltage": ["Output Voltage", VOLT, None, DEVICE_CLASS_VOLTAGE], + "output.voltage": [ + "Output Voltage", + ELECTRIC_POTENTIAL_VOLT, + None, + DEVICE_CLASS_VOLTAGE, + ], "output.voltage.nominal": [ "Nominal Output Voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, None, DEVICE_CLASS_VOLTAGE, ], diff --git a/homeassistant/components/onewire/const.py b/homeassistant/components/onewire/const.py index d2c712c26c5..9112bf5e8f6 100644 --- a/homeassistant/components/onewire/const.py +++ b/homeassistant/components/onewire/const.py @@ -11,12 +11,12 @@ from homeassistant.const import ( DEVICE_CLASS_PRESSURE, DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_VOLTAGE, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, LIGHT_LUX, PERCENTAGE, PRESSURE_MBAR, TEMP_CELSIUS, - VOLT, ) CONF_MOUNT_DIR = "mount_dir" @@ -55,8 +55,8 @@ SENSOR_TYPES: dict[str, list[str | None]] = { SENSOR_TYPE_WETNESS: [PERCENTAGE, DEVICE_CLASS_HUMIDITY], SENSOR_TYPE_MOISTURE: [PRESSURE_CBAR, DEVICE_CLASS_PRESSURE], SENSOR_TYPE_COUNT: ["count", None], - SENSOR_TYPE_VOLTAGE: [VOLT, DEVICE_CLASS_VOLTAGE], - SENSOR_TYPE_CURRENT: [ELECTRICAL_CURRENT_AMPERE, DEVICE_CLASS_CURRENT], + SENSOR_TYPE_VOLTAGE: [ELECTRIC_POTENTIAL_VOLT, DEVICE_CLASS_VOLTAGE], + SENSOR_TYPE_CURRENT: [ELECTRIC_CURRENT_AMPERE, DEVICE_CLASS_CURRENT], SENSOR_TYPE_SENSED: [None, None], SWITCH_TYPE_LATCH: [None, None], SWITCH_TYPE_PIO: [None, None], diff --git a/homeassistant/components/rfxtrx/__init__.py b/homeassistant/components/rfxtrx/__init__.py index a4be36df998..66d4235ffdb 100644 --- a/homeassistant/components/rfxtrx/__init__.py +++ b/homeassistant/components/rfxtrx/__init__.py @@ -23,7 +23,8 @@ from homeassistant.const import ( CONF_HOST, CONF_PORT, DEGREE, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, ENERGY_KILO_WATT_HOUR, EVENT_HOMEASSISTANT_STOP, LENGTH_MILLIMETERS, @@ -35,7 +36,6 @@ from homeassistant.const import ( SPEED_METERS_PER_SECOND, TEMP_CELSIUS, UV_INDEX, - VOLT, ) from homeassistant.core import callback import homeassistant.helpers.config_validation as cv @@ -87,11 +87,11 @@ DATA_TYPES = OrderedDict( ("Wind gust", SPEED_METERS_PER_SECOND), ("Chill", TEMP_CELSIUS), ("Count", "count"), - ("Current Ch. 1", ELECTRICAL_CURRENT_AMPERE), - ("Current Ch. 2", ELECTRICAL_CURRENT_AMPERE), - ("Current Ch. 3", ELECTRICAL_CURRENT_AMPERE), - ("Voltage", VOLT), - ("Current", ELECTRICAL_CURRENT_AMPERE), + ("Current Ch. 1", ELECTRIC_CURRENT_AMPERE), + ("Current Ch. 2", ELECTRIC_CURRENT_AMPERE), + ("Current Ch. 3", ELECTRIC_CURRENT_AMPERE), + ("Voltage", ELECTRIC_POTENTIAL_VOLT), + ("Current", ELECTRIC_CURRENT_AMPERE), ("Battery numeric", PERCENTAGE), ("Rssi numeric", SIGNAL_STRENGTH_DECIBELS_MILLIWATT), ] diff --git a/homeassistant/components/sense/sensor.py b/homeassistant/components/sense/sensor.py index 238b0b83cde..dd522d012a5 100644 --- a/homeassistant/components/sense/sensor.py +++ b/homeassistant/components/sense/sensor.py @@ -3,9 +3,9 @@ from homeassistant.components.sensor import STATE_CLASS_MEASUREMENT, SensorEntit from homeassistant.const import ( ATTR_ATTRIBUTION, DEVICE_CLASS_POWER, + ELECTRIC_POTENTIAL_VOLT, ENERGY_KILO_WATT_HOUR, POWER_WATT, - VOLT, ) from homeassistant.core import callback from homeassistant.helpers.dispatcher import async_dispatcher_connect @@ -174,7 +174,7 @@ class SenseActiveSensor(SensorEntity): class SenseVoltageSensor(SensorEntity): """Implementation of a Sense energy voltage sensor.""" - _attr_unit_of_measurement = VOLT + _attr_unit_of_measurement = ELECTRIC_POTENTIAL_VOLT _attr_extra_state_attributes = {ATTR_ATTRIBUTION: ATTRIBUTION} _attr_icon = ICON _attr_should_poll = False diff --git a/homeassistant/components/shelly/sensor.py b/homeassistant/components/shelly/sensor.py index a42f38f8a1b..8a435c3e50f 100644 --- a/homeassistant/components/shelly/sensor.py +++ b/homeassistant/components/shelly/sensor.py @@ -4,13 +4,13 @@ from homeassistant.components.sensor import SensorEntity from homeassistant.const import ( CONCENTRATION_PARTS_PER_MILLION, DEGREE, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, ENERGY_KILO_WATT_HOUR, LIGHT_LUX, PERCENTAGE, POWER_WATT, SIGNAL_STRENGTH_DECIBELS_MILLIWATT, - VOLT, ) from .const import SHAIR_MAX_WORK_HOURS @@ -43,7 +43,7 @@ SENSORS = { ), ("emeter", "current"): BlockAttributeDescription( name="Current", - unit=ELECTRICAL_CURRENT_AMPERE, + unit=ELECTRIC_CURRENT_AMPERE, value=lambda value: value, device_class=sensor.DEVICE_CLASS_CURRENT, state_class=sensor.STATE_CLASS_MEASUREMENT, @@ -72,7 +72,7 @@ SENSORS = { ), ("emeter", "voltage"): BlockAttributeDescription( name="Voltage", - unit=VOLT, + unit=ELECTRIC_POTENTIAL_VOLT, value=lambda value: round(value, 1), device_class=sensor.DEVICE_CLASS_VOLTAGE, state_class=sensor.STATE_CLASS_MEASUREMENT, @@ -186,7 +186,7 @@ SENSORS = { ), ("adc", "adc"): BlockAttributeDescription( name="ADC", - unit=VOLT, + unit=ELECTRIC_POTENTIAL_VOLT, value=lambda value: round(value, 1), device_class=sensor.DEVICE_CLASS_VOLTAGE, state_class=sensor.STATE_CLASS_MEASUREMENT, diff --git a/homeassistant/components/smappee/sensor.py b/homeassistant/components/smappee/sensor.py index 75c5da85c34..fb00886f1f6 100644 --- a/homeassistant/components/smappee/sensor.py +++ b/homeassistant/components/smappee/sensor.py @@ -1,6 +1,11 @@ """Support for monitoring a Smappee energy sensor.""" from homeassistant.components.sensor import SensorEntity -from homeassistant.const import DEVICE_CLASS_POWER, ENERGY_WATT_HOUR, POWER_WATT, VOLT +from homeassistant.const import ( + DEVICE_CLASS_POWER, + ELECTRIC_POTENTIAL_VOLT, + ENERGY_WATT_HOUR, + POWER_WATT, +) from .const import DOMAIN @@ -93,7 +98,7 @@ VOLTAGE_SENSORS = { "phase_voltages_a": [ "Phase voltages - A", "mdi:flash", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "phase_voltage_a", None, ["ONE", "TWO", "THREE_STAR", "THREE_DELTA"], @@ -101,7 +106,7 @@ VOLTAGE_SENSORS = { "phase_voltages_b": [ "Phase voltages - B", "mdi:flash", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "phase_voltage_b", None, ["TWO", "THREE_STAR", "THREE_DELTA"], @@ -109,7 +114,7 @@ VOLTAGE_SENSORS = { "phase_voltages_c": [ "Phase voltages - C", "mdi:flash", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "phase_voltage_c", None, ["THREE_STAR"], @@ -117,7 +122,7 @@ VOLTAGE_SENSORS = { "line_voltages_a": [ "Line voltages - A", "mdi:flash", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "line_voltage_a", None, ["ONE", "TWO", "THREE_STAR", "THREE_DELTA"], @@ -125,7 +130,7 @@ VOLTAGE_SENSORS = { "line_voltages_b": [ "Line voltages - B", "mdi:flash", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "line_voltage_b", None, ["TWO", "THREE_STAR", "THREE_DELTA"], @@ -133,7 +138,7 @@ VOLTAGE_SENSORS = { "line_voltages_c": [ "Line voltages - C", "mdi:flash", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "line_voltage_c", None, ["THREE_STAR", "THREE_DELTA"], diff --git a/homeassistant/components/smartthings/sensor.py b/homeassistant/components/smartthings/sensor.py index a7e2926036c..b8bb071fc0a 100644 --- a/homeassistant/components/smartthings/sensor.py +++ b/homeassistant/components/smartthings/sensor.py @@ -15,6 +15,7 @@ from homeassistant.const import ( DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_TIMESTAMP, + ELECTRIC_POTENTIAL_VOLT, ENERGY_KILO_WATT_HOUR, LIGHT_LUX, MASS_KILOGRAMS, @@ -22,7 +23,6 @@ from homeassistant.const import ( POWER_WATT, TEMP_CELSIUS, TEMP_FAHRENHEIT, - VOLT, VOLUME_CUBIC_METERS, ) @@ -254,7 +254,7 @@ CAPABILITY_TO_SENSORS = { Map(Attribute.ultraviolet_index, "Ultraviolet Index", None, None) ], Capability.voltage_measurement: [ - Map(Attribute.voltage, "Voltage Measurement", VOLT, None) + Map(Attribute.voltage, "Voltage Measurement", ELECTRIC_POTENTIAL_VOLT, None) ], Capability.washer_mode: [Map(Attribute.washer_mode, "Washer Mode", None, None)], Capability.washer_operating_state: [ diff --git a/homeassistant/components/solaredge_local/sensor.py b/homeassistant/components/solaredge_local/sensor.py index 920cbb564f8..3f159ce4480 100644 --- a/homeassistant/components/solaredge_local/sensor.py +++ b/homeassistant/components/solaredge_local/sensor.py @@ -14,13 +14,13 @@ from homeassistant.const import ( CONF_IP_ADDRESS, CONF_NAME, DEVICE_CLASS_TEMPERATURE, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, ENERGY_WATT_HOUR, FREQUENCY_HERTZ, POWER_WATT, TEMP_CELSIUS, TEMP_FAHRENHEIT, - VOLT, ) import homeassistant.helpers.config_validation as cv from homeassistant.util import Throttle @@ -44,8 +44,20 @@ INVERTER_MODES = ( # Supported sensor types: # Key: ['json_key', 'name', unit, icon, attribute name] SENSOR_TYPES = { - "current_AC_voltage": ["gridvoltage", "Grid Voltage", VOLT, "mdi:current-ac", None], - "current_DC_voltage": ["dcvoltage", "DC Voltage", VOLT, "mdi:current-dc", None], + "current_AC_voltage": [ + "gridvoltage", + "Grid Voltage", + ELECTRIC_POTENTIAL_VOLT, + "mdi:current-ac", + None, + ], + "current_DC_voltage": [ + "dcvoltage", + "DC Voltage", + ELECTRIC_POTENTIAL_VOLT, + "mdi:current-dc", + None, + ], "current_frequency": [ "gridfrequency", "Grid Frequency", @@ -113,7 +125,7 @@ SENSOR_TYPES = { "optimizer_current": [ "optimizercurrent", "Average Optimizer Current", - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, "mdi:solar-panel", None, None, @@ -137,7 +149,7 @@ SENSOR_TYPES = { "optimizer_voltage": [ "optimizervoltage", "Average Optimizer Voltage", - VOLT, + ELECTRIC_POTENTIAL_VOLT, "mdi:solar-panel", None, None, diff --git a/homeassistant/components/solarlog/const.py b/homeassistant/components/solarlog/const.py index dab844f86d6..0d989642d07 100644 --- a/homeassistant/components/solarlog/const.py +++ b/homeassistant/components/solarlog/const.py @@ -1,7 +1,12 @@ """Constants for the Solar-Log integration.""" from datetime import timedelta -from homeassistant.const import ENERGY_KILO_WATT_HOUR, PERCENTAGE, POWER_WATT, VOLT +from homeassistant.const import ( + ELECTRIC_POTENTIAL_VOLT, + ENERGY_KILO_WATT_HOUR, + PERCENTAGE, + POWER_WATT, +) DOMAIN = "solarlog" @@ -17,8 +22,8 @@ SENSOR_TYPES = { "time": ["TIME", "last update", None, "mdi:calendar-clock"], "power_ac": ["powerAC", "power AC", POWER_WATT, "mdi:solar-power"], "power_dc": ["powerDC", "power DC", POWER_WATT, "mdi:solar-power"], - "voltage_ac": ["voltageAC", "voltage AC", VOLT, "mdi:flash"], - "voltage_dc": ["voltageDC", "voltage DC", VOLT, "mdi:flash"], + "voltage_ac": ["voltageAC", "voltage AC", ELECTRIC_POTENTIAL_VOLT, "mdi:flash"], + "voltage_dc": ["voltageDC", "voltage DC", ELECTRIC_POTENTIAL_VOLT, "mdi:flash"], "yield_day": ["yieldDAY", "yield day", ENERGY_KILO_WATT_HOUR, "mdi:solar-power"], "yield_yesterday": [ "yieldYESTERDAY", diff --git a/homeassistant/components/starline/sensor.py b/homeassistant/components/starline/sensor.py index 4cb470be894..e7996befad3 100644 --- a/homeassistant/components/starline/sensor.py +++ b/homeassistant/components/starline/sensor.py @@ -1,10 +1,10 @@ """Reads vehicle status from StarLine API.""" from homeassistant.components.sensor import DEVICE_CLASS_TEMPERATURE, SensorEntity from homeassistant.const import ( + ELECTRIC_POTENTIAL_VOLT, LENGTH_KILOMETERS, PERCENTAGE, TEMP_CELSIUS, - VOLT, VOLUME_LITERS, ) from homeassistant.helpers.icon import icon_for_battery_level, icon_for_signal_level @@ -14,7 +14,7 @@ from .const import DOMAIN from .entity import StarlineEntity SENSOR_TYPES = { - "battery": ["Battery", None, VOLT, None], + "battery": ["Battery", None, ELECTRIC_POTENTIAL_VOLT, None], "balance": ["Balance", None, None, "mdi:cash-multiple"], "ctemp": ["Interior Temperature", DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None], "etemp": ["Engine Temperature", DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None], diff --git a/homeassistant/components/subaru/sensor.py b/homeassistant/components/subaru/sensor.py index 3994c9c6124..ff1d8b715d7 100644 --- a/homeassistant/components/subaru/sensor.py +++ b/homeassistant/components/subaru/sensor.py @@ -8,13 +8,13 @@ from homeassistant.const import ( DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_TIMESTAMP, DEVICE_CLASS_VOLTAGE, + ELECTRIC_POTENTIAL_VOLT, LENGTH_KILOMETERS, LENGTH_MILES, PERCENTAGE, PRESSURE_HPA, TEMP_CELSIUS, TIME_MINUTES, - VOLT, VOLUME_GALLONS, VOLUME_LITERS, ) @@ -111,7 +111,7 @@ API_GEN_2_SENSORS = [ SENSOR_TYPE: "12V Battery Voltage", SENSOR_CLASS: DEVICE_CLASS_VOLTAGE, SENSOR_FIELD: sc.BATTERY_VOLTAGE, - SENSOR_UNITS: VOLT, + SENSOR_UNITS: ELECTRIC_POTENTIAL_VOLT, }, ] diff --git a/homeassistant/components/switcher_kis/sensor.py b/homeassistant/components/switcher_kis/sensor.py index 58a32e69154..705c6f0a2b6 100644 --- a/homeassistant/components/switcher_kis/sensor.py +++ b/homeassistant/components/switcher_kis/sensor.py @@ -12,7 +12,7 @@ from homeassistant.components.sensor import ( SensorEntity, ) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ELECTRICAL_CURRENT_AMPERE, POWER_WATT +from homeassistant.const import ELECTRIC_CURRENT_AMPERE, POWER_WATT from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import device_registry from homeassistant.helpers.dispatcher import async_dispatcher_connect @@ -45,7 +45,7 @@ POWER_SENSORS = { ), "electric_current": AttributeDescription( name="Electric Current", - unit=ELECTRICAL_CURRENT_AMPERE, + unit=ELECTRIC_CURRENT_AMPERE, device_class=DEVICE_CLASS_CURRENT, state_class=STATE_CLASS_MEASUREMENT, ), diff --git a/homeassistant/components/system_bridge/sensor.py b/homeassistant/components/system_bridge/sensor.py index d73d85fca1f..71bb7030a11 100644 --- a/homeassistant/components/system_bridge/sensor.py +++ b/homeassistant/components/system_bridge/sensor.py @@ -14,10 +14,10 @@ from homeassistant.const import ( DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_TIMESTAMP, DEVICE_CLASS_VOLTAGE, + ELECTRIC_POTENTIAL_VOLT, FREQUENCY_GIGAHERTZ, PERCENTAGE, TEMP_CELSIUS, - VOLT, ) from homeassistant.core import HomeAssistant from homeassistant.helpers.update_coordinator import DataUpdateCoordinator @@ -205,7 +205,7 @@ class BridgeCpuVoltageSensor(BridgeSensor): "CPU Voltage", None, DEVICE_CLASS_VOLTAGE, - VOLT, + ELECTRIC_POTENTIAL_VOLT, False, ) diff --git a/homeassistant/components/tasmota/sensor.py b/homeassistant/components/tasmota/sensor.py index 87b81322799..b756d656921 100644 --- a/homeassistant/components/tasmota/sensor.py +++ b/homeassistant/components/tasmota/sensor.py @@ -26,14 +26,15 @@ from homeassistant.const import ( DEVICE_CLASS_SIGNAL_STRENGTH, DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_TIMESTAMP, - ELECTRICAL_CURRENT_AMPERE, - ELECTRICAL_VOLT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, ENERGY_KILO_WATT_HOUR, FREQUENCY_HERTZ, LENGTH_CENTIMETERS, LIGHT_LUX, MASS_KILOGRAMS, PERCENTAGE, + POWER_VOLT_AMPERE, POWER_WATT, PRESSURE_HPA, SIGNAL_STRENGTH_DECIBELS, @@ -44,7 +45,6 @@ from homeassistant.const import ( TEMP_CELSIUS, TEMP_FAHRENHEIT, TEMP_KELVIN, - VOLT, ) from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.dispatcher import async_dispatcher_connect @@ -134,8 +134,8 @@ SENSOR_UNIT_MAP = { hc.CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, hc.CONCENTRATION_PARTS_PER_BILLION: CONCENTRATION_PARTS_PER_BILLION, hc.CONCENTRATION_PARTS_PER_MILLION: CONCENTRATION_PARTS_PER_MILLION, - hc.ELECTRICAL_CURRENT_AMPERE: ELECTRICAL_CURRENT_AMPERE, - hc.ELECTRICAL_VOLT_AMPERE: ELECTRICAL_VOLT_AMPERE, + hc.ELECTRICAL_CURRENT_AMPERE: ELECTRIC_CURRENT_AMPERE, + hc.ELECTRICAL_VOLT_AMPERE: POWER_VOLT_AMPERE, hc.ENERGY_KILO_WATT_HOUR: ENERGY_KILO_WATT_HOUR, hc.FREQUENCY_HERTZ: FREQUENCY_HERTZ, hc.LENGTH_CENTIMETERS: LENGTH_CENTIMETERS, @@ -152,7 +152,7 @@ SENSOR_UNIT_MAP = { hc.TEMP_CELSIUS: TEMP_CELSIUS, hc.TEMP_FAHRENHEIT: TEMP_FAHRENHEIT, hc.TEMP_KELVIN: TEMP_KELVIN, - hc.VOLT: VOLT, + hc.VOLT: ELECTRIC_POTENTIAL_VOLT, } diff --git a/homeassistant/components/ted5000/sensor.py b/homeassistant/components/ted5000/sensor.py index 5c439651ed5..6732014c747 100644 --- a/homeassistant/components/ted5000/sensor.py +++ b/homeassistant/components/ted5000/sensor.py @@ -12,7 +12,13 @@ from homeassistant.components.sensor import ( STATE_CLASS_MEASUREMENT, SensorEntity, ) -from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, POWER_WATT, VOLT +from homeassistant.const import ( + CONF_HOST, + CONF_NAME, + CONF_PORT, + ELECTRIC_POTENTIAL_VOLT, + POWER_WATT, +) from homeassistant.helpers import config_validation as cv from homeassistant.util import Throttle @@ -47,7 +53,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None): dev = [] for mtu in gateway.data: dev.append(Ted5000Sensor(gateway, name, mtu, POWER_WATT)) - dev.append(Ted5000Sensor(gateway, name, mtu, VOLT)) + dev.append(Ted5000Sensor(gateway, name, mtu, ELECTRIC_POTENTIAL_VOLT)) add_entities(dev) return True @@ -60,7 +66,7 @@ class Ted5000Sensor(SensorEntity): def __init__(self, gateway, name, mtu, unit): """Initialize the sensor.""" - units = {POWER_WATT: "power", VOLT: "voltage"} + units = {POWER_WATT: "power", ELECTRIC_POTENTIAL_VOLT: "voltage"} self._gateway = gateway self._name = f"{name} mtu{mtu} {units[unit]}" self._mtu = mtu @@ -112,4 +118,7 @@ class Ted5000Gateway: power = int(doc["LiveData"]["Power"]["MTU%d" % mtu]["PowerNow"]) voltage = int(doc["LiveData"]["Voltage"]["MTU%d" % mtu]["VoltageNow"]) - self.data[mtu] = {POWER_WATT: power, VOLT: voltage / 10} + self.data[mtu] = { + POWER_WATT: power, + ELECTRIC_POTENTIAL_VOLT: voltage / 10, + } diff --git a/homeassistant/components/tibber/sensor.py b/homeassistant/components/tibber/sensor.py index 65f2f5e17a1..9ba175db57d 100644 --- a/homeassistant/components/tibber/sensor.py +++ b/homeassistant/components/tibber/sensor.py @@ -22,12 +22,12 @@ from homeassistant.components.sensor import ( SensorEntity, ) from homeassistant.const import ( - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, ENERGY_KILO_WATT_HOUR, PERCENTAGE, POWER_WATT, SIGNAL_STRENGTH_DECIBELS, - VOLT, ) from homeassistant.core import callback from homeassistant.exceptions import PlatformNotReady @@ -126,37 +126,37 @@ RT_SENSOR_MAP: dict[str, TibberSensorMetadata] = { "voltagePhase1": TibberSensorMetadata( "voltage phase1", DEVICE_CLASS_VOLTAGE, - VOLT, + ELECTRIC_POTENTIAL_VOLT, STATE_CLASS_MEASUREMENT, ), "voltagePhase2": TibberSensorMetadata( "voltage phase2", DEVICE_CLASS_VOLTAGE, - VOLT, + ELECTRIC_POTENTIAL_VOLT, STATE_CLASS_MEASUREMENT, ), "voltagePhase3": TibberSensorMetadata( "voltage phase3", DEVICE_CLASS_VOLTAGE, - VOLT, + ELECTRIC_POTENTIAL_VOLT, STATE_CLASS_MEASUREMENT, ), "currentL1": TibberSensorMetadata( "current L1", DEVICE_CLASS_CURRENT, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, STATE_CLASS_MEASUREMENT, ), "currentL2": TibberSensorMetadata( "current L2", DEVICE_CLASS_CURRENT, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, STATE_CLASS_MEASUREMENT, ), "currentL3": TibberSensorMetadata( "current L3", DEVICE_CLASS_CURRENT, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, STATE_CLASS_MEASUREMENT, ), "signalStrength": TibberSensorMetadata( diff --git a/homeassistant/components/wallbox/const.py b/homeassistant/components/wallbox/const.py index 41996107ce0..c8044f6990a 100644 --- a/homeassistant/components/wallbox/const.py +++ b/homeassistant/components/wallbox/const.py @@ -3,7 +3,7 @@ from homeassistant.const import ( CONF_ICON, CONF_NAME, CONF_UNIT_OF_MEASUREMENT, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, ENERGY_KILO_WATT_HOUR, LENGTH_KILOMETERS, PERCENTAGE, @@ -30,7 +30,7 @@ CONF_SENSOR_TYPES = { CONF_ICON: "mdi:ev-station", CONF_NAME: "Max Available Power", CONF_ROUND: 0, - CONF_UNIT_OF_MEASUREMENT: ELECTRICAL_CURRENT_AMPERE, + CONF_UNIT_OF_MEASUREMENT: ELECTRIC_CURRENT_AMPERE, STATE_UNAVAILABLE: False, }, "charging_speed": { diff --git a/homeassistant/components/wirelesstag/__init__.py b/homeassistant/components/wirelesstag/__init__.py index 5da19f54dcf..4e3ace38411 100644 --- a/homeassistant/components/wirelesstag/__init__.py +++ b/homeassistant/components/wirelesstag/__init__.py @@ -11,9 +11,9 @@ from homeassistant.const import ( ATTR_VOLTAGE, CONF_PASSWORD, CONF_USERNAME, + ELECTRIC_POTENTIAL_VOLT, PERCENTAGE, SIGNAL_STRENGTH_DECIBELS_MILLIWATT, - VOLT, ) import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import dispatcher_send @@ -276,7 +276,7 @@ class WirelessTagBaseSensor(Entity): """Return the state attributes.""" return { ATTR_BATTERY_LEVEL: int(self._tag.battery_remaining * 100), - ATTR_VOLTAGE: f"{self._tag.battery_volts:.2f}{VOLT}", + ATTR_VOLTAGE: f"{self._tag.battery_volts:.2f}{ELECTRIC_POTENTIAL_VOLT}", ATTR_TAG_SIGNAL_STRENGTH: f"{self._tag.signal_strength}{SIGNAL_STRENGTH_DECIBELS_MILLIWATT}", ATTR_TAG_OUT_OF_RANGE: not self._tag.is_in_range, ATTR_TAG_POWER_CONSUMPTION: f"{self._tag.power_consumption:.2f}{PERCENTAGE}", diff --git a/homeassistant/const.py b/homeassistant/const.py index 1d754b78b7c..13b94b799db 100644 --- a/homeassistant/const.py +++ b/homeassistant/const.py @@ -401,19 +401,19 @@ ATTR_TEMPERATURE: Final = "temperature" # Power units POWER_WATT: Final = "W" POWER_KILO_WATT: Final = "kW" - -# Voltage units -VOLT: Final = "V" +POWER_VOLT_AMPERE: Final = "VA" # Energy units ENERGY_WATT_HOUR: Final = "Wh" ENERGY_KILO_WATT_HOUR: Final = "kWh" -# Electrical units +# Electric_current units ELECTRIC_CURRENT_MILLIAMPERE: Final = "mA" -ELECTRICAL_CURRENT_AMPERE: Final = "A" -ELECTRICAL_VOLT_AMPERE: Final = "VA" +ELECTRIC_CURRENT_AMPERE: Final = "A" + +# Electric_potential units ELECTRIC_POTENTIAL_MILLIVOLT: Final = "mV" +ELECTRIC_POTENTIAL_VOLT: Final = "V" # Degree units DEGREE: Final = "°" diff --git a/tests/components/onewire/const.py b/tests/components/onewire/const.py index 1eb2b4b390a..5c12571fc1e 100644 --- a/tests/components/onewire/const.py +++ b/tests/components/onewire/const.py @@ -14,14 +14,14 @@ from homeassistant.const import ( DEVICE_CLASS_PRESSURE, DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_VOLTAGE, - ELECTRICAL_CURRENT_AMPERE, + ELECTRIC_CURRENT_AMPERE, + ELECTRIC_POTENTIAL_VOLT, LIGHT_LUX, PERCENTAGE, PRESSURE_MBAR, STATE_OFF, STATE_ON, TEMP_CELSIUS, - VOLT, ) MOCK_OWPROXY_DEVICES = { @@ -347,7 +347,7 @@ MOCK_OWPROXY_DEVICES = { "unique_id": "/26.111111111111/VAD", "injected_value": b" 2.97", "result": "3.0", - "unit": VOLT, + "unit": ELECTRIC_POTENTIAL_VOLT, "class": DEVICE_CLASS_VOLTAGE, "disabled": True, }, @@ -356,7 +356,7 @@ MOCK_OWPROXY_DEVICES = { "unique_id": "/26.111111111111/VDD", "injected_value": b" 4.74", "result": "4.7", - "unit": VOLT, + "unit": ELECTRIC_POTENTIAL_VOLT, "class": DEVICE_CLASS_VOLTAGE, "disabled": True, }, @@ -365,7 +365,7 @@ MOCK_OWPROXY_DEVICES = { "unique_id": "/26.111111111111/IAD", "injected_value": b" 1", "result": "1.0", - "unit": ELECTRICAL_CURRENT_AMPERE, + "unit": ELECTRIC_CURRENT_AMPERE, "class": DEVICE_CLASS_CURRENT, "disabled": True, },