From 8707b747e497dc1efe40626e1e0800b9f51a0f62 Mon Sep 17 00:00:00 2001 From: Christopher Stone Date: Fri, 9 Mar 2018 13:36:58 +0000 Subject: [PATCH] Minor changes resulting from attempt to make code work on uni PCs, including changes to error reporting to use logging better, and broadening an exception, as the type specifically suggested doesn't seem to exist. (This should probably be fixed more carefully at some point). Code does now work on uni PCs, at least up to failure to find a serial port, which is handled correctly. --- robots/little_john/telemetry/code/monitor/graph_plotter_rewrite.py | 2 +- robots/little_john/telemetry/code/monitor/serialselect.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/robots/little_john/telemetry/code/monitor/graph_plotter_rewrite.py b/robots/little_john/telemetry/code/monitor/graph_plotter_rewrite.py index d894e35..cc04f0a 100755 --- a/robots/little_john/telemetry/code/monitor/graph_plotter_rewrite.py +++ b/robots/little_john/telemetry/code/monitor/graph_plotter_rewrite.py @@ -27,7 +27,7 @@ logging.info("Logging system active") datafeed = selectserial() -if datafeed == 'Sorry, no serial devices found.' or None: +if datafeed == None: logging.critical("Failed to open serial port") sys.exit() diff --git a/robots/little_john/telemetry/code/monitor/serialselect.py b/robots/little_john/telemetry/code/monitor/serialselect.py index 63786a9..91ef300 100644 --- a/robots/little_john/telemetry/code/monitor/serialselect.py +++ b/robots/little_john/telemetry/code/monitor/serialselect.py @@ -19,7 +19,8 @@ def selectserial(): s = serial.Serial(port) s.close() targetdevs.append(port) - except (OSError, serial.SerialException): + # Temporarily broadened exception in attempt to make this work on uni PCs + except: # (OSError, serial.SerialException): pass os='Windows' #may be useful else: @@ -32,7 +33,8 @@ def selectserial(): os='Other' #may be useful if len(targetdevs) == 0: - return "Sorry, no serial devices found." + logging.info("No serial device found.") + return None elif len(targetdevs) > 1: logging.info("Found multiple serial devices: ") for i, dev in enumerate(targetdevs): -- libgit2 0.21.2