diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-09-04 16:40:57 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-09-04 16:40:57 -0600 |
| commit | 63490f1443d979623b3cf06232e34413506dfc94 (patch) | |
| tree | e775292e32386b76c45fcbff96aabcbcde2372a5 /apps | |
| parent | 695bf13d6074c4d3770422889751e9f663c43dce (diff) | |
| download | px4-nuttx-63490f1443d979623b3cf06232e34413506dfc94.tar.gz px4-nuttx-63490f1443d979623b3cf06232e34413506dfc94.tar.bz2 px4-nuttx-63490f1443d979623b3cf06232e34413506dfc94.zip | |
Some restructing of the CC3000 build
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/examples/Makefile | 8 | ||||
| -rw-r--r-- | apps/examples/README.txt | 5 | ||||
| -rw-r--r-- | apps/examples/cc3000/board.c | 6 | ||||
| -rw-r--r-- | apps/examples/cc3000/cc3000basic.c | 12 |
4 files changed, 18 insertions, 13 deletions
diff --git a/apps/examples/Makefile b/apps/examples/Makefile index 46e2efd27..4036bc325 100644 --- a/apps/examples/Makefile +++ b/apps/examples/Makefile @@ -37,7 +37,7 @@ # Sub-directories -SUBDIRS = adc buttons can cdcacm composite cxxtest dhcpd discover elf +SUBDIRS = adc buttons can cc3000 cdcacm composite cxxtest dhcpd discover elf SUBDIRS += flash_test ftpc ftpd hello helloxx hidkbd igmp json keypadtest SUBDIRS += lcdrw mm modbus mount mtdpart nettest nrf24l01_term nsh null SUBDIRS += nx nxconsole nxffs nxflat nxhello nximage nxlines nxtext ostest @@ -53,9 +53,9 @@ SUBDIRS += wget wgetjson xmlrpc CNTXTDIRS = pwm ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) -CNTXTDIRS += adc can cdcacm composite cxxtest dhcpd discover flash_test ftpd -CNTXTDIRS += hello helloxx json keypadtestmodbus lcdrw mtdpart nettest nx -CNTXTDIRS += nxhello nximage nxlines nxtext nrf24l01_term ostest relays +CNTXTDIRS += adc can cc3000 cdcacm composite cxxtest dhcpd discover flash_test +CNTXTDIRS += ftpd hello helloxx json keypadtestmodbus lcdrw mtdpart nettest +CNTXTDIRS += nx nxhello nximage nxlines nxtext nrf24l01_term ostest relays CNTXTDIRS += qencoder slcd smart_test tcpecho telnetd tiff touchscreen CNTXTDIRS += usbstorage usbterm watchdog wgetjson endif diff --git a/apps/examples/README.txt b/apps/examples/README.txt index c6f31b034..016a04dd3 100644 --- a/apps/examples/README.txt +++ b/apps/examples/README.txt @@ -126,6 +126,11 @@ examples/can CONFIG_EXAMPLES_CAN_READONLY - Only receive messages CONFIG_EXAMPLES_CAN_WRITEONLY - Only send messages +examples/cc3000 +^^^^^^^^^^^^^^^ + + This is a test for the TI CC3000 wireless networking module. + examples/cdcacm ^^^^^^^^^^^^^^^ diff --git a/apps/examples/cc3000/board.c b/apps/examples/cc3000/board.c index 1868b061d..2794a7f0e 100644 --- a/apps/examples/cc3000/board.c +++ b/apps/examples/cc3000/board.c @@ -26,9 +26,9 @@ #include "board.h" #include <stdbool.h> -#include <nuttx/cc3000/wlan.h> -#include <nuttx/cc3000/hci.h> -#include <nuttx/cc3000/spi.h> +#include <nuttx/wireless/cc3000/wlan.h> +#include <nuttx/wireless/cc3000/hci.h> +#include <nuttx/wireless/cc3000/spi.h> #include <arch/board/kl_wifi.h> diff --git a/apps/examples/cc3000/cc3000basic.c b/apps/examples/cc3000/cc3000basic.c index 39f8f7c8f..c50b9de86 100644 --- a/apps/examples/cc3000/cc3000basic.c +++ b/apps/examples/cc3000/cc3000basic.c @@ -94,12 +94,12 @@ Arduino pin -----> 560 Ohm --+--> 1K Ohm -----> GND #include <stdlib.h> #include <stdbool.h> #include <sys/time.h> -#include <nuttx/cc3000/nvmem.h> -#include <nuttx/cc3000/socket.h> -#include <nuttx/cc3000/wlan.h> -#include <nuttx/cc3000/hci.h> -#include <nuttx/cc3000/security.h> -#include <nuttx/cc3000/netapp.h> +#include <nuttx/wireless/cc3000/nvmem.h> +#include <nuttx/wireless/cc3000/socket.h> +#include <nuttx/wireless/cc3000/wlan.h> +#include <nuttx/wireless/cc3000/hci.h> +#include <nuttx/wireless/cc3000/security.h> +#include <nuttx/wireless/cc3000/netapp.h> void Initialize(void); void helpme(void); |