Merge pull request #11598 from aabadie/pr/missing_stdio_uart_rx

Add stdin pseudo module and set it as dependency for applications using getchar
RIOT-OS · Jun 20, 2019 · 14d9f54 · 14d9f54
2 parents d47ac80 + 9c7a1e6
commit 14d9f54
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 0 deletions.
diff --git a/Makefile.dep b/Makefile.dep
@@ -398,6 +398,10 @@ ifneq (,$(filter stdio_rtt,$(USEMODULE)))
 endif
 
 ifneq (,$(filter shell,$(USEMODULE)))
+  USEMODULE += stdin
+endif
+
+ifneq (,$(filter stdin,$(USEMODULE)))
   ifneq (,$(filter stdio_uart,$(USEMODULE)))
     USEMODULE += stdio_uart_rx
   endif

diff --git a/dist/tools/nrf52_resetpin_cfg/Makefile b/dist/tools/nrf52_resetpin_cfg/Makefile
@@ -5,6 +5,9 @@ APPLICATION = nrf52_resetpin_cfg
 BOARD ?= nrf52dk
 RIOTBASE ?= $(CURDIR)/../../..
 
+# This application uses getchar and thus expects input from stdio
+USEMODULE += stdin
+
 # the RESET_PIN environment variable allows for manually specifying the reset
 # pin that is programmed. Below this Makefile already contains the specific pins
 # for some known platforms

diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk
@@ -73,6 +73,7 @@ PSEUDOMODULES += sock
 PSEUDOMODULES += sock_ip
 PSEUDOMODULES += sock_tcp
 PSEUDOMODULES += sock_udp
+PSEUDOMODULES += stdin
 PSEUDOMODULES += stdio_uart_rx
 
 # print ascii representation in function od_hex_dump()

diff --git a/sys/include/stdio_uart.h b/sys/include/stdio_uart.h
@@ -13,6 +13,12 @@
  *
  * @brief       Standard input/output backend using UART
  *
+ * @warning Standard input is disabled by default on UART. To enable it, load
+ *          the `stdin` module in your application:
+ * ```
+ * USEMODULE += stdin
+ * ```
+ *
  * @{
  * @file
  *

diff --git a/tests/lua_loader/Makefile b/tests/lua_loader/Makefile
@@ -2,6 +2,9 @@ include ../Makefile.tests_common
 
 USEPKG += lua
 
+# This application uses getchar and thus expects input from stdio
+USEMODULE += stdin
+
 BOARD_WHITELIST += native samr21-xpro
 
 ifneq ($(BOARD),native)

diff --git a/tests/posix_time/Makefile b/tests/posix_time/Makefile
@@ -2,6 +2,9 @@ include ../Makefile.tests_common
 
 USEMODULE += posix_time
 
+# This application uses getchar and thus expects input from stdio
+USEMODULE += stdin
+
 TEST_ON_CI_WHITELIST += all
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/xtimer_usleep/Makefile b/tests/xtimer_usleep/Makefile
@@ -5,6 +5,9 @@ USEMODULE += xtimer
 # This test randomly fails on `native` so disable it from CI
 TEST_ON_CI_WHITELIST += samr21-xpro
 
+# This application uses getchar and thus expects input from stdio
+USEMODULE += stdin
+
 # Port and pin configuration for probing with oscilloscope
 # Port number should be found in port enum e.g in cpu/include/periph_cpu.h
 #FEATURES_REQUIRED += periph_gpio