FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix energy module calling get_current_power by sdb9696 · Pull Request #798 · python-kasa/python-kasa · GitHub

  1. python-kasa
  2. python-kasa

Repository navigation

Fix energy module calling get_current_power #798

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 4 commits into from
Feb 28, 2024
Conversation 4 Commits 4 Checks 0 Files changed
Merged

Fix energy module calling get_current_power #798

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c241394
Fix energy module calling get_current_power
sdb9696 Feb 27, 2024
74a950f
Merge remote-tracking branch 'upstream/master' into fix_current_power
sdb9696 Feb 28, 2024
7068669
Put get_current_power behind a version check
sdb9696 Feb 28, 2024
de3c3b6
Rename ret_val
sdb9696 Feb 28, 2024
File filter

Filter by extension

Filter by extension .py  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
12 changes: 7 additions & 5 deletions kasa/smart/modules/energymodule.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ def __init__(self, device: "SmartDevice", module: str):

def query(self) -> Dict:
"""Query to execute during the update cycle."""
return {
req = {
"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,
Comment thread
rytilahti marked this conversation as resolved.
}
if self.supported_version > 1:
req["get_current_power"] = None
return req

@property
def current_power(self):
Expand All @@ -58,7 +58,9 @@ def current_power(self):
@property
def energy(self):
"""Return get_energy_usage results."""
return self.data["get_energy_usage"]
if en := self.data.get("get_energy_usage"):
return en
return self.data

@property
def emeter_realtime(self):
Expand Down
Back | FazBrowse Home | New Git URL