Misc cleanups
This commit is contained in:
parent
55dd73e113
commit
dc035fc6a9
15
terminal.py
15
terminal.py
|
@ -44,7 +44,8 @@ elif os.name == 'posix':
|
||||||
c = os.read(self.fd, 1)
|
c = os.read(self.fd, 1)
|
||||||
return c
|
return c
|
||||||
else:
|
else:
|
||||||
raise "Sorry, no terminal implementation for your platform (%s) available." % sys.platform
|
raise ("Sorry, no terminal implementation for your platform (%s) "
|
||||||
|
"available." % sys.platform)
|
||||||
|
|
||||||
class Miniterm:
|
class Miniterm:
|
||||||
def __init__(self, serial):
|
def __init__(self, serial):
|
||||||
|
@ -54,12 +55,12 @@ class Miniterm:
|
||||||
self.alive = True
|
self.alive = True
|
||||||
#start serial->console thread
|
#start serial->console thread
|
||||||
self.receiver_thread = threading.Thread(target=self.reader)
|
self.receiver_thread = threading.Thread(target=self.reader)
|
||||||
self.receiver_thread.setDaemon(1)
|
self.receiver_thread.daemon = True
|
||||||
self.receiver_thread.start()
|
self.receiver_thread.start()
|
||||||
#enter console->serial loop
|
#enter console->serial loop
|
||||||
self.console = Console()
|
self.console = Console()
|
||||||
self.transmitter_thread = threading.Thread(target=self.writer)
|
self.transmitter_thread = threading.Thread(target=self.writer)
|
||||||
self.transmitter_thread.setDaemon(1)
|
self.transmitter_thread.daemon = True
|
||||||
self.transmitter_thread.start()
|
self.transmitter_thread.start()
|
||||||
|
|
||||||
def stop(self):
|
def stop(self):
|
||||||
|
@ -112,6 +113,7 @@ class Miniterm:
|
||||||
self.join()
|
self.join()
|
||||||
print ""
|
print ""
|
||||||
self.console.cleanup()
|
self.console.cleanup()
|
||||||
|
self.serial.timeout = saved_timeout
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
import argparse
|
import argparse
|
||||||
|
@ -122,6 +124,11 @@ if __name__ == "__main__":
|
||||||
parser.add_argument('baudrate', metavar='BAUDRATE', type=int, nargs='?',
|
parser.add_argument('baudrate', metavar='BAUDRATE', type=int, nargs='?',
|
||||||
help='baud rate', default=115200)
|
help='baud rate', default=115200)
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
term = Miniterm(serial.Serial(args.device, args.baudrate))
|
try:
|
||||||
|
dev = serial.Serial(args.device, args.baudrate)
|
||||||
|
except serial.serialutil.SerialException:
|
||||||
|
sys.stderr.write("error opening %s\n" % args.device)
|
||||||
|
raise SystemExit(1)
|
||||||
|
term = Miniterm(dev)
|
||||||
term.run()
|
term.run()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user