Add read support for QtSerialPort transport

* fix broken qtserial transport caused by  8650a43

closes #8

Author: karliss

inkcut/device/plugin.py

@@ -186,7 +186,7 @@ def write(self, data):
         if self.transport is not None:
             self.transport.write(data)
 
-    def data_received(self, data):
+    def data_received(self, data: bytes):
         """ Called when the device replies back with data. This can occur
         at any time as communication is asynchronous. The protocol should
         handle as needed.

inkcut/device/transports/qtserialport/plugin.py

@@ -35,10 +35,10 @@ def _default_ports(self):
 
     def map_flow_control(self):
         if self.rtscts:
-            return QSerialPort.HardwareControl
+            return QSerialPort.FlowControl.HardwareControl
         elif self.xonxoff:
-            return QSerialPort.SoftwareControl
-        return QSerialPort.NoFlowControl
+            return QSerialPort.FlowControl.SoftwareControl
+        return QSerialPort.FlowControl.NoFlowControl
 
     STOP_BIT_MAPPING = {
         serial.STOPBITS_ONE: QSerialPort.StopBits.OneStop,
@@ -60,7 +60,18 @@ def map_stop_bits(self):
     def map_parity(self):
         return QtSerialConfig.PARITY_BIT_MAPPING[self.parity]
 
+    BYTESIZE_MAPPING = {
+        5: QSerialPort.DataBits.Data5,
+        6: QSerialPort.DataBits.Data6,
+        7: QSerialPort.DataBits.Data7,
+        8: QSerialPort.DataBits.Data8,
+    }
+
+    def map_bytesize(self):
+        return QtSerialConfig.BYTESIZE_MAPPING[self.bytesize]
+
 class QtSerialTransport(DeviceTransport):
+    __slots__ = ('__weakref__',) # needed to for connection with Qt signals, at least with PyQt6
 
     #: Default config
     config = Instance(QtSerialConfig, ()).tag(config=True)
@@ -75,23 +86,32 @@ class QtSerialTransport(DeviceTransport):
     def open_serial_port(self, config):
         try:
             serial_port = QSerialPort()
-            serial_port.setPortName(config.device_path)
+            serial_port.setPortName(config.port)
             #Setting the AllDirections flag is supported on all platforms. Windows supports only this mode.
-            serial_port.setBaudRate(config.baudrate, QSerialPort.AllDirections)
+            serial_port.setBaudRate(config.baudrate, QSerialPort.Direction.AllDirections)
             serial_port.setParity(config.map_parity())
             serial_port.setStopBits(config.map_stop_bits())
-            serial_port.setDataBits(config.bytesize)
+            serial_port.setDataBits(config.map_bytesize())
             serial_port.setFlowControl(config.map_flow_control())
             serial_port.open(QSerialPort.ReadWrite)
+            foo = self.on_data_receive_ready
+            serial_port.readyRead.connect(self.on_data_receive_ready)
             return serial_port
         except Exception as e:
             log.error("{}".format(traceback.format_exc()))
-            return None    
+            return None
+
+    def on_data_receive_ready(self):
+        if not self.connection:
+            return
+        while self.connection.bytesAvailable() > 0:
+            data = self.connection.read(self.connection.bytesAvailable())
+            self.protocol.data_received(data)
+            self.last_read = data
 
     def connect(self):
         config = self.config
-        #self.device_path = config.port
-        device_path = self.device_path = config.port
+        self.device_path = config.port
         try:
             #: Save a reference
             self.protocol.transport = self

inkcut/device/transports/serialport/plugin.py

@@ -23,10 +23,6 @@
 
 from inkcut.device.transports.raw.plugin import RawFdTransport, RawFdProtocol
 
-#: Reverse key values
-SERIAL_PARITIES = {v: k for k, v in serial.PARITY_NAMES.items()}
-
-
 class SerialPortInfo(Model):
     device_path = Str()
     description = Str()
@@ -46,7 +42,7 @@ class SerialConfigBase(Model):
     baudrate = Int(9600).tag(config=True)
     bytesize = Enum(serial.EIGHTBITS, serial.SEVENBITS, serial.SIXBITS,
                     serial.FIVEBITS).tag(config=True)
-    parity = Enum(*serial.PARITY_NAMES.values()).tag(config=True)
+    parity = Enum(*serial.PARITY_NAMES.keys()).tag(config=True)
     stopbits = Enum(serial.STOPBITS_ONE, serial.STOPBITS_ONE_POINT_FIVE,
                     serial.STOPBITS_TWO).tag(config=True)
     xonxoff = Bool().tag(config=True)
@@ -60,7 +56,7 @@ def _default_ports(self):
         return []
 
     def _default_parity(self):
-        return 'None'
+        return 'N'
 
     def _default_port(self):
         if self.ports:
@@ -110,7 +106,7 @@ def connect(self):
                 reactor,
                 baudrate=config.baudrate,
                 bytesize=config.bytesize,
-                parity=SERIAL_PARITIES[config.parity],
+                parity=config.parity,
                 stopbits=config.stopbits,
                 xonxoff=config.xonxoff,
                 rtscts=config.rtscts

inkcut/device/transports/serialport/settings.enaml

@@ -15,7 +15,7 @@ from inkcut.core.utils import load_icon
 from enaml.layout.api import hbox, align, spacer
 from enaml.qt.QtWidgets import QApplication
 from enaml.widgets.api import Container, Form, Label, ObjectCombo, SpinBox, CheckBox, PushButton
-
+import serial
 
 enamldef SerialPortSettingsView(Container):
     attr model
@@ -68,6 +68,7 @@ enamldef SerialPortSettingsView(Container):
         ObjectCombo:
             items = list(model.get_member('parity').items)
             selected := model.parity
+            to_string = lambda v: serial.PARITY_NAMES[v]
         Label:
             text = QApplication.translate("serialport", "Stopbits")
         ObjectCombo: