Fixed timeout error handling

Author: Baldwin

openxc/controllers/base.py

@@ -28,7 +28,7 @@ class ResponseReceiver(object):
     of ResponseReceivers as they arrive.
     """
 
-    COMMAND_RESPONSE_TIMEOUT_S = .5
+    COMMAND_RESPONSE_TIMEOUT_S = 0.5
 
     def __init__(self, queue, request, quit_after_first=True):
         """Construct a new ResponseReceiver.

openxc/controllers/usb.py

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

openxc/sources/base.py

@@ -156,7 +156,7 @@ def run(self):
                 break
 
             while True:
-                if "\x00" not in message_buffer:
+                if b"\x00" not in message_buffer:
                     break
                 record, _, remainder = message_buffer.partition(b"\x00")
                 self.record(record)
@@ -191,6 +191,7 @@ def run(self):
         off to the callback if one is set.
         """
         while self.running:
+            payload = b""
             try:
                 payload = self.read()
             except DataSourceError as e:

openxc/sources/usb.py

@@ -86,7 +86,11 @@ def _read(self, endpoint_address, timeout=None,
                     read_size, self.DEFAULT_INTERFACE_NUMBER, timeout
                     ),'utf-8')
         except (usb.core.USBError, AttributeError) as e:
-            if e.errno == 110:
+            # timeout error codes:
+            #   libusb0: -116
+            #   libusb1: -7
+            #   openusb: -62
+            if e.backend_error_code in [-116, -7, -62]:
                 # Timeout, it may just not be sending
-                return ""
+                return b""
             raise DataSourceError("USB device couldn't be read", e)

openxc/tools/control.py

@@ -131,6 +131,7 @@ def parse_options():
             dest="host")
     parser.add_argument("--port", action="store", default=80,
             dest="port")
+    parser.set_defaults(format="json")
     return parser.parse_args()
 
 
@@ -182,4 +183,4 @@ def main():
             else:
                 sys.exit("%s requires a signal name, message ID or filename" % arguments.command)
     else:
-        print(("Unrecognized command \"%s\"" % arguments.command))
+        print(("Unrecognized command \"%s\"" % arguments.command))

openxc/tools/diagnostics.py

@@ -76,6 +76,7 @@ def parse_options():
     parser.add_argument("--pid", help="Parameter ID (e.g. for Mode 1 request")
     parser.add_argument("--payload", help="A byte array as a hex string to send as payload, e.g. 0x123")
     parser.add_argument("--frequency", help="Frequency (Hz) to repeat this request. If omitted or 0, it will be a one-time request.")
+    parser.set_defaults(format="json")
 
     return parser.parse_args()
 

openxc/tools/gps.py

@@ -54,7 +54,6 @@ def main():
     arguments = parse_options()
 
     transcoder = GPXTranscoder()
-
     source = TraceDataSource(transcoder.receive, filename=arguments.trace_file,
             loop=False, realtime=False)
     source.start()