Skip to content

Commit

Permalink
Added device energy properties
Browse files Browse the repository at this point in the history
  • Loading branch information
CJNE committed Sep 7, 2021
1 parent 518511d commit 15a579b
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 5 deletions.
10 changes: 6 additions & 4 deletions pymyenergi/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
from pymyenergi.exceptions import WrongCredentials
from pymyenergi.zappi import CHARGE_MODES

from . import HARVI

logging.basicConfig()
logging.root.setLevel(logging.WARNING)

Expand Down Expand Up @@ -46,11 +48,11 @@ async def main(args):
out = out + f"Energy diverted : {client.energy_diverted/1000:.2f}kWh\n"
out = out + "Devices:\n"
for device in devices:
out = out + f" {device.kind.capitalize()}: {device.name}\n"
out = out + f" {device.kind.capitalize()}: {device.name}"
if device.kind != HARVI:
out = out + f"\t{device.energy_total}Wh today"
out = out + "\n"
print(out)
await client.refresh_history_today()
energy = client.get_energy_totals()
print(energy)
elif args.command in ["zappi", "eddi", "harvi"]:
device = device_factory(conn, args.command, args.serial)
await device.refresh()
Expand Down
10 changes: 10 additions & 0 deletions pymyenergi/eddi.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ def power_generated(self):
"""Generated power in W"""
return self._data.get("gen", 0)

@property
def energy_total(self):
"""Device total energy from history data"""
return self.history_data.get("device_total", 0)

@property
def energy_diverted(self):
"""Device diverted energy from history data"""
return self.history_data.get("device_diverted", 0)

async def stop(self):
"""Stop diverting"""
await self._connection.get(f"/cgi-eddi-mode-E{self._serialno}-0-0-0-0000")
Expand Down
10 changes: 10 additions & 0 deletions pymyenergi/zappi.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,16 @@ def smart_boost_amount(self):
"""Smart boost amount of energy to add"""
return self._data.get("sbk", -1)

@property
def energy_total(self):
"""Device total energy from history data"""
return self.history_data.get("device_total", 0)

@property
def energy_diverted(self):
"""Device diverted energy from history data"""
return self.history_data.get("device_diverted", 0)

# @property
# def boost_start_hour(self):
# """Boost starting at hour ??"""
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

setup(
name="pymyenergi",
version="0.0.10",
version="0.0.11",
author="Johan Isaksson",
author_email="[email protected]",
description="Python library and CLI for communicating with myenergi API.",
Expand Down

0 comments on commit 15a579b

Please sign in to comment.