* set default terminal from pseudoterm to pyterm
* updated pyterm
This commit is contained in:
Oliver Hahm
parent
04936c6c0f
commit
473a0f108c
2
Jamrules
2
Jamrules
@ -39,7 +39,7 @@ SUFFIX ?= "" ; # must be at least "" !!!
|
|||||||
TARGET = "$(BOARD)-$(PROJECT)$(SUFFIX)$(SUFEXE)" ; # main target binary
|
TARGET = "$(BOARD)-$(PROJECT)$(SUFFIX)$(SUFEXE)" ; # main target binary
|
||||||
OPENOCD_IF ?= olimex-jtag-tiny-a ;
|
OPENOCD_IF ?= olimex-jtag-tiny-a ;
|
||||||
|
|
||||||
TERMINAL ?= board/msba2/tools/bin/pseudoterm ;
|
TERMINAL ?= tools/pyterm/pyterm.py ;
|
||||||
|
|
||||||
if $(NT) || $(OS) = CYGWIN {
|
if $(NT) || $(OS) = CYGWIN {
|
||||||
PORT = $(PORT:E=1) ;
|
PORT = $(PORT:E=1) ;
|
||||||
|
|||||||
@ -1,122 +1,149 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import cmd, serial, sys, threading, readline, time, ConfigParser
|
import cmd, serial, sys, threading, readline, time, ConfigParser, logging, os
|
||||||
from datetime import datetime
|
|
||||||
from os import path
|
pytermdir = os.environ['HOME'] + os.path.sep + '.pyterm'
|
||||||
|
|
||||||
class SerCmd(cmd.Cmd):
|
class SerCmd(cmd.Cmd):
|
||||||
|
|
||||||
def __init__(self, port=None):
|
def __init__(self, port=None):
|
||||||
cmd.Cmd.__init__(self)
|
cmd.Cmd.__init__(self)
|
||||||
self.port = port
|
self.port = port
|
||||||
self.aliases = dict()
|
self.aliases = dict()
|
||||||
self.load_config()
|
self.load_config()
|
||||||
try:
|
try:
|
||||||
readline.read_history_file()
|
readline.read_history_file()
|
||||||
except IOError:
|
except IOError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def preloop(self):
|
### create Logging object
|
||||||
if not self.port:
|
my_millis = ("%.4f" % time.time())
|
||||||
sys.stderr.write("No port specified!\n")
|
date_str = '%s.%s' % (time.strftime('%Y%m%d-%H:%M:%S'), my_millis[-4:])
|
||||||
sys.exit(-1)
|
# create formatter
|
||||||
self.ser = serial.Serial(port=self.port, baudrate=115200, dsrdtr=0, rtscts=0)
|
fmt_str = '%(asctime)s - %(levelname)s # %(message)s'
|
||||||
self.ser.setDTR(0)
|
formatter = logging.Formatter(fmt_str)
|
||||||
self.ser.setRTS(0)
|
logging.basicConfig(filename=pytermdir + os.path.sep + date_str + '.log', level=logging.DEBUG, format=fmt_str)
|
||||||
|
ch = logging.StreamHandler()
|
||||||
|
ch.setLevel(logging.DEBUG)
|
||||||
|
|
||||||
# start serial->console thread
|
# create logger
|
||||||
receiver_thread = threading.Thread(target=reader, args=(self.ser,))
|
self.logger = logging.getLogger('')
|
||||||
receiver_thread.setDaemon(1)
|
self.logger.setLevel(logging.DEBUG)
|
||||||
receiver_thread.start()
|
|
||||||
|
|
||||||
def default(self, line):
|
# add formatter to ch
|
||||||
for tok in line.split(';'):
|
ch.setFormatter(formatter)
|
||||||
tok = self.get_alias(tok)
|
# add ch to logger
|
||||||
self.ser.write(tok.strip() + "\n")
|
self.logger.addHandler(ch)
|
||||||
|
|
||||||
def do_help(self, line):
|
|
||||||
self.ser.write("help\n")
|
|
||||||
|
|
||||||
def complete_date(self, text, line, begidx, endidm):
|
|
||||||
date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
|
||||||
return ["%s" % date]
|
|
||||||
|
|
||||||
def do_reset(self, line):
|
|
||||||
self.ser.setDTR(1)
|
|
||||||
self.ser.setRTS(1)
|
|
||||||
self.ser.setDTR(0)
|
|
||||||
self.ser.setRTS(0)
|
|
||||||
|
|
||||||
def do_exit(self, line):
|
|
||||||
readline.write_history_file()
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
def do_save(self, line):
|
|
||||||
if not self.config.has_section("general"):
|
|
||||||
self.config.add_section("general")
|
|
||||||
self.config.set("general", "port", self.port)
|
|
||||||
if len(self.aliases):
|
|
||||||
if not self.config.has_section("aliases"):
|
|
||||||
self.config.add_section("aliases")
|
|
||||||
for alias in self.aliases:
|
|
||||||
self.config.set("aliases", alias, self.aliases[alias])
|
|
||||||
|
|
||||||
with open(path.expanduser('~/.pyterm'), 'wb') as config_fd:
|
|
||||||
self.config.write(config_fd)
|
|
||||||
print("Config saved")
|
|
||||||
|
|
||||||
def do_show_config(self, line):
|
|
||||||
for key in self.__dict__:
|
|
||||||
print(str(key) + ": " + str(self.__dict__[key]))
|
|
||||||
|
|
||||||
def do_alias(self, line):
|
|
||||||
if line.endswith("list"):
|
|
||||||
for alias in self.aliases:
|
|
||||||
print("%s = %s" % (alias, self.aliases[alias]))
|
|
||||||
return
|
|
||||||
if not line.count("="):
|
|
||||||
sys.stderr.write("Usage: alias <ALIAS> = <CMD>\n")
|
|
||||||
return
|
|
||||||
self.aliases[line.split('=')[0].strip()] = line.split('=')[1].strip()
|
|
||||||
|
|
||||||
def do_rmalias(self, line):
|
|
||||||
if not self.aliases.pop(line, None):
|
|
||||||
sys.stderr.write("Alias not found")
|
|
||||||
|
|
||||||
def get_alias(self, tok):
|
|
||||||
for alias in self.aliases:
|
|
||||||
if tok.split()[0] == alias:
|
|
||||||
return self.aliases[alias] + tok[len(alias):]
|
|
||||||
return tok
|
|
||||||
|
|
||||||
def load_config(self):
|
|
||||||
self.config = ConfigParser.SafeConfigParser()
|
|
||||||
self.config.read([path.expanduser('~/.pyterm')])
|
|
||||||
|
|
||||||
for sec in self.config.sections():
|
|
||||||
if sec == "aliases":
|
|
||||||
for opt in self.config.options(sec):
|
|
||||||
self.aliases[opt] = self.config.get(sec, opt)
|
|
||||||
else:
|
|
||||||
for opt in self.config.options(sec):
|
|
||||||
if not self.__dict__.has_key(opt):
|
|
||||||
self.__dict__[opt] = self.config.get(sec, opt)
|
|
||||||
|
|
||||||
|
|
||||||
def reader(ser):
|
def preloop(self):
|
||||||
while (1):
|
if not self.port:
|
||||||
c = ser.read(1)
|
sys.stderr.write("No port specified!\n")
|
||||||
sys.stdout.write(c)
|
sys.exit(-1)
|
||||||
sys.stdout.flush()
|
self.ser = serial.Serial(port=self.port, baudrate=115200, dsrdtr=0, rtscts=0)
|
||||||
|
self.ser.setDTR(0)
|
||||||
|
self.ser.setRTS(0)
|
||||||
|
|
||||||
|
# start serial->console thread
|
||||||
|
receiver_thread = threading.Thread(target=reader, args=(self.ser,self.logger))
|
||||||
|
receiver_thread.setDaemon(1)
|
||||||
|
receiver_thread.start()
|
||||||
|
|
||||||
|
def default(self, line):
|
||||||
|
for tok in line.split(';'):
|
||||||
|
tok = self.get_alias(tok)
|
||||||
|
self.ser.write(tok.strip() + "\n")
|
||||||
|
|
||||||
|
def do_help(self, line):
|
||||||
|
self.ser.write("help\n")
|
||||||
|
|
||||||
|
def complete_date(self, text, line, begidx, endidm):
|
||||||
|
date = time.strftime("%Y-%m-%d %H:%M:%S")
|
||||||
|
return ["%s" % date]
|
||||||
|
|
||||||
|
def do_reset(self, line):
|
||||||
|
self.ser.setDTR(1)
|
||||||
|
self.ser.setDTR(0)
|
||||||
|
|
||||||
|
def do_exit(self, line):
|
||||||
|
readline.write_history_file()
|
||||||
|
sys.exit(0)
|
||||||
|
|
||||||
|
def do_save(self, line):
|
||||||
|
if not self.config.has_section("general"):
|
||||||
|
self.config.add_section("general")
|
||||||
|
self.config.set("general", "port", self.port)
|
||||||
|
if len(self.aliases):
|
||||||
|
if not self.config.has_section("aliases"):
|
||||||
|
self.config.add_section("aliases")
|
||||||
|
for alias in self.aliases:
|
||||||
|
self.config.set("aliases", alias, self.aliases[alias])
|
||||||
|
|
||||||
|
with open(path.expanduser('~/.pyterm'), 'wb') as config_fd:
|
||||||
|
self.config.write(config_fd)
|
||||||
|
print("Config saved")
|
||||||
|
|
||||||
|
def do_show_config(self, line):
|
||||||
|
for key in self.__dict__:
|
||||||
|
print(str(key) + ": " + str(self.__dict__[key]))
|
||||||
|
|
||||||
|
def do_alias(self, line):
|
||||||
|
if line.endswith("list"):
|
||||||
|
for alias in self.aliases:
|
||||||
|
print("%s = %s" % (alias, self.aliases[alias]))
|
||||||
|
return
|
||||||
|
if not line.count("="):
|
||||||
|
sys.stderr.write("Usage: alias <ALIAS> = <CMD>\n")
|
||||||
|
return
|
||||||
|
self.aliases[line.split('=')[0].strip()] = line.split('=')[1].strip()
|
||||||
|
|
||||||
|
def do_rmalias(self, line):
|
||||||
|
if not self.aliases.pop(line, None):
|
||||||
|
sys.stderr.write("Alias not found")
|
||||||
|
|
||||||
|
def get_alias(self, tok):
|
||||||
|
for alias in self.aliases:
|
||||||
|
if tok.split()[0] == alias:
|
||||||
|
return self.aliases[alias] + tok[len(alias):]
|
||||||
|
return tok
|
||||||
|
|
||||||
|
def load_config(self):
|
||||||
|
self.config = ConfigParser.SafeConfigParser()
|
||||||
|
self.config.read([pytermdir + os.path.sep + 'pyterm.conf'])
|
||||||
|
|
||||||
|
for sec in self.config.sections():
|
||||||
|
if sec == "aliases":
|
||||||
|
for opt in self.config.options(sec):
|
||||||
|
self.aliases[opt] = self.config.get(sec, opt)
|
||||||
|
else:
|
||||||
|
for opt in self.config.options(sec):
|
||||||
|
if not self.__dict__.has_key(opt):
|
||||||
|
self.__dict__[opt] = self.config.get(sec, opt)
|
||||||
|
|
||||||
|
|
||||||
|
def reader(ser, logger):
|
||||||
|
output = ""
|
||||||
|
while (1):
|
||||||
|
c = ser.read(1)
|
||||||
|
if c == '\n' or c == '\r':
|
||||||
|
logger.info(output)
|
||||||
|
output = ""
|
||||||
|
else:
|
||||||
|
output += c
|
||||||
|
#sys.stdout.write(c)
|
||||||
|
#sys.stdout.flush()
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
if (len(sys.argv) > 1):
|
if not os.path.exists(pytermdir):
|
||||||
port = sys.argv[1]
|
os.makedirs(pytermdir)
|
||||||
else:
|
|
||||||
port = None
|
|
||||||
|
|
||||||
myshell = SerCmd(port)
|
if (len(sys.argv) > 1):
|
||||||
myshell.prompt = ''
|
port = sys.argv[1]
|
||||||
|
else:
|
||||||
|
port = None
|
||||||
|
|
||||||
myshell.cmdloop("Welcome to pyterm")
|
myshell = SerCmd(port)
|
||||||
|
myshell.prompt = ''
|
||||||
|
|
||||||
|
myshell.cmdloop("Welcome to pyterm")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user