summaryrefslogtreecommitdiff
path: root/apps/examples
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-20 14:18:08 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-20 14:18:08 -0600
commit4860036d8f145187cfe700743def8d0ee3548f1b (patch)
treedf2196f51b1ee2be9f6986f54da4f6056a5ebfd0 /apps/examples
parent29268dcf2e63a5b3b2d9d8d9f56215819e9e3970 (diff)
downloadpx4-nuttx-4860036d8f145187cfe700743def8d0ee3548f1b.tar.gz
px4-nuttx-4860036d8f145187cfe700743def8d0ee3548f1b.tar.bz2
px4-nuttx-4860036d8f145187cfe700743def8d0ee3548f1b.zip
Rename CONFIG_NXCONSOLE* to CONFIG_NXTERM*
Diffstat (limited to 'apps/examples')
-rw-r--r--apps/examples/README.txt2
-rw-r--r--apps/examples/nxconsole/nxcon_internal.h6
-rw-r--r--apps/examples/nxtext/nxtext_internal.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 29219daaf..2db5a1611 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -818,7 +818,7 @@ examples/nxconsole
an NX winbdow. Prerequisite configuration settings for this test include:
CONFIG_NX=y -- NX graphics must be enabled
- CONFIG_NXCONSOLE=y -- The NX console driver must be built
+ CONFIG_NXTERM=y -- The NX console driver must be built
CONFIG_NX_MULTIUSER=y -- NX multi-user support must be enabled.
CONFIG_DISABLE_MQUEUE=n -- Message queue support must be available.
CONFIG_DISABLE_SIGNALS=n -- Signals are needed
diff --git a/apps/examples/nxconsole/nxcon_internal.h b/apps/examples/nxconsole/nxcon_internal.h
index 02d84d025..6dd51e47d 100644
--- a/apps/examples/nxconsole/nxcon_internal.h
+++ b/apps/examples/nxconsole/nxcon_internal.h
@@ -65,8 +65,8 @@
/* Can't do the NxConsole example if the NxConsole driver is not built */
-#ifndef CONFIG_NXCONSOLE
-# error "NxConsole is not enabled (CONFIG_NXCONSOLE=y)"
+#ifndef CONFIG_NXTERM
+# error "NxConsole is not enabled (CONFIG_NXTERM=y)"
#endif
/* NxConsole requires NX Multi-user mode */
@@ -111,7 +111,7 @@
# elif !defined(CONFIG_NX_DISABLE_16BPP)
# define CONFIG_EXAMPLES_NXCON_BPP 16
//#elif !defined(CONFIG_NX_DISABLE_24BPP)
-//# define CONFIG_NXCONSOLE_BPP 24
+//# define CONFIG_NXTERM_BPP 24
# elif !defined(CONFIG_NX_DISABLE_32BPP)
# define CONFIG_EXAMPLES_NXCON_BPP 32
# else
diff --git a/apps/examples/nxtext/nxtext_internal.h b/apps/examples/nxtext/nxtext_internal.h
index 1e64193a3..445809607 100644
--- a/apps/examples/nxtext/nxtext_internal.h
+++ b/apps/examples/nxtext/nxtext_internal.h
@@ -78,7 +78,7 @@
# elif !defined(CONFIG_NX_DISABLE_16BPP)
# define CONFIG_EXAMPLES_NXTEXT_BPP 16
//#elif !defined(CONFIG_NX_DISABLE_24BPP)
-//# define CONFIG_NXCONSOLE_BPP 24
+//# define CONFIG_NXTERM_BPP 24
# elif !defined(CONFIG_NX_DISABLE_32BPP)
# define CONFIG_EXAMPLES_NXTEXT_BPP 32
# else