RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

pyterm: native: remove superfluous tap argument

Browse Source
This commit is contained in:
Oleg Hahm 2023-12-18 20:00:08 +01:00
parent 075f2ffd6a
commit dd184614d8
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
boards/native/Makefile.include
View File

@ -102,6 +102,12 @@ LINKFLAGS += -ffunction-sections
# set the tap interface for term/valgrind # set the tap interface for term/valgrind
PORT ?= tap0 PORT ?= tap0
ifeq (native,$(RIOT_TERMINAL))
TERMFLAGS += $(PORT)
else
TERMFLAGS += --process-args $(PORT)
endif
# Configure default eeprom file # Configure default eeprom file
EEPROM_FILE ?= $(BINDIR)/native.eeprom EEPROM_FILE ?= $(BINDIR)/native.eeprom
@ -120,7 +126,6 @@ ifneq (,$(filter periph_can,$(FEATURES_USED)))
TERMFLAGS += $(PERIPH_CAN_FLAGS) TERMFLAGS += $(PERIPH_CAN_FLAGS)
endif endif
TERMFLAGS += $(PORT)
ASFLAGS = ASFLAGS =
ifeq ($(shell basename $(DEBUGGER)),lldb) ifeq ($(shell basename $(DEBUGGER)),lldb)

20
dist/tools/pyterm/pyterm vendored
View File

@ -111,9 +111,9 @@ class SerCmd(cmd.Cmd):
def __init__(self, port=None, baudrate=None, toggle=None, def __init__(self, port=None, baudrate=None, toggle=None,
tcp_serial=None, process=None, process_args=None, tcp_serial=None, process=None, process_args=None,
process_tap=None, confdir=None, conffile=None, host=None, confdir=None, conffile=None, host=None, run_name=None,
run_name=None, log_dir_name=None, newline=None, log_dir_name=None, newline=None, formatter=None, set_rts=None,
formatter=None, set_rts=None, set_dtr=None, serprompt=None, set_dtr=None, serprompt=None,
repeat_command_on_empty_line=defaultrepeat_cmd_empty_line, repeat_command_on_empty_line=defaultrepeat_cmd_empty_line,
reconnect=defaultreconnect): reconnect=defaultreconnect):
"""Constructor. """Constructor.
@ -124,7 +124,6 @@ class SerCmd(cmd.Cmd):
tcp_serial (iht): TCP port to connect to (alterprocessly) tcp_serial (iht): TCP port to connect to (alterprocessly)
process (str): Program to run as subprocess and connect to its I/O process (str): Program to run as subprocess and connect to its I/O
process_args (str): Optional arguments for the subprocess process_args (str): Optional arguments for the subprocess
process_tap (str): TAP interface to pass to process
confdir (str): configuration directory confdir (str): configuration directory
conffile (str): configuration file name conffile (str): configuration file name
host (str): local host name host (str): local host name
@ -148,7 +147,6 @@ class SerCmd(cmd.Cmd):
for substr in elem.split(' '): for substr in elem.split(' '):
substr = substr.replace('\\-\\-', '--') substr = substr.replace('\\-\\-', '--')
self.process_args.append(substr) self.process_args.append(substr)
self.process_tap = process_tap
self.configdir = confdir self.configdir = confdir
self.configfile = conffile self.configfile = conffile
self.host = host self.host = host
@ -274,7 +272,7 @@ class SerCmd(cmd.Cmd):
"localhost:%s" % self.tcp_serial) "localhost:%s" % self.tcp_serial)
sys.exit(1) sys.exit(1)
elif self.process: elif self.process:
process_call = [self.process] + self.process_tap + self.process_args process_call = [self.process] + self.process_args
self.logger.debug("Executing process as %s", str(process_call)) self.logger.debug("Executing process as %s", str(process_call))
self.ser = Popen(process_call, stdout=PIPE, stdin=PIPE, stderr=PIPE) self.ser = Popen(process_call, stdout=PIPE, stdin=PIPE, stderr=PIPE)
# otherwise go for the serial port # otherwise go for the serial port
@ -931,7 +929,6 @@ if __name__ == "__main__":
action="store_false", action="store_false",
help="Do not try to reconnect when failing on " help="Do not try to reconnect when failing on "
"connection setup (Default)") "connection setup (Default)")
parser.add_argument("process_tap", nargs='*')
parser.set_defaults( parser.set_defaults(
repeat_command_on_empty_line=defaultrepeat_cmd_empty_line, repeat_command_on_empty_line=defaultrepeat_cmd_empty_line,
@ -942,11 +939,10 @@ if __name__ == "__main__":
if args.noprefix: if args.noprefix:
args.format = "" args.format = ""
myshell = SerCmd(args.port, args.baudrate, args.toggle, args.tcp_serial, myshell = SerCmd(args.port, args.baudrate, args.toggle, args.tcp_serial,
args.process, args.process_args, args.process_tap, args.process, args.process_args, args.directory,
args.directory, args.config, args.host, args.run_name, args.config, args.host, args.run_name, args.log_dir_name,
args.log_dir_name, args.newline, args.format, args.newline, args.format, args.set_rts, args.set_dtr,
args.set_rts, args.set_dtr, args.prompt, args.prompt, args.repeat_command_on_empty_line)
args.repeat_command_on_empty_line)
myshell.prompt = '' myshell.prompt = ''
try: try: