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

Kasa KP125M basic emeter support by sbytnar · Pull Request #560 · python-kasa/python-kasa · GitHub

  1. python-kasa
  2. python-kasa

Repository navigation

Kasa KP125M basic emeter support #560

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
rytilahti merged 4 commits into from
Dec 3, 2023
Conversation 10 Commits 4 Checks 0 Files changed
Merged

Kasa KP125M basic emeter support #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c61b9a9
Add KP125M basic emeter support.
sbytnar Dec 1, 2023
13732cd
Reduce diff.
sbytnar Dec 1, 2023
5e6f062
Merge remote-tracking branch 'origin/master' into KP125M-support
sbytnar Dec 2, 2023
38ab4d3
PR Comments
sbytnar Dec 3, 2023
File filter

Filter by extension

Filter by extension .md  (1) .py  (1) All 2 file types 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
1 change: 1 addition & 0 deletions README.md
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 @@ -137,6 +137,7 @@ If your device is unlisted but working, please open a pull request to update the
* KP105
* KP115
* KP125
* KP125M
* KP401
* EP10

Expand Down
29 changes: 25 additions & 4 deletions kasa/tapo/tapoplug.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 @@ -5,7 +5,8 @@

from ..credentials import Credentials
from ..emeterstatus import EmeterStatus
from ..smartdevice import DeviceType
from ..modules import Emeter
from ..smartdevice import DeviceType, requires_update
from .tapodevice import TapoDevice

Comment thread
sbytnar marked this conversation as resolved.
_LOGGER = logging.getLogger(__name__)
Expand All @@ -24,6 +25,15 @@ def __init__(
) -> None:
super().__init__(host, port=port, credentials=credentials, timeout=timeout)
self._device_type = DeviceType.Plug
self.modules: Dict[str, Any] = {}
self.emeter_type = "emeter"
self.modules["emeter"] = Emeter(self, self.emeter_type)

rytilahti Dec 1, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I think we need to rethink the whole modules system for "tapo" devices separately from the legacy protocol, but I suppose this is fine for now.

@property # type: ignore
@requires_update
def has_emeter(self) -> bool:
"""Return that the plug has an emeter."""
return True

async def update(self, update_children: bool = True):
"""Call the device endpoint and update the device data."""
Expand Down Expand Up @@ -52,17 +62,24 @@ def state_information(self) -> Dict[str, Any]:
@property
def emeter_realtime(self) -> EmeterStatus:
"""Get the emeter status."""
return EmeterStatus({"power_mw": self._energy.get("current_power")})
return EmeterStatus(
{
"power_mw": self._energy.get("current_power"),
"total": self._convert_energy_data(
self._energy.get("today_energy"), 1 / 1000
),
}
)

@property
def emeter_today(self) -> Optional[float]:
"""Get the emeter value for today."""
return None
return self._convert_energy_data(self._energy.get("today_energy"), 1 / 1000)

@property
def emeter_this_month(self) -> Optional[float]:
"""Get the emeter value for this month."""
return None
return self._convert_energy_data(self._energy.get("month_energy"), 1 / 1000)

@property
def on_since(self) -> Optional[datetime]:
Expand All @@ -71,3 +88,7 @@ def on_since(self) -> Optional[datetime]:
return None
on_time = cast(float, self._info.get("on_time"))
return datetime.now().replace(microsecond=0) - timedelta(seconds=on_time)

def _convert_energy_data(self, data, scale) -> Optional[float]:
"""Return adjusted emeter information."""
return data if not data else data * scale
Back | FazBrowse Home | New Git URL