From 7b63c1710151b53c88e5e807ecb6c41854295ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Schl=C3=B6tterer?=
 <80917404+lschloetterer@users.noreply.github.com>
Date: Mon, 13 Jan 2025 13:00:35 +0100
Subject: [PATCH] Add kV and MV unit conversion for voltages (#135396)

---
 homeassistant/components/number/const.py |  2 +-
 homeassistant/components/sensor/const.py |  2 +-
 homeassistant/const.py                   |  2 ++
 homeassistant/util/unit_conversion.py    |  4 ++++
 tests/util/test_unit_conversion.py       | 14 ++++++++++++++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/number/const.py b/homeassistant/components/number/const.py
index 91a9d6adfe4..1a9c6c91ca7 100644
--- a/homeassistant/components/number/const.py
+++ b/homeassistant/components/number/const.py
@@ -363,7 +363,7 @@ class NumberDeviceClass(StrEnum):
     VOLTAGE = "voltage"
     """Voltage.
 
-    Unit of measurement: `V`, `mV`, `µV`
+    Unit of measurement: `V`, `mV`, `µV`, `kV`, `MV`
     """
 
     VOLUME = "volume"
diff --git a/homeassistant/components/sensor/const.py b/homeassistant/components/sensor/const.py
index 8c3c3925513..aaa14f4637c 100644
--- a/homeassistant/components/sensor/const.py
+++ b/homeassistant/components/sensor/const.py
@@ -392,7 +392,7 @@ class SensorDeviceClass(StrEnum):
     VOLTAGE = "voltage"
     """Voltage.
 
-    Unit of measurement: `V`, `mV`, `µV`
+    Unit of measurement: `V`, `mV`, `µV`, `kV`, `MV`
     """
 
     VOLUME = "volume"
diff --git a/homeassistant/const.py b/homeassistant/const.py
index 4c4d2fa90c2..efc01047caf 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -647,6 +647,8 @@ class UnitOfElectricPotential(StrEnum):
     MICROVOLT = "µV"
     MILLIVOLT = "mV"
     VOLT = "V"
+    KILOVOLT = "kV"
+    MEGAVOLT = "MV"
 
 
 # Degree units
diff --git a/homeassistant/util/unit_conversion.py b/homeassistant/util/unit_conversion.py
index 8ea290f01d1..ad320cdb9ae 100644
--- a/homeassistant/util/unit_conversion.py
+++ b/homeassistant/util/unit_conversion.py
@@ -249,11 +249,15 @@ class ElectricPotentialConverter(BaseUnitConverter):
         UnitOfElectricPotential.VOLT: 1,
         UnitOfElectricPotential.MILLIVOLT: 1e3,
         UnitOfElectricPotential.MICROVOLT: 1e6,
+        UnitOfElectricPotential.KILOVOLT: 1 / 1e3,
+        UnitOfElectricPotential.MEGAVOLT: 1 / 1e6,
     }
     VALID_UNITS = {
         UnitOfElectricPotential.VOLT,
         UnitOfElectricPotential.MILLIVOLT,
         UnitOfElectricPotential.MICROVOLT,
+        UnitOfElectricPotential.KILOVOLT,
+        UnitOfElectricPotential.MEGAVOLT,
     }
 
 
diff --git a/tests/util/test_unit_conversion.py b/tests/util/test_unit_conversion.py
index 9c123d93f62..1336364f4cb 100644
--- a/tests/util/test_unit_conversion.py
+++ b/tests/util/test_unit_conversion.py
@@ -435,10 +435,24 @@ _CONVERTED_VALUE: dict[
     ElectricPotentialConverter: [
         (5, UnitOfElectricPotential.VOLT, 5000, UnitOfElectricPotential.MILLIVOLT),
         (5, UnitOfElectricPotential.VOLT, 5e6, UnitOfElectricPotential.MICROVOLT),
+        (5, UnitOfElectricPotential.VOLT, 5e-3, UnitOfElectricPotential.KILOVOLT),
+        (5, UnitOfElectricPotential.VOLT, 5e-6, UnitOfElectricPotential.MEGAVOLT),
         (5, UnitOfElectricPotential.MILLIVOLT, 0.005, UnitOfElectricPotential.VOLT),
         (5, UnitOfElectricPotential.MILLIVOLT, 5e3, UnitOfElectricPotential.MICROVOLT),
+        (5, UnitOfElectricPotential.MILLIVOLT, 5e-6, UnitOfElectricPotential.KILOVOLT),
+        (5, UnitOfElectricPotential.MILLIVOLT, 5e-9, UnitOfElectricPotential.MEGAVOLT),
         (5, UnitOfElectricPotential.MICROVOLT, 5e-3, UnitOfElectricPotential.MILLIVOLT),
         (5, UnitOfElectricPotential.MICROVOLT, 5e-6, UnitOfElectricPotential.VOLT),
+        (5, UnitOfElectricPotential.MICROVOLT, 5e-9, UnitOfElectricPotential.KILOVOLT),
+        (5, UnitOfElectricPotential.MICROVOLT, 5e-12, UnitOfElectricPotential.MEGAVOLT),
+        (5, UnitOfElectricPotential.KILOVOLT, 5e9, UnitOfElectricPotential.MICROVOLT),
+        (5, UnitOfElectricPotential.KILOVOLT, 5e6, UnitOfElectricPotential.MILLIVOLT),
+        (5, UnitOfElectricPotential.KILOVOLT, 5e3, UnitOfElectricPotential.VOLT),
+        (5, UnitOfElectricPotential.KILOVOLT, 5e-3, UnitOfElectricPotential.MEGAVOLT),
+        (5, UnitOfElectricPotential.MEGAVOLT, 5e12, UnitOfElectricPotential.MICROVOLT),
+        (5, UnitOfElectricPotential.MEGAVOLT, 5e9, UnitOfElectricPotential.MILLIVOLT),
+        (5, UnitOfElectricPotential.MEGAVOLT, 5e6, UnitOfElectricPotential.VOLT),
+        (5, UnitOfElectricPotential.MEGAVOLT, 5e3, UnitOfElectricPotential.KILOVOLT),
     ],
     EnergyConverter: [
         (10, UnitOfEnergy.MILLIWATT_HOUR, 0.00001, UnitOfEnergy.KILO_WATT_HOUR),