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 ed0709b..ad6b501 100755 --- a/robots/little_john/telemetry/code/monitor/graph_plotter_rewrite.py +++ b/robots/little_john/telemetry/code/monitor/graph_plotter_rewrite.py @@ -26,14 +26,8 @@ logging.info("Logging system active") datafeed = selectserial() -if type(datafeed) is str: - message = "Failed to open serial port: " + datafeed - easygui.msgbox(message, "Fatal error") - logging.critical(message) - sys.exit() -elif datafeed == None: - message = "Failed to open serial port for unknown reason!" - easygui.msgbox(message, "Fatal error") +if datafeed == None: + message = "Failed to open serial port" logging.critical(message) sys.exit() diff --git a/robots/little_john/telemetry/code/monitor/serialselect.py b/robots/little_john/telemetry/code/monitor/serialselect.py index 0771de0..e45b36e 100644 --- a/robots/little_john/telemetry/code/monitor/serialselect.py +++ b/robots/little_john/telemetry/code/monitor/serialselect.py @@ -40,12 +40,12 @@ def selectserial(): title = "Found multiple serial ports!" serialport = easygui.choicebox(message, title, targetdevs) if serialport == None: - return "User cancelled selection dialogue" + logging.info("User cancelled selection dialogue") + return None else: logging.info("Only found one likely serial device: " + targetdevs[0]) serialport = targetdevs[0] - try: datafeed = serial.Serial( port=serialport, @@ -59,4 +59,5 @@ def selectserial(): logging.info("Sucessfully opened " + serialport + " as data source!") return datafeed except Exception as e: - return str(e) + logging.critical(str(e)) + return None -- libgit2 0.21.2