python-selve-new 2.2.16__tar.gz → 2.2.18__tar.gz

{python_selve_new-2.2.16/python_selve_new.egg-info → python_selve_new-2.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-selve-new
-Version: 2.2.16
+Version: 2.2.18
 Summary: Python library for interfacing with selve devices using the USB-RF controller. Written completely new.
 Home-page: https://github.com/Kannix2005/python-selve-new
 Author: Stefan Altheimer

{python_selve_new-2.2.16 → python_selve_new-2.2.18/python_selve_new.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-selve-new
-Version: 2.2.16
+Version: 2.2.18
 Summary: Python library for interfacing with selve devices using the USB-RF controller. Written completely new.
 Home-page: https://github.com/Kannix2005/python-selve-new
 Author: Stefan Altheimer

{python_selve_new-2.2.16 → python_selve_new-2.2.18}/selve/__init__.py

@@ -9,6 +9,7 @@ from typing import Callable
 
 import serial
 from serial.tools import list_ports
+from serial import SerialException
 import untangle
 
 from selve.commands import param, service
@@ -39,12 +40,13 @@ from selve.util.protocol import ParameterType
 class Selve:
     """Implementation of the serial communication to the Selve Gateway"""
 
-    def __init__(self, port=None, discover=True, develop=False, logger=None):
+    def __init__(self, port=None, discover=True, develop=False, logger=None, loop=None):
         # Gateway state
         self._callbacks = set()
         self._eventCallbacks = set()
         self.lastLogEvent = None
         self.state = None
+        self.loop = loop
 
         # Data from Duty Cycle Event
         self.utilization = 0
@@ -216,8 +218,6 @@ class Selve:
         self._LOGGER.debug("(Selve Worker): " + "Waiting 5 seconds before trying...")
         await asyncio.sleep(5)
         self._LOGGER.debug("(Selve Worker): " + "Recovering")
-          
-        
 
         if self._port is not None:
             try:
@@ -238,8 +238,11 @@ class Selve:
             except Exception as e:
                 self._LOGGER.error("(Selve Worker): " + "Unknown exception: " + str(e))
 
-
-        available_ports = list_ports.comports()
+        if self.loop is not None:
+            available_ports = await self.loop.run_in_executor(None, list_ports.comports())
+        else:
+            available_ports = list_ports.comports()
+        
         self._LOGGER.debug("(Selve Worker): " + "available comports: " + str(available_ports))
 
         if len(available_ports) == 0:
@@ -348,8 +351,25 @@ class Selve:
             self._serial.flush()
             #always sleep after writing
             await asyncio.sleep(0.5)
+
+        except SerialException as se:
+            self._LOGGER.info('Serial error, trying to reconnect once... ' + str(se))
+            await self.recover()
+
+            try:
+                self._LOGGER.debug('Trying again...')
+                if not self._serial.is_open:
+                    self._serial.open()
+                self._serial.write(commandstr)
+                self._serial.flush()
+                #always sleep after writing
+                await asyncio.sleep(0.5)
+            
+            except Exception as e:
+                self._LOGGER.error("error communicating: " + str(e) + " ; Please restart the integration!")
+
         except Exception as e:
-            self._LOGGER.error("error communicating: " + str(e))
+            self._LOGGER.error("error communicating: " + str(e) + " ; Please restart the integration!")
 
     async def processResponse(self, xmlstr):
         """Processes an XML String into a response object. Returns False if something went wrong or the gateway returned an error."""

{python_selve_new-2.2.16 → python_selve_new-2.2.18}/setup.py

@@ -15,7 +15,7 @@ with open(path.join(here, 'README.md'), encoding='utf-8') as f:
 setup(
     
     name='python-selve-new',  # Required    
-    version='2.2.16',  # Required
+    version='2.2.18',  # Required
     description='Python library for interfacing with selve devices using the USB-RF controller. Written completely new.',  # Required   
     long_description=long_description,  # Optional 
     long_description_content_type="text/markdown",   

{python_selve_new-2.2.16 → python_selve_new-2.2.18}/test.py

@@ -19,7 +19,7 @@ handler.setFormatter(formatter)
 logger.addHandler(handler)
 
 
-selve = selve.Selve(portname, develop=True, discover=False, logger=logger)
+selve = selve.Selve(portname, develop=True, discover=False, logger=logger, loop=loop)
 loop.run_until_complete(selve.setup())
 
 loop.run_until_complete(selve.discover())