diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-10-20 16:07:49 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-10-20 16:07:49 +0000 |
commit | 12bfabec70065f7994f91a9b315e2b69892b0a57 (patch) | |
tree | 7b344f74705f7a44e4fddc333d13767ad89792de /apps | |
parent | 69a2786e6d69fc3b478a1f1458312e4bb20260d1 (diff) | |
download | nuttx-12bfabec70065f7994f91a9b315e2b69892b0a57.tar.gz nuttx-12bfabec70065f7994f91a9b315e2b69892b0a57.tar.bz2 nuttx-12bfabec70065f7994f91a9b315e2b69892b0a57.zip |
Several bugfixes contributed by Petteri Aimonen
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5238 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
-rw-r--r-- | apps/ChangeLog.txt | 5 | ||||
-rw-r--r-- | apps/examples/nximage/nximage_main.c | 3 | ||||
-rw-r--r-- | apps/examples/nxtext/nxtext_main.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index b9ba6ac91..02843d547 100644 --- a/apps/ChangeLog.txt +++ b/apps/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. diff --git a/apps/examples/nximage/nximage_main.c b/apps/examples/nximage/nximage_main.c index 729fcc53f..c432d8a73 100644 --- a/apps/examples/nximage/nximage_main.c +++ b/apps/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 */ diff --git a/apps/examples/nxtext/nxtext_main.c b/apps/examples/nxtext/nxtext_main.c index 9a4b8eea4..2a1b50355 100644 --- a/apps/examples/nxtext/nxtext_main.c +++ b/apps/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 |