RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #17853 from fjmolinas/pr_z1_socat

Browse Source 
makefiles: socat set tty mode 8N1
This commit is contained in:
Francisco 2022-03-29 10:29:47 +02:00 committed by GitHub
commit 4f3d7c9e1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/tools/goodfet/goodfet.bsl vendored
View File

@ -329,6 +329,8 @@ class LowLevel:
if DEBUG > 1: sys.stderr.write("* comDone()") if DEBUG > 1: sys.stderr.write("* comDone()")
self.SetRSTpin(1) #disable power self.SetRSTpin(1) #disable power
self.SetTESTpin(0) #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() self.serialport.close()
def comRxHeader(self): def comRxHeader(self):

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

@ -25,7 +25,7 @@ ifeq ($(RIOT_TERMINAL),pyterm)
else ifeq ($(RIOT_TERMINAL),socat) else ifeq ($(RIOT_TERMINAL),socat)
SOCAT_OUTPUT ?= - SOCAT_OUTPUT ?= -
TERMPROG ?= $(RIOT_TERMINAL) 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) else ifeq ($(RIOT_TERMINAL),picocom)
TERMPROG ?= picocom TERMPROG ?= picocom
TERMFLAGS ?= --nolock --imap lfcrlf --baud "$(BAUD)" "$(PORT)" TERMFLAGS ?= --nolock --imap lfcrlf --baud "$(BAUD)" "$(PORT)"

5
tests/shell/Makefile
View File

@ -6,11 +6,6 @@ USEMODULE += shell
USEMODULE += shell_commands USEMODULE += shell_commands
USEMODULE += ps 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. # Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat RIOT_TERMINAL ?= socat

5
tests/shell_ble/Makefile
View File

@ -15,11 +15,6 @@ TESTRUNNER_SHELL_SKIP_REBOOT = 1
TESTRUNNER_RESET_BOARD_ON_STARTUP = 0 TESTRUNNER_RESET_BOARD_ON_STARTUP = 0
ifneq (,$(filter term,$(MAKECMDGOALS))) 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. # Use a terminal that does not introduce extra characters into the stream.
RIOT_TERMINAL ?= socat RIOT_TERMINAL ?= socat
else ifneq (,$(filter test,$(MAKECMDGOALS))) else ifneq (,$(filter test,$(MAKECMDGOALS)))