kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2026-01-01 01:41:18 +01:00
Code Releases Activity

pyterm: fix program exit procedure, disable SIGINT

Browse Source
This commit is contained in:
Oleg Hahm 2014-04-03 16:14:38 +02:00
parent cffa4e73d5
commit 508e8770c7
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dist/tools/pyterm/pyterm.py vendored
View File

@ -8,7 +8,7 @@ except ImportError:
from twisted.internet import reactor
from twisted.internet.protocol import Protocol, ReconnectingClientFactory
import cmd, serial, sys, threading, readline, time, logging, os, argparse, re, codecs
import cmd, serial, sys, threading, readline, time, logging, os, argparse, re, codecs, signal
### set some default options
defaultport = "/dev/ttyUSB0"
@ -93,10 +93,11 @@ class SerCmd(cmd.Cmd):
self.ser.setDTR(1)
self.ser.setDTR(0)
def do_PYTERM_exit(self, line):
def do_PYTERM_exit(self, line, unused=None):
print("Exiting Pyterm")
readline.write_history_file()
if reactor.running:
reactor.stop()
reactor.callFromThread(reactor.stop)
return True
def do_PYTERM_save(self, line):
@ -252,7 +253,7 @@ class SerCmd(cmd.Cmd):
class PytermProt(Protocol):
def dataReceived(self, data):
stdout.write(data)
sys.stdout.write(data)
def sendMessage(self, msg):
self.transport.write("%d#%s\n" % (len(msg), msg))
@ -281,6 +282,9 @@ class PytermClientFactory(ReconnectingClientFactory):
ReconnectingClientFactory.clientConnectionFailed(self, connector,
reason)
def __stop_reactor(signum, stackframe):
sys.stderr.write("Ctrl-C is disabled, type '/exit' instead\n")
if __name__ == "__main__":
parser = argparse.ArgumentParser(description="Pyterm - The Python terminal program")
@ -305,16 +309,12 @@ if __name__ == "__main__":
myshell = SerCmd(args.port, args.baudrate, args.directory, args.config)
myshell.prompt = ''
try:
if args.server and args.tcp_port:
myfactory = PytermClientFactory()
reactor.connectTCP(args.server, args.tcp_port, myfactory)
myshell.factory = myfactory
reactor.callInThread(myshell.cmdloop, "Welcome to pyterm!\nType 'exit' to exit.")
reactor.run()
sys.exit(0)
else:
myshell.cmdloop("Welcome to pyterm!\nType 'exit' to exit.")
sys.exit(0)
except KeyboardInterrupt:
myshell.do_PYTERM_exit(0)
if args.server and args.tcp_port:
myfactory = PytermClientFactory()
reactor.connectTCP(args.server, args.tcp_port, myfactory)
myshell.factory = myfactory
reactor.callInThread(myshell.cmdloop, "Welcome to pyterm!\nType '/exit' to exit.")
signal.signal(signal.SIGINT, __stop_reactor)
reactor.run()
else:
myshell.cmdloop("Welcome to pyterm!\nType 'exit' to exit.")