Merge branch 'main' into coordinator-timeout

.github/ISSUE_TEMPLATE/bug_report.md

@@ -28,19 +28,18 @@ If applicable, add screenshots of the problem and/or configuration.
 **Logs**
 Copy any logs in Home Assistant from "custom_components.solaredge_modbus".
 
+**Diagnostic File**
+Attach your diagnostic file that shows the issue. The diagnostic file is a snapshot: make sure it's taken at the exact time the issue is happening.
+
 **Debug Logs**
-Debug logs are not always necessary, but may be required for more complex issues. You can enable debug logs by adding the following to your `configuration.yaml` file and restarting Home Assistant.
-```
-logger:
-    default: warning
-    logs:
-        custom_components.solaredge_modbus_multi: debug
-```
-Debug logging will generate a large amount of data: it is recommended to configure it, collect the data needed, then remove debug logging during normal operation.
+Debug logs are not always necessary, but may be required for more complex issues. You can enable debug logs in Home Assistant. Debug logging will generate a large amount of data: it is recommended to configure it, collect the data needed, then remove debug logging during normal operation.
 
 **Home Assistant (please complete the following information):**
  - Home Assistant Core Version:
  - solaredge-modbus-multi Version:
+ - Installation Type: (HAOS, Container, Supervised, Core)
+
+Note: Your issue must be duplicated in an HAOS VM. If your issue is related to running Core you will need to do your own debugging.
 
 **Additional context**
 Add any other context about the problem here.

README.md

