Add Eco Charge and Eco Discharge operation modes

mletenay · Jan 10, 2022 · 44e647a · 44e647a
1 parent 16795c2
commit 44e647a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/custom_components/goodwe/button.py b/custom_components/goodwe/button.py
@@ -29,7 +29,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     # read current time from the inverter
     try:
         await inverter.read_setting("time")
-    except Exception:
+    except (InverterError, ValueError):
         # Inverter model does not support clock synchronization
         _LOGGER.debug("Could not read inverter current clock time")
     else:

diff --git a/custom_components/goodwe/manifest.json b/custom_components/goodwe/manifest.json
@@ -8,7 +8,7 @@
     "@starkillerOG",
     "@fizcris"
   ],
-  "requirements": ["goodwe==0.2.13"],
+  "requirements": ["goodwe==0.2.14"],
   "config_flow": true,
   "iot_class": "local_polling",
   "version": "1.0.0"

diff --git a/custom_components/goodwe/number.py b/custom_components/goodwe/number.py
@@ -50,6 +50,15 @@ class GoodweNumberEntityDescription(
         getter=lambda inv: inv.get_ongrid_battery_dod(),
         setter=lambda inv, val: inv.set_ongrid_battery_dod(val),
     ),
+    GoodweNumberEntityDescription(
+        key="eco_mode_power",
+        name="Eco mode power",
+        icon="mdi:battery-charging-low",
+        entity_category=ENTITY_CATEGORY_CONFIG,
+        unit_of_measurement=PERCENTAGE,
+        getter=lambda inv: inv.get_operation_mode(),
+        setter=None,
+    ),
 )
 
 
@@ -63,7 +72,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     for description in NUMBERS:
         try:
             current_value = await description.getter(inverter)
-        except Exception:
+        except (InverterError, ValueError):
             # Inverter model does not support this setting
             _LOGGER.debug("Could not read inverter setting %s", description.key)
             continue
@@ -77,6 +86,10 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
             entity._attr_max_value = 99
             entity._attr_min_value = 0
             entity._attr_step = 1
+        if description.key == "eco_mode_power":
+            entity._attr_max_value = 100
+            entity._attr_min_value = 0
+            entity._attr_step = 1
 
         entities.append(entity)
 

diff --git a/custom_components/goodwe/select.py b/custom_components/goodwe/select.py
@@ -17,6 +17,8 @@
     "Off grid mode",
     "Backup mode",
     "Eco mode",
+    "Eco charge mode",
+    "Eco discharge mode",
 ]
 
 OPERATION_MODE = SelectEntityDescription(
@@ -35,7 +37,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     # read current operating mode from the inverter
     try:
         active_mode = await inverter.get_operation_mode()
-    except Exception:
+    except (InverterError, ValueError):
         # Inverter model does not support this setting
         _LOGGER.debug("Could not read inverter operation mode")
     else:
@@ -74,6 +76,10 @@ def __init__(
 
     async def async_select_option(self, option: str) -> None:
         """Change the selected option."""
-        await self._inverter.set_operation_mode(INVERTER_OPERATION_MODES.index(option))
+        operation_mode = INVERTER_OPERATION_MODES.index(option)
+        eco_mode_power = 100
+        if operation_mode in (4, 5):
+            eco_mode_power = self.hass.states.get("number.eco_mode_power").state
+        await self._inverter.set_operation_mode(operation_mode, eco_mode_power)
         self._attr_current_option = option
         self.async_write_ha_state()