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

Merge #19444

Browse Source 
19444: makefiles/tools/serial.inc.mk: Handle new miniterm versions r=maribu a=MrKevinWeiss



### Contribution description

While testing examples/micropython I notice that the default of miniterm.py is actually miniterm. To simplify user setups, this checks for miniterm.py first then falls back to miniterm.

### Testing procedure

Take any board with any newish version of Ubuntu and run
```
make -C flash test examples/micropython
```

If you have `miniterm.py` in `PATH` or if it is `miniterm` both should work.

### Issues/PRs references



Co-authored-by: MrKevinWeiss <weiss.kevin604@gmail.com>
This commit is contained in:
bors[bot] 2023-04-04 10:59:16 +00:00 committed by GitHub
commit d6dc3a1603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makefiles/tools/serial.inc.mk
View File

@ -53,7 +53,13 @@ else ifeq ($(RIOT_TERMINAL),picocom)
TERMPROG ?= picocom TERMPROG ?= picocom
TERMFLAGS ?= --nolock --imap lfcrlf --baud "$(BAUD)" "$(PORT)" TERMFLAGS ?= --nolock --imap lfcrlf --baud "$(BAUD)" "$(PORT)"
else ifeq ($(RIOT_TERMINAL),miniterm) else ifeq ($(RIOT_TERMINAL),miniterm)
TERMPROG ?= miniterm.py # Check if miniterm.py is available in the path, if not use just miniterm
# since new versions will only have miniterm and not miniterm.py
ifeq (,$(shell command -v miniterm.py 2>/dev/null))
TERMPROG ?= miniterm
else
TERMPROG ?= miniterm.py
endif
# The RIOT shell will still transmit back a CRLF, but at least with --eol LF # The RIOT shell will still transmit back a CRLF, but at least with --eol LF
# we avoid sending two lines on every "enter". # we avoid sending two lines on every "enter".
TERMFLAGS ?= --eol LF "$(PORT)" "$(BAUD)" $(MINITERMFLAGS) TERMFLAGS ?= --eol LF "$(PORT)" "$(BAUD)" $(MINITERMFLAGS)