Fixing imports and adding support for hex streams

Author: Benji

pi_mqtt_gpio/__init__.py

@@ -331,6 +331,9 @@
         type: boolean
         required: no
         default: no
+      encoding:
+        type: string
+        required: no
       interval:
         type: float
         required: no

pi_mqtt_gpio/modules/streamserial.py

@@ -1,49 +1,54 @@
 from __future__ import print_function
 
 from pi_mqtt_gpio.modules import GenericStream
-import serial
-from serial import Serial
 
-REQUIREMENTS = ("serial",)
+REQUIREMENTS = ("pyserial",)
 CONFIG_SCHEMA = {
     "device": {"type": "string", "required": True, "empty": False},
     "baud": {"type": "integer", "required": True, "empty": False},
-    "bytesize": {"type": "integer", "required": True, "empty": False},
-    "parity": {"type": "string", "required": True, "empty": False},
-    "stopbits": {"type": "float", "required": True, "empty": False},
+    "bytesize": {"type": "integer", "required": False, "default": 8, "empty": False},
+    "parity": {"type": "string", "required": False, "default": "none", "empty": False},
+    "stopbits": {"type": "float", "required": False, "default": 1, "empty": False},
 }
 
 PORTS_USED = {}
-
-BYTESIZE = {
-    5: serial.FIVEBITS,
-    6: serial.SIXBITS,
-    7: serial.SEVENBITS,
-    8: serial.EIGHTBITS
-}
-
-PARITY = {
-    "none": serial.PARITY_NONE,
-    "odd": serial.PARITY_ODD,
-    "even": serial.PARITY_EVEN,
-    "mark": serial.PARITY_MARK,
-    "space": serial.PARITY_SPACE
-}
-
-STOPBITS = {
-    1: serial.STOPBITS_ONE,
-    1.5: serial.STOPBITS_ONE_POINT_FIVE,
-    2: serial.STOPBITS_TWO
-}
+BYTESIZE = None
+PARITY = None
+STOPBITS = None
 
 class Stream(GenericStream):
     """
     Implementation of stream class for outputting to STDIO.
     """
 
     def __init__(self, config):
-        global PORTS_USED
-        #print("__init__(config=%r)" % config)
+        global PORTS_USED, BYTESIZE, PARITY, STOPBITS
+
+        import serial
+
+        print("__init__(config=%r)" % config)
+
+        BYTESIZE = {
+           5: serial.FIVEBITS,
+           6: serial.SIXBITS,
+           7: serial.SEVENBITS,
+           8: serial.EIGHTBITS
+        }
+
+        PARITY = {
+           "none": serial.PARITY_NONE,
+           "odd": serial.PARITY_ODD,
+           "even": serial.PARITY_EVEN,
+           "mark": serial.PARITY_MARK,
+           "space": serial.PARITY_SPACE
+        }
+
+        STOPBITS = {
+           1: serial.STOPBITS_ONE,
+           1.5: serial.STOPBITS_ONE_POINT_FIVE,
+           2: serial.STOPBITS_TWO
+	}
+
         if not config['device'] in PORTS_USED:
 
             if not config['bytesize'] in BYTESIZE.keys():
@@ -57,25 +62,27 @@ def __init__(self, config):
             parity = PARITY[config['parity']]
             stopbits = STOPBITS[config['stopbits']]
 
-            self.ser = Serial(port=config['device'], baudrate=config['baud'], bytesize=bytesize, parity=parity, stopbits=stopbits, timeout=20)
+            self.ser = serial.Serial(port=config['device'], baudrate=config['baud'], bytesize=bytesize, parity=parity, stopbits=stopbits, timeout=20)
             self.ser.flushInput()
             PORTS_USED[config['device']] = self.ser
         else:
             self.ser = PORTS_USED[config['device']]
 
     def setup_stream(self, config):
-        #print("setup_stream(config=%r)" % config)
+        print("setup_stream(config=%r)" % config)
         pass
 
     def read(self, config):
         if (self.ser.inWaiting() <= 0):
             return None
         data = self.ser.read(self.ser.inWaiting()).decode('string_escape')
-        #print("read(config=%r) = %s" % (config, data))
+        if (config.get('encoding')):
+            data = data.encode(config['encoding'])
+        print("read(config=%r) = %s" % (config, data))
         return data
 
     def write(self, config, data):
-        #print("write(config=%r, data=%s)" % (config,data))
+        print("write(config=%r, data=%s)" % (config,data))
         self.ser.write(data)
         pass