diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-15 16:11:32 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-15 16:11:32 +0000 |
| commit | 61f7bc640f2f2ef42df04ca47d2806401cf97469 (patch) | |
| tree | 8ebb44ad6d08a18c37bcea3341005deb7ed97b43 /apps | |
| parent | cad9ed8e13b1b5e7448f41a71837d0e52ca0ad42 (diff) | |
| download | nuttx-61f7bc640f2f2ef42df04ca47d2806401cf97469.tar.gz nuttx-61f7bc640f2f2ef42df04ca47d2806401cf97469.tar.bz2 nuttx-61f7bc640f2f2ef42df04ca47d2806401cf97469.zip | |
Prep for 6.14 releasenuttx-6.14
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4301 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/ChangeLog.txt | 6 | ||||
| -rw-r--r-- | apps/examples/README.txt | 2 | ||||
| -rw-r--r-- | apps/examples/usbterm/Makefile | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 9aa2ebb55..a157b5809 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -151,9 +151,11 @@ * apps/examples/can: Add an NSH CAN command to drive and test a CAN driver in loopback mode. -6.14 2012-xx-xx Gregory Nutt <gnutt@nuttx.org> +6.14 2012-01-15 Gregory Nutt <gnutt@nuttx.org> - * apps/examples/buttons/main.c: The test needs to up_buttoninit() to + * apps/examples/buttons/main.c: The test needs to call up_buttoninit() to properly configure the button interrupt GPIOs. * apps/examples/pwm: Add support to test the pulse count option recently added to the PWM interface. + +6.15 2012-xx-xx Gregory Nutt <gnutt@nuttx.org> diff --git a/apps/examples/README.txt b/apps/examples/README.txt index 887266e2a..223f34e81 100644 --- a/apps/examples/README.txt +++ b/apps/examples/README.txt @@ -1131,7 +1131,7 @@ examples/usbterm Configuration options: - CONFIG_EXAMPLES_UBSTERM_BUILTIN - Build the usbterm example as an NSH + CONFIG_EXAMPLES_USBTERM_BUILTIN - Build the usbterm example as an NSH built-in command. NOTE: This is not fully functional as of this writing.. It should work, but there is no mechanism in place yet to exit the USB terminal program and return to NSH. diff --git a/apps/examples/usbterm/Makefile b/apps/examples/usbterm/Makefile index fe9b77fb8..8db1f9897 100644 --- a/apps/examples/usbterm/Makefile +++ b/apps/examples/usbterm/Makefile @@ -1,8 +1,8 @@ ############################################################################ # apps/examples/usbterm/Makefile # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt <spudmonkey@racsa.co.cr> +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -67,7 +67,7 @@ STACKSIZE = 2048 VPATH = all: .built -.PHONY: clean depend distclean +.PHONY: context clean depend distclean $(AOBJS): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) @@ -82,7 +82,7 @@ $(COBJS): %$(OBJEXT): %.c @touch .built .context: -ifeq ($(CONFIG_EXAMPLES_UBSTERM_BUILTIN),y) +ifeq ($(CONFIG_EXAMPLES_USBTERM_BUILTIN),y) $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) @touch $@ endif |