Convert configs/stm32f4discovery/nxlines to use Kconfig tool

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5320 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 80 insertions, 8 deletions

diff --git a/apps/examples/Makefile b/apps/examples/Makefile
index 8e058998f..2ab3cf05c 100644
--- a/apps/examples/Makefile
+++ b/apps/examples/Makefile
@@ -58,7 +58,7 @@ CNTXTDIRS = pwm
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 CNTXTDIRS += adc can cdcacm composite cxxtestdhcpd discover ftpd json
-CNTXTDIRS += modbus nettest relays qencoder telnetd watchdog wgetjson
+CNTXTDIRS += modbus nettest nxlines relays qencoder telnetd watchdog wgetjson
 endif
 
 ifeq ($(CONFIG_EXAMPLES_HELLO_BUILTIN),y)
@@ -79,9 +79,6 @@ endif
 ifeq ($(CONFIG_EXAMPLES_NXIMAGE_BUILTIN),y)
 CNTXTDIRS += nximage
 endif
-ifeq ($(CONFIG_EXAMPLES_LINES_BUILTIN),y)
-CNTXTDIRS += nxlines
-endif
 ifeq ($(CONFIG_EXAMPLES_NXTEXT_BUILTIN),y)
 CNTXTDIRS += nxtext
 endif
diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 3ee1abcf6..1463b0253 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -941,8 +941,6 @@ examplex/nxlines
 
   The following configuration options can be selected:
 
-    CONFIG_EXAMPLES_NXLINES_BUILTIN -- Build the NXLINES example as a "built-in"
-      that can be executed from the NSH command line    
     CONFIG_EXAMPLES_NXLINES_VPLANE -- The plane to select from the frame-
       buffer driver for use in the test.  Default: 0
     CONFIG_EXAMPLES_NXLINES_DEVNO - The LCD device to select from the LCD
@@ -980,6 +978,9 @@ examplex/nxlines
       FAR struct fb_vtable_s *up_nxdrvinit(unsigned int devno);
       #endif
 
+    CONFIG_NSH_BUILTIN_APPS - Build the NX lines examples as an NSH built-in
+      function.
+
 examples/nxtext
 ^^^^^^^^^^^^^^^
 
diff --git a/apps/examples/nxlines/Kconfig b/apps/examples/nxlines/Kconfig
index 5d18e00e0..af1286a4f 100644
--- a/apps/examples/nxlines/Kconfig
+++ b/apps/examples/nxlines/Kconfig
@@ -10,4 +10,78 @@ config EXAMPLES_NXLINES
 		Enable the X graphics lines example
 
 if EXAMPLES_NXLINES
+
+config EXAMPLES_NXLINES_VPLANE
+	int "Graphics Plane"
+	default 0
+	---help---
+		The plane to select from the frame-buffer driver for use in the test.  Default: 0
+
+config EXAMPLES_NXLINES_DEVNO
+	int "Graphics Device Number"
+	default 0
+	---help---
+		The LCD device to select from the LCD driver for use in the test: Default: 0
+
+config EXAMPLES_NXLINES_BGCOLOR
+	hex "Background Color"
+	default 0x00
+	---help---
+		The color of the background.  Default depends on EXAMPLES_NXLINES_BPP.
+
+config EXAMPLES_NXLINES_LINEWIDTH
+	int "Line Width"
+	default 16
+	---help---
+		Selects the width of the lines in pixels (default: 16)
+
+config EXAMPLES_NXLINES_LINECOLOR
+	hex "Line Color"
+	default 0x00
+	---help---
+		The color of the central lines drawn in the background window. Default
+		depends on EXAMPLES_NXLINES_BPP (there really is no meaningful default).
+
+config EXAMPLES_NXLINES_BORDERWIDTH
+	int "Border Width"
+	default 16
+	---help---
+		The width of the circular border drawn in the background window. (default: 16).
+
+config EXAMPLES_NXLINES_BORDERCOLOR
+	hex "Border Color"
+	default 0x00
+	---help---
+		The color of the circular border drawn in the background window. Default
+		depends on EXAMPLES_NXLINES_BPP (there really is no meaningful default).
+
+config EXAMPLES_NXLINES_CIRCLECOLOR
+	hex "Circle Color"
+	default 0x00
+	---help---
+		The color of the circular region filled in the background window. Default
+		depends on EXAMPLES_NXLINES_BPP (there really is no meaningful default).
+
+config EXAMPLES_NXLINES_BPP
+	int "Bits Per Pixel"
+	default 8
+	---help---
+		Pixels per pixel to use.  Valid options include 2, 4, 8, 16, 24, and 32.
+		Default is 16.
+
+config EXAMPLES_NXLINES_EXTERNINIT
+	bool "External Device Initialization"
+	default false
+	---help---
+		The driver for the graphics device on this platform requires some unusual
+		initialization.  This is the for, for example, SPI LCD/OLED devices.  If
+		this configuration is selected, then the platform code must provide an LCD
+		initialization function with a prototype like:
+
+		#ifdef NX_LCDDRIVER
+		FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno);
+		#else
+		FAR struct fb_vtable_s *up_nxdrvinit(unsigned int devno);
+		#endif
+
 endif
diff --git a/apps/examples/nxlines/Makefile b/apps/examples/nxlines/Makefile
index d6ddcf0b1..e69ce6c0d 100644
--- a/apps/examples/nxlines/Makefile
+++ b/apps/examples/nxlines/Makefile
@@ -82,7 +82,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 .context:
-ifeq ($(CONFIG_EXAMPLES_NXLINES_BUILTIN),y)
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 	@touch $@
 endif
diff --git a/apps/examples/nxlines/nxlines_bkgd.c b/apps/examples/nxlines/nxlines_bkgd.c
index 4c09519ed..9dd785605 100644
--- a/apps/examples/nxlines/nxlines_bkgd.c
+++ b/apps/examples/nxlines/nxlines_bkgd.c
@@ -316,7 +316,7 @@ void nxlines_test(NXWINDOW hwnd)
 
       if (angle > (31 *  (2 * b16PI) / 32))
         {
-#ifdef CONFIG_EXAMPLES_NXLINES_BUILTIN
+#ifdef CONFIG_NSH_BUILTIN_APPS
           /* If this example was built as an NSH add-on, then exit after we
            * have gone all the way around once.
            */