Skip to content

Fallback to get_current_power if get_energy_usage does not provide current_power #1186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdb9696 merged 2 commits into from
Oct 25, 2024
Merged

Fallback to get_current_power if get_energy_usage does not provide current_power #1186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dcc9e8
Fix reading current consumption for P304M
Fulch36 Oct 25, 2024
b6a32a2
Merge branch 'master' into feat/add_p304m_support
sdb9696 Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions kasa/smart/modules/energy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ def current_consumption(self) -> float | None:
"""Current power in watts."""
if (power := self.energy.get("current_power")) is not None:
return power / 1_000
# Fallback if get_energy_usage does not provide current_power,
# which can happen on some newer devices (e.g. P304M).
elif (
power := self.data.get("get_current_power").get("current_power")
) is not None:
return power
return None

@property
Expand Down Expand Up @@ -105,3 +111,8 @@ async def get_daily_stats(self, *, year=None, month=None, kwh=True) -> dict:
async def get_monthly_stats(self, *, year=None, kwh=True) -> dict:
"""Return monthly stats for the given year."""
raise KasaException("Device does not support periodic statistics")

async def _check_supported(self):
"""Additional check to see if the module is supported by the device."""
# Energy module is not supported on P304M parent device
return "device_on" in self._device.sys_info