Rename CONFIG_EXAMPLES_NXCONSOLE to CONFIG_EXAMPLES_NXTERM; rename CONFIG_NXWM_NXCONSOLE to CONFIG_NXWM_NXTERM

NxWidgets/Kconfig

@@ -677,16 +677,16 @@ endmenu # Start Window Configuration
 
 menu "NxConsole Window Settings"
 
-config NXWM_NXCONSOLE
+config NXWM_NXTERM
 	bool "NxConsole Window"
 	default y
 	---help---
 		Enable support for the NxConsole window which provides a text window
 		in which you can interact with NSH.
 
-if NXWM_NXCONSOLE
+if NXWM_NXTERM
 
-config NXWM_NXCONSOLE_PRIO
+config NXWM_NXTERM_PRIO
 	int "NxConsole Task Priority"
 	default 100
 	---help---
@@ -696,14 +696,14 @@ config NXWM_NXCONSOLE_PRIO
 		else there may be data overrun errors. Such errors would most likely
 		appear as duplicated rows of data on the display.
 
-config NXWM_NXCONSOLE_STACKSIZE
+config NXWM_NXTERM_STACKSIZE
 	int "NxConsole Task Stack Size"
 	default 2048
 	---help---
 		The stack size to use when starting the NxConsole task.  Default:
 		2048 bytes.
 
-config NXWM_NXCONSOLE_CUSTOM_COLORS
+config NXWM_NXTERM_CUSTOM_COLORS
 	bool "Custom NxConsole Colors"
 	default n
 	---help---
@@ -712,55 +712,55 @@ config NXWM_NXCONSOLE_CUSTOM_COLORS
 		(there are no default colors because the hexadecimal representation
 		of the default colors depend on the pixel depth). Default: n
 
-if NXWM_NXCONSOLE_CUSTOM_COLORS
+if NXWM_NXTERM_CUSTOM_COLORS
 
-config NXWM_NXCONSOLE_WCOLOR
+config NXWM_NXTERM_WCOLOR
 	hex "NxConsole Background Color"
 	---help---
 		The color of the NxConsole window background. Default:
 		RGB(192,192,192)
 
-config NXWM_NXCONSOLE_FONTCOLOR
+config NXWM_NXTERM_FONTCOLOR
 	hex "NxConsole Font Color"
 	---help---
 		The color of the fonts to use in the NxConsole window.
 		Default: RGB(0,0,0)
 
-endif # NXWM_NXCONSOLE_CUSTOM_COLORS
+endif # NXWM_NXTERM_CUSTOM_COLORS
 
-config NXWM_NXCONSOLE_CUSTOM_FONTID
+config NXWM_NXTERM_CUSTOM_FONTID
 	bool "Use Custom Default Font"
 	default n
 	---help---
 		Set to override the NxWM default font id (NXWM_DEFAULT_FONTID).
 
-if NXWM_NXCONSOLE_CUSTOM_FONTID
+if NXWM_NXTERM_CUSTOM_FONTID
 
-config NXWM_NXCONSOLE_FONTID
+config NXWM_NXTERM_FONTID
 	int "NxConsole Font ID"
 	default 0
 	---help---
 		Use this default font ID in the NxConsole window instead of the
 		NxWM font ID (NXWM_DEFAULT_FONTID).  Default: 0
 
-endif # NXWM_NXCONSOLE_CUSTOM_FONTID
+endif # NXWM_NXTERM_CUSTOM_FONTID
 
-config NXWM_CUSTOM_NXCONSOLE_ICON
+config NXWM_CUSTOM_NXTERM_ICON
 	bool "Custom NxConsole Icon"
 	default n
 	---help---
 		Select to override the default NxConsole Window Icon: NxWM::g_cmdBitmap
 
-if NXWM_CUSTOM_NXCONSOLE_ICON
+if NXWM_CUSTOM_NXTERM_ICON
 
-config NXWM_NXCONSOLE_ICON
+config NXWM_NXTERM_ICON
 	string "NxConsole Icon"
 	default "NxWM::g_cmdBitmap"
 	---help---
 		The glyph to use as the NxConsole icon.  Default: NxWM::g_cmdBitmap
 
