Minor bug fixes

Author: Baldwin

openxc/controllers/usb.py

@@ -27,8 +27,7 @@ def write_bytes(self, data):
                     self.out_endpoint)
             return 0
         else:
-            ret = self.out_endpoint.write(data)
-            return ret
+            return self.out_endpoint.write(data)
 
     def _send_complex_request(self, request):
         """Send a request via the USB control request endpoint, rather than as a

openxc/sources/base.py

@@ -143,10 +143,10 @@ def run(self):
         message from the buffer of bytes. When a message is parsed, passes it
         off to the callback if one is set.
         """
-        message_buffer = b""
+        message_buffer = ""
         while self.running:
             try:
-                message_buffer += self.source.read_logs().encode('utf-8')
+                message_buffer += self.source.read_logs()
             except DataSourceError as e:
                 if self.running:
                     LOG.warn("Can't read logs from data source -- stopping: %s", e)
@@ -156,7 +156,7 @@ def run(self):
                 break
 
             while True:
-                if b"\x00" not in message_buffer:
+                if "\x00" not in message_buffer:
                     break
                 record, _, remainder = message_buffer.partition(b"\x00")
                 self.record(record)
@@ -191,7 +191,7 @@ def run(self):
         off to the callback if one is set.
         """
         while self.running:
-            #payload = b""
+            payload = ""
             try:
                 payload = self.read()
             except DataSourceError as e:

openxc/sources/usb.py

@@ -86,7 +86,7 @@ def _read(self, endpoint_address, timeout=None,
         timeout = timeout or self.DEFAULT_READ_TIMEOUT
         try:
             return str(self.device.read(0x80 + endpoint_address,
-                    read_size, self.DEFAULT_INTERFACE_NUMBER, timeout))
+                    read_size, self.DEFAULT_INTERFACE_NUMBER, timeout), 'ISO-8859-1')
         except (usb.core.USBError, AttributeError) as e:
             if e.backend_error_code in [self.LIBUSB0_TIMEOUT_CODE, self.LIBUSB1_TIMEOUT_CODE, self.OPENUSB_TIMEOUT_CODE]:
                 # Timeout, it may just not be sending