@@ -42,9 +42,9 @@ After rebooting Home Assistant, this integration can be configured through the i
 [WillCodeForCats/solaredge-modbus-multi/wiki](https://github.com/WillCodeForCats/solaredge-modbus-multi/wiki)
 
 ### Required Versions
-* Home Assistant 2023.4.0 or newer
+* Home Assistant 2023.7.0 or newer
 * Python 3.10 or newer
-* pymodbus 3.1.1 or newer
+* pymodbus 3.3.1 or newer
 
 ## Specifications
 [WillCodeForCats/solaredge-modbus-multi/tree/main/doc](https://github.com/WillCodeForCats/solaredge-modbus-multi/tree/main/doc)

custom_components/solaredge_modbus_multi/__init__.py

@@ -62,9 +62,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         entry.options.get(
             ConfName.KEEP_MODBUS_OPEN, bool(ConfDefaultFlag.KEEP_MODBUS_OPEN)
         ),
-        entry.options.get(
-            ConfName.ADV_PWR_CONTROL, bool(ConfDefaultFlag.ADV_PWR_CONTROL)
-        ),
         entry.options.get(
             ConfName.ADV_STORAGE_CONTROL, bool(ConfDefaultFlag.ADV_STORAGE_CONTROL)
         ),
@@ -76,7 +73,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             ConfName.ALLOW_BATTERY_ENERGY_RESET,
             bool(ConfDefaultFlag.ALLOW_BATTERY_ENERGY_RESET),
         ),
-        entry.options.get(ConfName.SLEEP_AFTER_WRITE, ConfDefaultInt.SLEEP_AFTER_WRITE),
         entry.options.get(
             ConfName.BATTERY_RATING_ADJUST, ConfDefaultInt.BATTERY_RATING_ADJUST
         ),
@@ -232,7 +228,7 @@ async def _refresh_modbus_data_with_retry(
                     _LOGGER.debug(f"No more data refresh attempts (maximum {limit})")
                     raise ex
 
-                _LOGGER.debug(f"Failed data refresh attempt #{attempt}", exc_info=ex)
+                _LOGGER.debug(f"Failed data refresh attempt #{attempt}")
 
                 attempt += 1
                 _LOGGER.debug(

custom_components/solaredge_modbus_multi/binary_sensor.py

@@ -58,7 +58,7 @@ def config_entry_name(self):
 
     @property
     def available(self) -> bool:
-        return self._platform.online
+        return super().available and self._platform.online
 
     @callback
     def _handle_coordinator_update(self) -> None:

custom_components/solaredge_modbus_multi/config_flow.py

@@ -4,7 +4,7 @@
 import homeassistant.helpers.config_validation as cv
 import voluptuous as vol
 from homeassistant import config_entries
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigEntry, OptionsFlow
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, CONF_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import FlowResult
@@ -29,7 +29,8 @@ class SolaredgeModbusMultiConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(config_entry: ConfigEntry):
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
+        """Create the options flow for SolarEdge Modbus Multi."""
         return SolaredgeModbusMultiOptionsFlowHandler(config_entry)
 
     async def async_step_user(self, user_input=None) -> FlowResult:
@@ -97,7 +98,7 @@ async def async_step_user(self, user_input=None) -> FlowResult:
         )
 
 
-class SolaredgeModbusMultiOptionsFlowHandler(config_entries.OptionsFlow):
+class SolaredgeModbusMultiOptionsFlowHandler(OptionsFlow):
     """Handle an options flow for SolarEdge Modbus Multi."""
 
     def __init__(self, config_entry: ConfigEntry):
@@ -233,14 +234,9 @@ async def async_step_adv_pwr_ctl(self, user_input=None) -> FlowResult:
         errors = {}
 
         if user_input is not None:
-            if user_input[ConfName.SLEEP_AFTER_WRITE] < 0:
-                errors[ConfName.SLEEP_AFTER_WRITE] = "invalid_sleep_interval"
-            elif user_input[ConfName.SLEEP_AFTER_WRITE] > 60:
-                errors[ConfName.SLEEP_AFTER_WRITE] = "invalid_sleep_interval"
-            else:
-                return self.async_create_entry(
-                    title="", data={**self.init_info, **user_input}
-                )
+            return self.async_create_entry(
+                title="", data={**self.init_info, **user_input}
+            )
 
         else:
             user_input = {
@@ -252,9 +248,6 @@ async def async_step_adv_pwr_ctl(self, user_input=None) -> FlowResult:
                     ConfName.ADV_SITE_LIMIT_CONTROL,
                     bool(ConfDefaultFlag.ADV_SITE_LIMIT_CONTROL),
                 ),
-                ConfName.SLEEP_AFTER_WRITE: self.config_entry.options.get(
-                    ConfName.SLEEP_AFTER_WRITE, ConfDefaultInt.SLEEP_AFTER_WRITE
-                ),
             }
 
         return self.async_show_form(
@@ -269,10 +262,6 @@ async def async_step_adv_pwr_ctl(self, user_input=None) -> FlowResult:
                         f"{ConfName.ADV_SITE_LIMIT_CONTROL}",
                         default=user_input[ConfName.ADV_SITE_LIMIT_CONTROL],
                     ): cv.boolean,
-                    vol.Optional(
-                        f"{ConfName.SLEEP_AFTER_WRITE}",
-                        default=user_input[ConfName.SLEEP_AFTER_WRITE],
-                    ): vol.Coerce(int),
                 }
             ),
             errors=errors,

custom_components/solaredge_modbus_multi/const.py

@@ -75,7 +75,6 @@ class ConfDefaultInt(IntEnum):
     PORT = 1502
     NUMBER_INVERTERS = 1
     DEVICE_ID = 1
-    SLEEP_AFTER_WRITE = 3
     BATTERY_RATING_ADJUST = 0
     BATTERY_ENERGY_RESET_CYCLES = 0
 
@@ -102,7 +101,6 @@ class ConfName(StrEnum):
     ADV_STORAGE_CONTROL = "adv_storage_control"
     ADV_SITE_LIMIT_CONTROL = "adv_site_limit_control"
     ALLOW_BATTERY_ENERGY_RESET = "allow_battery_energy_reset"
-    SLEEP_AFTER_WRITE = "sleep_after_write"
     BATTERY_RATING_ADJUST = "battery_rating_adjust"
     BATTERY_ENERGY_RESET_CYCLES = "battery_energy_reset_cycles"