Add files via upload

- Zero Export switch added for ECU-C
- ECU GUI functions moved to separate module
- Code cleaned up
- Module renamed
- Bugfixed the state of individual inverters when HA restarts

Author: HAEdwin

custom_components/apsystems_ecu_reader/__init__.py

@@ -21,7 +21,7 @@
 
 from .const import DOMAIN
 from .ecu_api import APsystemsSocket, APsystemsInvalidData
-from .gui_helpers import set_inverter_state, set_zero_export, reboot_ecu  # Import the functions
+from .gui_helpers import set_inverter_state, set_zero_export, reboot_ecu
 
 _LOGGER = logging.getLogger(__name__)
 

custom_components/apsystems_ecu_reader/config_flow.py

@@ -6,73 +6,50 @@
 from .const import DOMAIN, KEYS
 from .ecu_api import APsystemsSocket, APsystemsInvalidData
 
+
 _LOGGER = logging.getLogger(__name__)
 
+"""Set defaults for the configuration."""
+ECU_HOST = ""
 SCAN_INTERVAL = 300
 PORT_RETRIES = 5
 CACHE_REBOOT = 3
 SHOW_GRAPHS = True
 WIFI_SSID = "ECU-WIFI_local"
 WIFI_PASSWORD = "default"
 
+
 @config_entries.HANDLERS.register(DOMAIN)
-class FlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
+class FlowHandler(config_entries.ConfigFlow):
     """Handle a config flow."""
     VERSION = 1
 
-    def __init__(self):
-        """Initialize the flow handler."""
-        self.ecu_id = None
-        self.user_input = {}
-
     async def async_step_user(self, user_input=None):
         errors = {}
         init_schema = vol.Schema({
-            vol.Required(KEYS[0], default=''): str,
+            vol.Required(KEYS[0], default=ECU_HOST): str,
             vol.Required(KEYS[1], default=SCAN_INTERVAL): int,
-            vol.Required(KEYS[2], default=PORT_RETRIES): vol.All(int, vol.Range(1, 10)),
+            vol.Required(KEYS[2], default=PORT_RETRIES): vol.All(int, vol.Range(min=1, max=10)),
+            vol.Required(KEYS[3], default=CACHE_REBOOT): vol.All(int, vol.Range(min=3, max=5)),
             vol.Optional(KEYS[4], default=SHOW_GRAPHS): bool,
+            vol.Optional(KEYS[5], default=WIFI_SSID): str,
+            vol.Optional(KEYS[6], default=WIFI_PASSWORD): str,
         })
 
         if user_input:
             ecu_id = await test_ecu_connection(user_input)
             if ecu_id:
-                _LOGGER.debug("ECU connection successful, ECU ID: %s", ecu_id)
-                self.ecu_id = ecu_id
-                self.user_input = user_input
-                if ecu_id.startswith(("215", "2162")):
-                    return await self.async_step_additional_options()
+                await self.async_set_unique_id(ecu_id)
                 return self.async_create_entry(title="APsystems", data=user_input)
             errors["ecu_host"] = "no_ecu_found"
 
+        # Show form because user input is empty.
         return self.async_show_form(
             step_id="user",
             data_schema=init_schema,
             errors=errors
         )
 
-    async def async_step_additional_options(self, user_input=None):
-        """Handle additional options for ECU-R-Pro and ECU-C devices."""
-        errors = {}
-        additional_schema = vol.Schema({
-            vol.Required(KEYS[3], default=CACHE_REBOOT): vol.All(int, vol.Range(3, 5)),
-            vol.Optional(KEYS[5], default=WIFI_SSID): str,
-            vol.Optional(KEYS[6], default=WIFI_PASSWORD): str,
-        })
-
-        if user_input:
-            _LOGGER.debug("Received additional options: %s", user_input)
-            user_input.update(self.user_input)
-            await self.async_set_unique_id(self.ecu_id)
-            return self.async_create_entry(title="APsystems", data=user_input)
-
-        return self.async_show_form(
-            step_id="additional_options",
-            data_schema=additional_schema,
-            errors=errors,
-            description_placeholders={"title": "Additional Configuration"}
-        )
-
     @staticmethod
     @callback
     def async_get_options_flow(config_entry):