-endif # NXWM_NXCONSOLE_ICON
+endif # NXWM_NXTERM_ICON
-endif # NXWM_NXCONSOLE
+endif # NXWM_NXTERM
 endmenu # NxConsole Window Settings
 
 menu "NxWM Touchscreen Configuration"

examples/Make.defs

@@ -154,7 +154,7 @@ ifeq ($(CONFIG_EXAMPLES_NX),y)
 CONFIGURED_APPS += examples/nx
 endif
 
-ifeq ($(CONFIG_EXAMPLES_NXCONSOLE),y)
+ifeq ($(CONFIG_EXAMPLES_NXTERM),y)
 CONFIGURED_APPS += examples/nxconsole
 endif
 

examples/README.txt

@@ -864,9 +864,9 @@ examples/nxconsole
     CONFIG_EXAMPLES_NXCON_DEVNAME -- The quoated, full path to the
       NX console device corresponding to CONFIG_EXAMPLES_NXCON_MINOR.
       Default: "/dev/nxcon0"
-    CONFIG_EXAMPLES_NXCONSOLE_PRIO - Priority of the NxConsole task.
+    CONFIG_EXAMPLES_NXTERM_PRIO - Priority of the NxConsole task.
       Default: SCHED_PRIORITY_DEFAULT
-    CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE - Stack size allocated for the
+    CONFIG_EXAMPLES_NXTERM_STACKSIZE - Stack size allocated for the
       NxConsole task. Default: 2048
 
   The following configuration settings determine how to set up the NX

examples/nxconsole/Kconfig

@@ -3,11 +3,11 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config EXAMPLES_NXCONSOLE
+config EXAMPLES_NXTERM
 	bool "NxConsole example"
 	default n
 	---help---
 		Enable the NxConsole example
 
-if EXAMPLES_NXCONSOLE
+if EXAMPLES_NXTERM
 endif

examples/nxconsole/nxcon_internal.h

@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __EXAMPLES_NXCONSOLE_NXCON_INTERNAL_H
+#ifndef __EXAMPLES_NXTERM_NXCON_INTERNAL_H
-#define __EXAMPLES_NXCONSOLE_NXCON_INTERNAL_H
+#define __EXAMPLES_NXTERM_NXCON_INTERNAL_H
 
 /****************************************************************************
  * Included Files
@@ -227,12 +227,12 @@
 
 /* NxConsole task */
 
-#ifndef CONFIG_EXAMPLES_NXCONSOLE_PRIO
+#ifndef CONFIG_EXAMPLES_NXTERM_PRIO
-#  define CONFIG_EXAMPLES_NXCONSOLE_PRIO SCHED_PRIORITY_DEFAULT
+#  define CONFIG_EXAMPLES_NXTERM_PRIO SCHED_PRIORITY_DEFAULT
 #endif
 
-#ifndef CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE
+#ifndef CONFIG_EXAMPLES_NXTERM_STACKSIZE
-#  define CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE 2048
+#  define CONFIG_EXAMPLES_NXTERM_STACKSIZE 2048
 #endif
 
 /* Debug ********************************************************************/
@@ -307,4 +307,4 @@ extern FAR NX_DRIVERTYPE *up_nxdrvinit(unsigned int devno);
 extern int nxcon_server(int argc, char *argv[]);
 extern FAR void *nxcon_listener(FAR void *arg);
 
-#endif /* __EXAMPLES_NXCONSOLE_NXCON_INTERNAL_H */
+#endif /* __EXAMPLES_NXTERM_NXCON_INTERNAL_H */

examples/nxconsole/nxcon_main.c

@@ -393,8 +393,8 @@ int nxcon_main(int argc, char **argv)
     * from this task.
     */
 
-   g_nxcon_vars.pid = task_create("NxConsole", CONFIG_EXAMPLES_NXCONSOLE_PRIO,
+   g_nxcon_vars.pid = task_create("NxConsole", CONFIG_EXAMPLES_NXTERM_PRIO,
-                                  CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE,
+                                  CONFIG_EXAMPLES_NXTERM_STACKSIZE,
                                   nxcon_task, NULL);
    ASSERT(g_nxcon_vars.pid > 0);
    return EXIT_SUCCESS;