Several bugfixes contributed by Petteri Aimonen

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

ChangeLog.txt

@@ -375,3 +375,8 @@
 	* apps/nshlib/nsh_netcmds.c:  The ping command now passes a maximum round
 	  trip time to uip_icmpping().  This allows pinging of hosts on complex
 	  networks where the ICMP ECHO round trip time may exceed the ping interval.
+	* apps/examples/nxtext/nxtext_main.c:  Fix bad conditional compilation
+	  when CONFIG_NX_KBD is not defined.  Submitted by Petteri Aimonen.
+	* apps/examples/nximage/nximage_main.c:  Add a 5 second delay after the
+	  NX logo is presented so that there is time for the image to be verified.
+	  Suggested by Petteri Aimonen.

examples/nximage/nximage_main.c

@@ -263,9 +263,10 @@ int nximage_main(int argc, char *argv[])
     }
   message("nximage_main: Screen resolution (%d,%d)\n", g_nximage.xres, g_nximage.yres);
 
-  /* Now, put up the NuttX logo. */
+  /* Now, put up the NuttX logo and wait a bit so that it visible. */
 
   nximage_image(g_nximage.hbkgd);
+  sleep(5);
 
   /* Release background */
 

examples/nxtext/nxtext_main.c

@@ -96,7 +96,6 @@
  * Private Data
  ****************************************************************************/
 
-#ifdef CONFIG_NX_KBD
 static const uint8_t g_pumsg[] = "Pop-Up!";
 static const char *g_bgmsg[BGMSG_LINES] =
 {
@@ -125,7 +124,6 @@ static const char *g_bgmsg[BGMSG_LINES] =
   "I must be gone and live,\n",           /* Line 23 */
   "  or stay and die.\n"                  /* Line 24 */
 };
-#endif
 
 /****************************************************************************
  * Public Data