Merge branch 'main' into code-quality

Author: WillCodeForCats

custom_components/solaredge_modbus_multi/hub.py

@@ -385,7 +385,7 @@ async def async_refresh_modbus_data(self) -> bool:
             raise DataUpdateFailed(f"Modbus error: {e}")
 
         except TimeoutError as e:
-            self.disconnect()
+            self.disconnect(clear_client=True)
             self._timeout_counter += 1
 
             _LOGGER.debug(
@@ -413,6 +413,7 @@ async def connect(self) -> None:
         """Connect to inverter."""
 
         if self._client is None:
+            _LOGGER.debug(f"New client object for {self._host}:{self._port}")
             self._client = AsyncModbusTcpClient(
                 host=self._host,
                 port=self._port,
@@ -424,18 +425,21 @@ async def connect(self) -> None:
 
         await self._client.connect()
 
-    def disconnect(self) -> None:
+    def disconnect(self, clear_client: bool = False) -> None:
         """Disconnect from inverter."""
 
         if self._client is not None:
             self._client.close()
 
+            if clear_client:
+                self._client = None
+
     async def shutdown(self) -> None:
         """Shut down the hub and disconnect."""
+
         async with self._lock:
             self.online = False
-            self.disconnect()
-            self._client = None
+            self.disconnect(clear_client=True)
 
     async def modbus_read_holding_registers(self, unit, address, rcount):
         """Read modbus registers from inverter."""

custom_components/solaredge_modbus_multi/manifest.json

@@ -10,5 +10,5 @@
   "issue_tracker": "https://github.com/WillCodeForCats/solaredge-modbus-multi/issues",
   "loggers": ["custom_components.solaredge_modbus_multi"],
   "requirements": ["pymodbus>=3.5.4"],
-  "version": "2.4.11-pre.1"
+  "version": "2.4.12-pre.1"
 }