Merge pull request #467 from zabuldon/dev

AUTHORS.md

@@ -23,3 +23,4 @@
 -   craigrouse [Github](https://github.com/craigrouse)
 -   thierryVT [Github](https://github.com/thierryvt)
 -   llamafilm [Github](https://github.com/llamafilm)
+-   ericdegroot [Github](https://github.com/ericdegroot)

teslajsonpy/energy.py

@@ -149,7 +149,7 @@ def data_available(self) -> bool:
     @property
     def energy_left(self) -> float:
         """Return battery energy left in Watt hours."""
-        return self._site_summary.get("energy_left")
+        return round (self._site_config.get("nameplate_energy") * self.percentage_charged / 100 )
 
     @property
     def grid_power(self) -> float:
@@ -159,7 +159,7 @@ def grid_power(self) -> float:
     @property
     def grid_status(self) -> str:
         """Return grid status."""
-        return self._site_summary.get("grid_status")
+        return self._site_data.get("grid_status")
 
     @property
     def load_power(self) -> float:

tests/unit_tests/test_energy.py

@@ -92,6 +92,10 @@ async def test_powerwall_site(monkeypatch):
         _solar_powerwall_site.grid_power
         == SITE_DATA["grid_power"]
     )
+    assert (
+        _solar_powerwall_site.grid_status
+        == SITE_DATA["grid_status"]
+    )
     assert (
         _solar_powerwall_site.load_power
         == SITE_DATA["load_power"]