mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
Merge pull request #17853 from fjmolinas/pr_z1_socat
makefiles: socat set tty mode 8N1
This commit is contained in:
commit
4f3d7c9e1f
2
dist/tools/goodfet/goodfet.bsl
vendored
2
dist/tools/goodfet/goodfet.bsl
vendored
@ -329,6 +329,8 @@ class LowLevel:
|
||||
if DEBUG > 1: sys.stderr.write("* comDone()")
|
||||
self.SetRSTpin(1) #disable power
|
||||
self.SetTESTpin(0) #disable power
|
||||
self.serialport.parity = serial.PARITY_NONE #set non parity mode
|
||||
self.serialport.timeout = 0 #set no timeout
|
||||
self.serialport.close()
|
||||
|
||||
def comRxHeader(self):
|
||||
|
@ -25,7 +25,7 @@ ifeq ($(RIOT_TERMINAL),pyterm)
|
||||
else ifeq ($(RIOT_TERMINAL),socat)
|
||||
SOCAT_OUTPUT ?= -
|
||||
TERMPROG ?= $(RIOT_TERMINAL)
|
||||
TERMFLAGS ?= $(SOCAT_OUTPUT) open:$(PORT),b$(BAUD),echo=0,raw
|
||||
TERMFLAGS ?= $(SOCAT_OUTPUT) open:$(PORT),b$(BAUD),echo=0,raw,cs8,parenb=0,cstopb=0
|
||||
else ifeq ($(RIOT_TERMINAL),picocom)
|
||||
TERMPROG ?= picocom
|
||||
TERMFLAGS ?= --nolock --imap lfcrlf --baud "$(BAUD)" "$(PORT)"
|
||||
|
@ -6,11 +6,6 @@ USEMODULE += shell
|
||||
USEMODULE += shell_commands
|
||||
USEMODULE += ps
|
||||
|
||||
# for z1, socat doesn't work (unknown reason)
|
||||
ifeq (z1, $(BOARD))
|
||||
RIOT_TERMINAL ?= pyterm
|
||||
endif
|
||||
|
||||
# Use a terminal that does not introduce extra characters into the stream.
|
||||
RIOT_TERMINAL ?= socat
|
||||
|
||||
|
@ -15,11 +15,6 @@ TESTRUNNER_SHELL_SKIP_REBOOT = 1
|
||||
TESTRUNNER_RESET_BOARD_ON_STARTUP = 0
|
||||
|
||||
ifneq (,$(filter term,$(MAKECMDGOALS)))
|
||||
# for z1, socat doesn't work (unknown reason)
|
||||
ifeq (z1, $(BOARD))
|
||||
RIOT_TERMINAL ?= pyterm
|
||||
endif
|
||||
|
||||
# Use a terminal that does not introduce extra characters into the stream.
|
||||
RIOT_TERMINAL ?= socat
|
||||
else ifneq (,$(filter test,$(MAKECMDGOALS)))
|
||||
|
Loading…
Reference in New Issue
Block a user