@@ -84,17 +61,22 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
 
     def __init__(self, entry: config_entries.ConfigEntry) -> None:
         """Initialize options flow."""
+        super().__init__()
         self.entry = entry
 
     async def async_step_init(self, user_input=None):
         """Manage the options."""
         errors = {}
-        _cfg = {**self.entry.data}
+        # Get current options
+        _config = {**self.entry.data}
         alter_schema = vol.Schema({
-            vol.Required(KEYS[0], default=_cfg.get(KEYS[0])): str,
-            vol.Required(KEYS[1], default=_cfg.get(KEYS[1], SCAN_INTERVAL)): int,
-            vol.Required(KEYS[2], default=_cfg.get(KEYS[2], PORT_RETRIES)): vol.All(int, vol.Range(1, 10)),
-            vol.Optional(KEYS[4], default=_cfg.get(KEYS[4], SHOW_GRAPHS)): bool,
+            vol.Required(KEYS[0], default=_config.get(KEYS[0],ECU_HOST)): str,
+            vol.Required(KEYS[1], default=_config.get(KEYS[1], SCAN_INTERVAL)): int,
+            vol.Required(KEYS[2], default=_config.get(KEYS[2], PORT_RETRIES)): vol.All(int,vol.Range(min=1, max=10)),
+            vol.Required(KEYS[3], default=_config.get(KEYS[3], CACHE_REBOOT)): vol.All(int,vol.Range(min=3, max=5)),
+            vol.Optional(KEYS[4], default=_config.get(KEYS[4], SHOW_GRAPHS)): bool,
+            vol.Optional(KEYS[5], default=_config.get(KEYS[5], WIFI_SSID)): str,
+            vol.Optional(KEYS[6], default=_config.get(KEYS[6], WIFI_PASSWORD)): str,
         })
 
         if user_input:
@@ -104,42 +86,14 @@ async def async_step_init(self, user_input=None):
                     self.entry,
                     data={**self.entry.data, **user_input}
                 )
-                if ecu_id.startswith(("215", "2162")):
-                    return await self.async_step_additional_options()
                 return self.async_create_entry(title="APsystems", data={})
             errors["ecu_host"] = "no_ecu_found"
-
         return self.async_show_form(
             step_id="init",
             data_schema=alter_schema,
             errors=errors
         )
 
-    async def async_step_additional_options(self, user_input=None):
-        """Handle additional options."""
-        errors = {}
-        _cfg = {**self.entry.data}
-        additional_schema = vol.Schema({
-            vol.Required(KEYS[3], default=_cfg.get(KEYS[3], CACHE_REBOOT)): vol.All(int, vol.Range(3, 5)),
-            vol.Optional(KEYS[5], default=_cfg.get(KEYS[5], WIFI_SSID)): str,
-            vol.Optional(KEYS[6], default=_cfg.get(KEYS[6], WIFI_PASSWORD)): str,
-        })
-
-        if user_input:
-            _LOGGER.debug("Received additional options: %s", user_input)
-            self.hass.config_entries.async_update_entry(
-                self.entry,
-                data={**self.entry.data, **user_input}
-            )
-            return self.async_create_entry(title="APsystems", data={})
-
-        return self.async_show_form(
-            step_id="additional_options",
-            data_schema=additional_schema,
-            errors=errors,
-            description_placeholders={"title": "Additional Configuration"}
-        )
-
 async def test_ecu_connection(input_data):
     """Test the connection to the ECU and return the ECU ID if successful."""
     try:

custom_components/apsystems_ecu_reader/gui_helpers.py

@@ -53,7 +53,7 @@ async def set_zero_export(ipaddr, state):
     except (aiohttp.ClientError, aiohttp.ClientConnectionError, asyncio.TimeoutError) as err:
         _LOGGER.debug(
             "Attempt to bridge zero export failed with error: %s\n\t"
-            "This switch is only compatible with ECU-ID 2162... series and ECU-C models", err
+            "This switch is only compatible with ECU-C models", err
         )
 
 async def reboot_ecu(ipaddr, wifi_ssid, wifi_password, cached_data):