Merge pull request #148 from openxc/ctrl_c

Add a try catch for keyboardinterupt for both openxc-dump and scanner…

Author: jstoke53

openxc/tools/dump.py

@@ -9,6 +9,7 @@
 import argparse
 import time
 import logging
+import sys
 
 from openxc.formats.json import JsonFormatter
 from .common import device_options, configure_logging, select_device
@@ -31,11 +32,14 @@ def parse_options():
 
 
 def main():
-    configure_logging(logging.DEBUG)
-    arguments = parse_options()
-
-    source_class, source_kwargs = select_device(arguments)
-    source = source_class(callback=receive, **source_kwargs)
-    source.start()
-    # TODO test this, I'd prefer it to the sleep loop
-    source.join()
+    try:
+        configure_logging(logging.DEBUG)
+        arguments = parse_options()
+        source_class, source_kwargs = select_device(arguments)
+        source = source_class(callback=receive, **source_kwargs)
+        source.start()
+        # TODO test this, I'd prefer it to the sleep loop
+        while(True):
+            source.join(0.1)
+    except KeyboardInterrupt:
+        sys.exit(0)

openxc/tools/scanner.py

@@ -6,7 +6,7 @@
 module are internal only.
 """
 
-
+import sys
 import argparse
 from collections import defaultdict
 
@@ -98,11 +98,14 @@ def parse_options():
 
 
 def main():
-    configure_logging()
-    arguments = parse_options()
-
-    controller_class, controller_kwargs = select_device(arguments)
-    controller = controller_class(**controller_kwargs)
-    controller.start()
-
-    scan(controller, arguments.bus, arguments.message_id)
+    try:
+        configure_logging()
+        arguments = parse_options()
+
+        controller_class, controller_kwargs = select_device(arguments)
+        controller = controller_class(**controller_kwargs)
+        controller.start()
+        while(True):
+            scan(controller, arguments.bus, arguments.message_id)
+    except KeyboardInterrupt:
+        sys.exit(0)