From c2413945c76ec1b159a7fb99a843369168be470d Mon Sep 17 00:00:00 2001 From: sdb9696 Date: Tue, 27 Feb 2024 10:20:28 +0000 Subject: [PATCH 1/3] Fix energy module calling get_current_power --- kasa/smart/modules/energymodule.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kasa/smart/modules/energymodule.py b/kasa/smart/modules/energymodule.py index 5782a23fd..9ba3a1ae3 100644 --- a/kasa/smart/modules/energymodule.py +++ b/kasa/smart/modules/energymodule.py @@ -45,9 +45,6 @@ def query(self) -> Dict: """Query to execute during the update cycle.""" return { "get_energy_usage": None, - # The current_power in get_energy_usage is more precise (mw vs. w), - # making this rather useless, but maybe there are version differences? - "get_current_power": None, } @property @@ -58,7 +55,7 @@ def current_power(self): @property def energy(self): """Return get_energy_usage results.""" - return self.data["get_energy_usage"] + return self.data @property def emeter_realtime(self): From 706866921a13dc6881b4900746fb64bdc6446459 Mon Sep 17 00:00:00 2001 From: sdb9696 Date: Wed, 28 Feb 2024 16:39:00 +0000 Subject: [PATCH 2/3] Put get_current_power behind a version check --- kasa/smart/modules/energymodule.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kasa/smart/modules/energymodule.py b/kasa/smart/modules/energymodule.py index 9ba3a1ae3..207b1570b 100644 --- a/kasa/smart/modules/energymodule.py +++ b/kasa/smart/modules/energymodule.py @@ -43,9 +43,12 @@ def __init__(self, device: "SmartDevice", module: str): def query(self) -> Dict: """Query to execute during the update cycle.""" - return { + ret_val = { "get_energy_usage": None, } + if self.supported_version > 1: + ret_val["get_current_power"] = None + return ret_val @property def current_power(self): @@ -55,6 +58,8 @@ def current_power(self): @property def energy(self): """Return get_energy_usage results.""" + if en := self.data.get("get_energy_usage"): + return en return self.data @property From de3c3b6548374e4a77dae7c74686bb2793c2f090 Mon Sep 17 00:00:00 2001 From: sdb9696 Date: Wed, 28 Feb 2024 17:22:31 +0000 Subject: [PATCH 3/3] Rename ret_val --- kasa/smart/modules/energymodule.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kasa/smart/modules/energymodule.py b/kasa/smart/modules/energymodule.py index 207b1570b..0479de297 100644 --- a/kasa/smart/modules/energymodule.py +++ b/kasa/smart/modules/energymodule.py @@ -43,12 +43,12 @@ def __init__(self, device: "SmartDevice", module: str): def query(self) -> Dict: """Query to execute during the update cycle.""" - ret_val = { + req = { "get_energy_usage": None, } if self.supported_version > 1: - ret_val["get_current_power"] = None - return ret_val + req["get_current_power"] = None + return req @property def current_power(self):