syndesi 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

syndesi/adapters/serialport.py

@@ -14,16 +14,6 @@ from .timed_queue import TimedQueue
 from ..tools import shell
 from ..tools.others import DEFAULT
 
-# From pyserial - serialposix.py
-import fcntl
-import termios
-import struct
-if hasattr(termios, 'TIOCINQ'):
-    TIOCINQ = termios.TIOCINQ
-else:
-    TIOCINQ = getattr(termios, 'FIONREAD', 0x541B)
-TIOCM_zero_str = struct.pack('I', 0)
-
 DEFAULT_TIMEOUT = Timeout(response=1, continuation=200e-3, total=None)
 
 class SerialPort(Adapter):
@@ -53,8 +43,6 @@ class SerialPort(Adapter):
             self._status = self.Status.DISCONNECTED
 
         self._rts_cts = rts_cts
-        
-        self._stop_event_pipe, self._stop_event_pipe_write = os.pipe()
 
     def flushRead(self):
         self._port.flush()
@@ -68,10 +56,8 @@ class SerialPort(Adapter):
         self._logger.info("Adapter opened !")
 
     def close(self):
-        if self._thread is not None and self._thread.is_alive():
-            os.write(self._stop_event_pipe_write, b'1')
-            self._thread.join()
         if hasattr(self, '_port'):
+            # Close and the read thread will die by itself
             self._port.close()
         self._logger.info("Adapter closed !")
             
@@ -92,24 +78,19 @@ class SerialPort(Adapter):
         """
         self._logger.debug("Starting read thread...")
         if self._thread is None or not self._thread.is_alive():
-            self._thread = Thread(target=self._read_thread, daemon=True, args=(self._port, self._read_queue, self._stop_event_pipe))
+            self._thread = Thread(target=self._read_thread, daemon=True, args=(self._port, self._read_queue))
             self._thread.start()
 
-    def _read_thread(self, port : serial.Serial , read_queue : TimedQueue, stop_event_pipe):
+    def _read_thread(self, port : serial.Serial , read_queue : TimedQueue):
+        # NOTE : There should be some way to kill the thread, maybe check for an error on in_waiting but couldn't find it so far
         while True:
-            # It looks like using the raw implementation of port.in_waiting and port.read is better, there's no more warnings
-            # Equivalent of port.in_waiting :
-            #in_waiting = struct.unpack('I', fcntl.ioctl(port.fd, TIOCINQ, TIOCM_zero_str))[0]
+            # Check how many bytes are available
             in_waiting = self._port.in_waiting # This is a temporary fix to get windows compatiblity back, an error might pop up
-            if in_waiting == 0:
-                ready, _, _ = select.select([port.fd, stop_event_pipe], [], [], None)
-                if stop_event_pipe in ready:
-                    # Stop
-                    break
-            # Else, read as many bytes as possible
-            fragment = os.read(port.fd, 1000) # simplified version of port.read()
-            if fragment:
-                read_queue.put(fragment)        
+            if in_waiting > 0:
+                # Read those bytes
+                fragment = port.read(in_waiting)
+                if fragment:
+                    read_queue.put(fragment)        
 
     def read(self, timeout=None, stop_condition=None, return_metrics: bool = False) -> bytes:
         """

{syndesi-0.2.1.dist-info → syndesi-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: syndesi
-Version: 0.2.1
+Version: 0.2.2
 Summary: Syndesi
 Author: Sebastien Deriaz
 Author-email: sebastien.deriaz1@gmail.com

{syndesi-0.2.1.dist-info → syndesi-0.2.2.dist-info}/RECORD

@@ -11,7 +11,7 @@ syndesi/adapters/ip_server.py,sha256=wFMF_uPvVnYHPqAkAOvIvRTrMh_WMtK53hUorzD9L5s
 syndesi/adapters/proxy.py,sha256=Vdfh7UZLf3tJ68MItVkQijOnOT5iQaqDbvmKH9P7nhU,3011
 syndesi/adapters/remote.py,sha256=XaaMGVSq7ygEijbETlsy-2cHSmMhZmmjA6UCm7hBTmE,552
 syndesi/adapters/serial.py,sha256=cDp4lFt1f6Z6pRTWRXn0mjT_p0mZgAxqiJgtoXnEHDk,877
-syndesi/adapters/serialport.py,sha256=Uh64McFdvHqZJJfZXIZnqgU-cPvUhRnz91gLecEQJRg,6025
+syndesi/adapters/serialport.py,sha256=66T8aG7s_PbZ3IcBEBSZOlQRV29hOc4zBb4K9q8Ham0,5264
 syndesi/adapters/stop_conditions.py,sha256=-dWUpgXbFEtONBnvk04gjFUhcprf_KJb28aFMgsps4A,5599
 syndesi/adapters/timed_queue.py,sha256=F-Bwj91cR_iLN2TdCkFL4WfvlJXovhyRF7K3dm30g50,912
 syndesi/adapters/timeout.py,sha256=fH5MIJIUEqgDXtF9EgxZgjgAQ0mdeoybcmFznutXINo,11656
@@ -55,9 +55,9 @@ syndesi/tools/shell.py,sha256=A13htgZ0FsFfe8GMlv-4P_w0pv44ca5r4yshz990uqs,3556
 syndesi/tools/stop_conditions.py,sha256=_H-GPczrLTbPRHYpoPIItOqmPnemwn34QbKFn5GD6Uc,4824
 syndesi/tools/types.py,sha256=rEpz5wEYGcJgYkRffRP9sYAhKv8X6DNCXIeI8Zcsvfc,1630
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syndesi-0.2.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-syndesi-0.2.1.dist-info/METADATA,sha256=alER12YD9J_KdOjJSycLYl3zkovbPhxX4bf8M2K6geA,3468
-syndesi-0.2.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-syndesi-0.2.1.dist-info/entry_points.txt,sha256=Q_38BGDXKEFxNPSXtkT8brn6f8lmOrkdkEv0IOV-YOM,96
-syndesi-0.2.1.dist-info/top_level.txt,sha256=HrY36JU6hFYp_6qv-GuVBBtHYYemn8qhCrqpvXBd1Lg,8
-syndesi-0.2.1.dist-info/RECORD,,
+syndesi-0.2.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+syndesi-0.2.2.dist-info/METADATA,sha256=Ec2HsAR9U7kAYIEYe6EZGRfx3yHwAgQFOnlZKW8oPHA,3468
+syndesi-0.2.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+syndesi-0.2.2.dist-info/entry_points.txt,sha256=Q_38BGDXKEFxNPSXtkT8brn6f8lmOrkdkEv0IOV-YOM,96
+syndesi-0.2.2.dist-info/top_level.txt,sha256=HrY36JU6hFYp_6qv-GuVBBtHYYemn8qhCrqpvXBd1Lg,8
+syndesi-0.2.2.dist-info/RECORD,,