Minor tweaks to accomodate C5 platform

Author: Baldwin

openxc/sources/base.py

@@ -146,7 +146,7 @@ def run(self):
         message_buffer = b""
         while self.running:
             try:
-                message_buffer += self.source.read_logs()
+                message_buffer += self.source.read_logs().encode('utf-8')
             except DataSourceError as e:
                 if self.running:
                     LOG.warn("Can't read logs from data source -- stopping: %s", e)
@@ -191,7 +191,7 @@ def run(self):
         off to the callback if one is set.
         """
         while self.running:
-            payload = b""
+            #payload = b""
             try:
                 payload = self.read()
             except DataSourceError as e:
@@ -224,7 +224,7 @@ def run(self):
                 self._receive_command_response(message)
 
     def _receive_command_response(self, message):
-        # TODO the controller/source are getting a litlte mixed up since the
+        # TODO the controller/source are getting a little mixed up since the
         # controller now needs to receive responses from the soruce side, maybe
         # just mix them again. the only exception to being both is a trace
         # source, and we can just leave the controller methods on that

openxc/sources/usb.py

@@ -22,6 +22,9 @@ class UsbDataSource(BytestreamDataSource):
     # throughput if the READ_REQUEST_SIZE is higher, but this delay has to be
     # low enough that a single request isn't held back too long.
     DEFAULT_READ_TIMEOUT = 200
+    LIBUSB0_TIMEOUT_CODE = -116
+    LIBUSB1_TIMEOUT_CODE = -7
+    OPENUSB_TIMEOUT_CODE = -62
 
     DEFAULT_INTERFACE_NUMBER = 0
     VEHICLE_DATA_IN_ENDPOINT = 2
@@ -83,14 +86,9 @@ 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
-                    ),'utf-8')
+                    read_size, self.DEFAULT_INTERFACE_NUMBER, timeout))
         except (usb.core.USBError, AttributeError) as e:
-            # timeout error codes:
-            #   libusb0: -116
-            #   libusb1: -7
-            #   openusb: -62
-            if e.backend_error_code in [-116, -7, -62]:
+            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
-                return b""
+                return ""
             raise DataSourceError("USB device couldn't be read", e)