8000 Add voltage and current monitoring to smart Devices (#1281) · python-kasa/python-kasa@dab64e5 · GitHub
[go: up one dir, main page]
Skip to content

Commit dab64e5

Browse files
ryenitcherryenitcher
authored
Add voltage and current monitoring to smart Devices (#1281)
1 parent 59b047f commit dab64e5

File tree

3 files changed

+36
-5
lines changed

3 files changed

+36
-5
lines changed

‎kasa/smart/modules/energy.py

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,30 @@ class Energy(SmartModule, EnergyInterface):
1515

1616
REQUIRED_COMPONENT = "energy_monitoring"
1717

18+
async def _post_update_hook(self) -> None:
19+
if "voltage_mv" in self.data.get("get_emeter_data", {}):
20+
self._supported = (
21+
self._supported | EnergyInterface.ModuleFeature.VOLTAGE_CURRENT
22+
)
23+
1824
def query(self) -> dict:
1925
"""Query to execute during the update cycle."""
2026
req = {
2127
"get_energy_usage": None,
2228
}
2329
if self.supported_version > 1:
2430
req["get_current_power"] = None
31+
req["get_emeter_data"] = None
32+
req["get_emeter_vgain_igain"] = None
2533
return req
2634

2735
@property
2836
@raise_if_update_error
2937
def current_consumption(self) -> float | None:
3038
"""Current power in watts."""
31-
if (power := self.energy.get("current_power")) is not None:
39+
if (power := self.energy.get("current_power")) is not None or (
40+
power := self.data.get("get_emeter_data", {}).get("power_mw")
41+
) is not None:
3242
return power / 1_000
3343
# Fallback if get_energy_usage does not provide current_power,
3444
# which can happen on some newer devices (e.g. P304M).
@@ -58,7 +68,10 @@ def _get_status_from_energy(self, energy: dict) -> EmeterStatus:
5868
@raise_if_update_error
5969
def status(self) -> EmeterStatus:
6070
"""Get the emeter status."""
61-
return self._get_status_from_energy(self.energy)
71+
if "get_emeter_data" in self.data:
72+
return EmeterStatus(self.data["get_emeter_data"])
73+
else:
74+
return self._get_status_from_energy(self.energy)
6275

6376
async def get_status(self) -> EmeterStatus:
6477
"""Return real-time statistics."""
@@ -87,13 +100,15 @@ def consumption_total(self) -> float | None:
87100
@raise_if_update_error
88101
def current(self) -> float | None:
89102
"""Return the current in A."""
90-
return None
103+
ma = self.data.get("get_emeter_data", {}).get("current_ma")
104+
return ma / 1000 if ma else None
91105

92106
@property
93107
@raise_if_update_error
94108
def voltage(self) -> float | None:
95109
"""Get the current voltage in V."""
96-
return None
110+
mv = self.data.get("get_emeter_data", {}).get("voltage_mv")
111+
return mv / 1000 if mv else None
97112

98113
async def _deprecated_get_realtime(self) -> EmeterStatus:
99114
"""Retrieve current energy readings."""

‎tests/fakeprotocol_smart.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,19 @@ def credentials_hash(self):
138138
),
139139
"get_device_usage": ("device", {}),
140140
"get_connect_cloud_state": ("cloud_connect", {"status": 0}),
141+
"get_emeter_data": (
142+
"energy_monitoring",
143+
{
144+
"current_ma": 33,
145+
"energy_wh": 971,
146+
"power_mw": 1003,
147+
"voltage_mv": 121215,
148+
},
149+
),
150+
"get_emeter_vgain_igain": (
151+
"energy_monitoring",
152+
{"igain": 10861, "vgain": 118657},
153+
),
141154
}
142155

143156
async def send(self, request: str):

‎tests/test_emeter.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,5 +211,8 @@ async def test_supported(dev: Device):
211211
assert energy_module.supports(Energy.ModuleFeature.PERIODIC_STATS) is True
212212
else:
213213
assert energy_module.supports(Energy.ModuleFeature.CONSUMPTION_TOTAL) is False
214-
assert energy_module.supports(Energy.ModuleFeature.VOLTAGE_CURRENT) is False
215214
assert energy_module.supports(Energy.ModuleFeature.PERIODIC_STATS) is False
215+
if energy_module.supported_version < 2:
216+
assert energy_module.supports(Energy.ModuleFeature.VOLTAGE_CURRENT) is False
217+
else:
218+
assert energy_module.supports(Energy.ModuleFeature.VOLTAGE_CURRENT) is True

0 commit comments

Comments
 (0)
0