Merge pull request #56 from ajschmidt8/dev

Serial read_line fixes

alarmdecoder/devices/serial_device.py

@@ -189,7 +189,7 @@ class SerialDevice(Device):
         except serial.SerialException as err:
             raise CommError('Error reading from device: {0}'.format(str(err)), err)
 
-        return data
+        return data.decode('utf-8')
 
     def read_line(self, timeout=0.0, purge_buffer=False):
         """
@@ -229,7 +229,7 @@ class SerialDevice(Device):
                 buf = filter_ad2prot_byte(self._device.read(1))
 
                 if buf != b'':
-                    self._buffer +=  buf[0]
+                    self._buffer += buf
 
                     if buf == b"\n":
                         self._buffer = self._buffer.rstrip(b"\r\n")
@@ -252,7 +252,7 @@ class SerialDevice(Device):
         finally:
             timer.cancel()
 
-        return ret
+        return ret.decode('utf-8')
 
     def purge(self):
         """

alarmdecoder/util.py

@@ -97,14 +97,14 @@ def filter_ad2prot_byte(buf):
     """
     Return the byte sent in back if valid visible terminal characters or line terminators.
     """
-    c = buf[0];
+    c = buf[0]
 
-    if (c == '\n' or c == '\r'):
-        return c
+    if (c == 10 or c == 13):
+        return buf
     if (c > 31 and c < 127):
-        return c
+        return buf
     else:
-        return ''
+        return b''
 
 def read_firmware_file(file_path):
     """