Commit ef651028c16f4eed2317fc8703f261c3ac56d5e1

Authored by Christopher Stone
1 parent af437b8f
Exists in master

Moved serialselect away from using direct print statements

robots/little_john/telemetry/code/monitor/serialselect.py
@@ -7,6 +7,7 @@ def selectserial(): @@ -7,6 +7,7 @@ def selectserial():
7 import serial 7 import serial
8 import os 8 import os
9 import easygui 9 import easygui
  10 + import logging
10 11
11 devpatterns = ['ttyACM', 'ttyUSB', 'rfcomm'] 12 devpatterns = ['ttyACM', 'ttyUSB', 'rfcomm']
12 targetdevs = [] 13 targetdevs = []
@@ -32,16 +33,16 @@ def selectserial(): @@ -32,16 +33,16 @@ def selectserial():
32 if len(targetdevs) == 0: 33 if len(targetdevs) == 0:
33 return "Sorry, no serial devices found." 34 return "Sorry, no serial devices found."
34 elif len(targetdevs) > 1: 35 elif len(targetdevs) > 1:
35 - print("Found multiple serial devices: ") 36 + logging.info("Found multiple serial devices: ")
36 for i, dev in enumerate(targetdevs): 37 for i, dev in enumerate(targetdevs):
37 - print(" " + str(i) + ": " + dev) 38 + logging.info(" " + str(i) + ": " + dev)
38 message = "Please choose a serial port to recieve data through:" 39 message = "Please choose a serial port to recieve data through:"
39 title = "Found multiple serial ports!" 40 title = "Found multiple serial ports!"
40 serialport = easygui.choicebox(message, title, targetdevs) 41 serialport = easygui.choicebox(message, title, targetdevs)
41 if serialport == None: 42 if serialport == None:
42 return "User cancelled selection dialogue" 43 return "User cancelled selection dialogue"
43 else: 44 else:
44 - print("Only found one likely serial device: " + targetdevs[0]) 45 + logging.info("Only found one likely serial device: " + targetdevs[0])
45 serialport = targetdevs[0] 46 serialport = targetdevs[0]
46 47
47 48
@@ -55,7 +56,7 @@ def selectserial(): @@ -55,7 +56,7 @@ def selectserial():
55 timeout=1 56 timeout=1
56 ) 57 )
57 58
58 - print("Sucessfully opened " + serialport + " as data source!") 59 + logging.info("Sucessfully opened " + serialport + " as data source!")
59 return datafeed 60 return datafeed
60 except Exception as e: 61 except Exception as e:
61 return str(e) 62 return str(e)