Add voltage and current monitoring to smart Devices (#1281)

This commit is contained in:
Ryan Nitcher 2024-11-20 11:18:30 -07:00 committed by GitHub
parent 59b047f485
commit dab64e5d48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 36 additions and 5 deletions

View File

@ -15,6 +15,12 @@ class Energy(SmartModule, EnergyInterface):
REQUIRED_COMPONENT = "energy_monitoring" REQUIRED_COMPONENT = "energy_monitoring"
async def _post_update_hook(self) -> None:
if "voltage_mv" in self.data.get("get_emeter_data", {}):
self._supported = (
self._supported | EnergyInterface.ModuleFeature.VOLTAGE_CURRENT
)
def query(self) -> dict: def query(self) -> dict:
"""Query to execute during the update cycle.""" """Query to execute during the update cycle."""
req = { req = {
@ -22,13 +28,17 @@ class Energy(SmartModule, EnergyInterface):
} }
if self.supported_version > 1: if self.supported_version > 1:
req["get_current_power"] = None req["get_current_power"] = None
req["get_emeter_data"] = None
req["get_emeter_vgain_igain"] = None
return req return req
@property @property
@raise_if_update_error @raise_if_update_error
def current_consumption(self) -> float | None: def current_consumption(self) -> float | None:
"""Current power in watts.""" """Current power in watts."""
if (power := self.energy.get("current_power")) is not None: if (power := self.energy.get("current_power")) is not None or (
power := self.data.get("get_emeter_data", {}).get("power_mw")
) is not None:
return power / 1_000 return power / 1_000
# Fallback if get_energy_usage does not provide current_power, # Fallback if get_energy_usage does not provide current_power,
# which can happen on some newer devices (e.g. P304M). # which can happen on some newer devices (e.g. P304M).
@ -58,6 +68,9 @@ class Energy(SmartModule, EnergyInterface):
@raise_if_update_error @raise_if_update_error
def status(self) -> EmeterStatus: def status(self) -> EmeterStatus:
"""Get the emeter status.""" """Get the emeter status."""
if "get_emeter_data" in self.data:
return EmeterStatus(self.data["get_emeter_data"])
else:
return self._get_status_from_energy(self.energy) return self._get_status_from_energy(self.energy)
async def get_status(self) -> EmeterStatus: async def get_status(self) -> EmeterStatus:
@ -87,13 +100,15 @@ class Energy(SmartModule, EnergyInterface):
@raise_if_update_error @raise_if_update_error
def current(self) -> float | None: def current(self) -> float | None:
"""Return the current in A.""" """Return the current in A."""
return None ma = self.data.get("get_emeter_data", {}).get("current_ma")
return ma / 1000 if ma else None
@property @property
@raise_if_update_error @raise_if_update_error
def voltage(self) -> float | None: def voltage(self) -> float | None:
"""Get the current voltage in V.""" """Get the current voltage in V."""
return None mv = self.data.get("get_emeter_data", {}).get("voltage_mv")
return mv / 1000 if mv else None
async def _deprecated_get_realtime(self) -> EmeterStatus: async def _deprecated_get_realtime(self) -> EmeterStatus:
"""Retrieve current energy readings.""" """Retrieve current energy readings."""

View File

@ -138,6 +138,19 @@ class FakeSmartTransport(BaseTransport):
), ),
"get_device_usage": ("device", {}), "get_device_usage": ("device", {}),
"get_connect_cloud_state": ("cloud_connect", {"status": 0}), "get_connect_cloud_state": ("cloud_connect", {"status": 0}),
"get_emeter_data": (
"energy_monitoring",
{
"current_ma": 33,
"energy_wh": 971,
"power_mw": 1003,
"voltage_mv": 121215,
},
),
"get_emeter_vgain_igain": (
"energy_monitoring",
{"igain": 10861, "vgain": 118657},
),
} }
async def send(self, request: str): async def send(self, request: str):

View File

@ -211,5 +211,8 @@ async def test_supported(dev: Device):
assert energy_module.supports(Energy.ModuleFeature.PERIODIC_STATS) is True assert energy_module.supports(Energy.ModuleFeature.PERIODIC_STATS) is True
else: else:
assert energy_module.supports(Energy.ModuleFeature.CONSUMPTION_TOTAL) is False assert energy_module.supports(Energy.ModuleFeature.CONSUMPTION_TOTAL) is False
assert energy_module.supports(Energy.ModuleFeature.VOLTAGE_CURRENT) is False
assert energy_module.supports(Energy.ModuleFeature.PERIODIC_STATS) is False assert energy_module.supports(Energy.ModuleFeature.PERIODIC_STATS) is False
if energy_module.supported_version < 2:
assert energy_module.supports(Energy.ModuleFeature.VOLTAGE_CURRENT) is False
else:
assert energy_module.supports(Energy.ModuleFeature.VOLTAGE_CURRENT) is True