From c079803fcbb402825a0bafec385663eda908c3b5 Mon Sep 17 00:00:00 2001
From: Barry Quiel <barry.quiel@gmail.com>
Date: Thu, 13 May 2021 09:12:48 -0700
Subject: [PATCH] Powerwall add Current attribute (#50550)

---
 homeassistant/components/powerwall/__init__.py    | 2 +-
 homeassistant/components/powerwall/config_flow.py | 2 +-
 homeassistant/components/powerwall/const.py       | 1 +
 homeassistant/components/powerwall/manifest.json  | 2 +-
 homeassistant/components/powerwall/sensor.py      | 4 +++-
 requirements_all.txt                              | 2 +-
 requirements_test_all.txt                         | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/powerwall/__init__.py b/homeassistant/components/powerwall/__init__.py
index 1792ca19fc818c..0f63bf97986585 100644
--- a/homeassistant/components/powerwall/__init__.py
+++ b/homeassistant/components/powerwall/__init__.py
@@ -176,7 +176,7 @@ async def _async_update_powerwall_data(
 def _login_and_fetch_base_info(power_wall: Powerwall, password: str):
     """Login to the powerwall and fetch the base info."""
     if password is not None:
-        power_wall.login("", password)
+        power_wall.login(password)
     power_wall.detect_and_pin_version()
     return call_base_info(power_wall)
 
diff --git a/homeassistant/components/powerwall/config_flow.py b/homeassistant/components/powerwall/config_flow.py
index bd4e49f45d3fed..420212a86ba509 100644
--- a/homeassistant/components/powerwall/config_flow.py
+++ b/homeassistant/components/powerwall/config_flow.py
@@ -21,7 +21,7 @@
 def _login_and_fetch_site_info(power_wall: Powerwall, password: str):
     """Login to the powerwall and fetch the base info."""
     if password is not None:
-        power_wall.login("", password)
+        power_wall.login(password)
     power_wall.detect_and_pin_version()
     return power_wall.get_site_info()
 
diff --git a/homeassistant/components/powerwall/const.py b/homeassistant/components/powerwall/const.py
index 6dd4558a98ccbb..f338d5f981d371 100644
--- a/homeassistant/components/powerwall/const.py
+++ b/homeassistant/components/powerwall/const.py
@@ -12,6 +12,7 @@
 ATTR_ENERGY_EXPORTED = "energy_exported_(in_kW)"
 ATTR_ENERGY_IMPORTED = "energy_imported_(in_kW)"
 ATTR_INSTANT_AVERAGE_VOLTAGE = "instant_average_voltage"
+ATTR_INSTANT_TOTAL_CURRENT = "instant_total_current"
 ATTR_IS_ACTIVE = "is_active"
 
 STATUS_VERSION = "version"
diff --git a/homeassistant/components/powerwall/manifest.json b/homeassistant/components/powerwall/manifest.json
index d9f821df905554..5cee6c1fd19cb0 100644
--- a/homeassistant/components/powerwall/manifest.json
+++ b/homeassistant/components/powerwall/manifest.json
@@ -3,7 +3,7 @@
   "name": "Tesla Powerwall",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/powerwall",
-  "requirements": ["tesla-powerwall==0.3.5"],
+  "requirements": ["tesla-powerwall==0.3.10"],
   "codeowners": ["@bdraco", "@jrester"],
   "dhcp": [
     {
diff --git a/homeassistant/components/powerwall/sensor.py b/homeassistant/components/powerwall/sensor.py
index 36f803e66d7a27..982952a4830d4e 100644
--- a/homeassistant/components/powerwall/sensor.py
+++ b/homeassistant/components/powerwall/sensor.py
@@ -11,6 +11,7 @@
     ATTR_ENERGY_IMPORTED,
     ATTR_FREQUENCY,
     ATTR_INSTANT_AVERAGE_VOLTAGE,
+    ATTR_INSTANT_TOTAL_CURRENT,
     ATTR_IS_ACTIVE,
     DOMAIN,
     ENERGY_KILO_WATT,
@@ -144,6 +145,7 @@ def extra_state_attributes(self):
             ATTR_FREQUENCY: round(meter.frequency, 1),
             ATTR_ENERGY_EXPORTED: meter.get_energy_exported(),
             ATTR_ENERGY_IMPORTED: meter.get_energy_imported(),
-            ATTR_INSTANT_AVERAGE_VOLTAGE: round(meter.avarage_voltage, 1),
+            ATTR_INSTANT_AVERAGE_VOLTAGE: round(meter.average_voltage, 1),
+            ATTR_INSTANT_TOTAL_CURRENT: meter.get_instant_total_current(),
             ATTR_IS_ACTIVE: meter.is_active(),
         }
diff --git a/requirements_all.txt b/requirements_all.txt
index 43e2cd5e846372..4b83ee4e645c31 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2220,7 +2220,7 @@ temperusb==1.5.3
 # tensorflow==2.3.0
 
 # homeassistant.components.powerwall
-tesla-powerwall==0.3.5
+tesla-powerwall==0.3.10
 
 # homeassistant.components.tesla
 teslajsonpy==0.18.3
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 3db0b015696701..9228f6cbf7b0f2 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1189,7 +1189,7 @@ systembridge==1.1.5
 tellduslive==0.10.11
 
 # homeassistant.components.powerwall
-tesla-powerwall==0.3.5
+tesla-powerwall==0.3.10
 
 # homeassistant.components.tesla
 teslajsonpy==0.18.3