Merged altconsole into master

This commit is contained in:
GregoryN
2018-12-08 18:53:54 -06:00
parent c8a252d4ed
commit 3bf4b6d245
30 changed files with 533 additions and 515 deletions

View File

@@ -47,8 +47,8 @@
#include "nsh.h"
#include "nsh_console.h"
#if !defined(HAVE_USB_CONSOLE) && !defined(HAVE_USB_KEYBOARD) && \
!defined(HAVE_SLCD_CONSOLE)
#if !defined(CONFIG_NSH_ALTCONDEV) && !defined(HAVE_USB_CONSOLE) && \
!defined(HAVE_USB_KEYBOARD)
/****************************************************************************
* Public Functions