sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated CC30000 example from David Sidrane

Browse Source
This commit is contained in:
Gregory Nutt 2013-10-16 07:30:54 -06:00
parent 9df979417f
commit 081396c18d
3 changed files with 613 additions and 644 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.txt
View File

@ -684,4 +684,6 @@
* apps/Makefile: Need to include external/Make.defs if we want * apps/Makefile: Need to include external/Make.defs if we want
allow external applications to participate in the NuttX allow external applications to participate in the NuttX
configuration. Suggested by gdi@embedders.org (2013-10-14). configuration. Suggested by gdi@embedders.org (2013-10-14).
* apps/examplex/cc3300: Updates as part of larger re-organizaion
of CC3000 logic by David Sidrane (2013-10-16).

219
examples/cc3000/board.c
View File

@ -10,9 +10,9 @@
* and the routines in the SPI files, will be different for an Arduino, * and the routines in the SPI files, will be different for an Arduino,
* a TI MSP430, a PIC, etc. but the core library shouldn't have to be * a TI MSP430, a PIC, etc. but the core library shouldn't have to be
* changed. * changed.
* *
* Version 1.0.1b * Version 1.0.1b
* *
* Copyright (C) 2013 Chris Magagna - cmagagna@yahoo.com * Copyright (C) 2013 Chris Magagna - cmagagna@yahoo.com
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -23,25 +23,20 @@
* *
****************************************************************************/ ****************************************************************************/
#include "board.h" #include "board.h"
#include <stdbool.h> #include <stdbool.h>
#include <nuttx/wireless/cc3000/wlan.h> #include <nuttx/wireless/cc3000/wlan.h>
#include <nuttx/wireless/cc3000/hci.h> #include <nuttx/wireless/cc3000/hci.h>
#include <nuttx/wireless/cc3000/spi.h> #include <nuttx/wireless/cc3000.h>
#include <arch/board/kl_wifi.h>
volatile unsigned long ulSmartConfigFinished, volatile unsigned long ulSmartConfigFinished,
ulCC3000Connected, ulCC3000Connected,
ulCC3000DHCP, ulCC3000DHCP,
OkToDoShutDown, OkToDoShutDown,
ulCC3000DHCP_configured; ulCC3000DHCP_configured;
volatile uint8_t ucStopSmartConfig; volatile uint8_t ucStopSmartConfig;
#define NETAPP_IPCONFIG_MAC_OFFSET (20) #define NETAPP_IPCONFIG_MAC_OFFSET (20)
#define CC3000_APP_BUFFER_SIZE (5) #define CC3000_APP_BUFFER_SIZE (5)
#define CC3000_RX_BUFFER_OVERHEAD_SIZE (20) #define CC3000_RX_BUFFER_OVERHEAD_SIZE (20)
@ -50,167 +45,137 @@ volatile uint8_t ucStopSmartConfig;
uint8_t pucCC3000_Rx_Buffer[CC3000_APP_BUFFER_SIZE + CC3000_RX_BUFFER_OVERHEAD_SIZE]; uint8_t pucCC3000_Rx_Buffer[CC3000_APP_BUFFER_SIZE + CC3000_RX_BUFFER_OVERHEAD_SIZE];
*/ */
/* The original version of the function below had Serial.prints() /* The original version of the function below had Serial.prints()
to display an event, but since an async event can happen at any time, to display an event, but since an async event can happen at any time,
even in the middle of another Serial.print(), sometimes the sketch even in the middle of another Serial.print(), sometimes the sketch
would lock up because we were trying to print in the middle of would lock up because we were trying to print in the middle of
a print. a print.
So now we just set a flag and write to a string, and the master So now we just set a flag and write to a string, and the master
loop can deal with it when it wants. loop can deal with it when it wants.
*/ */
uint8_t asyncNotificationWaiting = false; uint8_t asyncNotificationWaiting = false;
long lastAsyncEvent; long lastAsyncEvent;
uint8_t dhcpIPAddress[4]; uint8_t dhcpIPAddress[4];
/*------------------------------------------------------------------- /*-------------------------------------------------------------------
The TI library calls this routine when asynchronous events happen. The TI library calls this routine when asynchronous events happen.
For example you tell the CC3000 to turn itself on and connect For example you tell the CC3000 to turn itself on and connect
to an access point then your code can go on to do its own thing. to an access point then your code can go on to do its own thing.
When the CC3000 is done configuring itself (e.g. it gets an IP When the CC3000 is done configuring itself (e.g. it gets an IP
address from the DHCP server) it will call this routine so you address from the DHCP server) it will call this routine so you
can take appropriate action. can take appropriate action.
---------------------------------------------------------------------*/ ---------------------------------------------------------------------*/
void CC3000_AsyncCallback(long lEventType, char * data, uint8_t length) void CC3000_AsyncCallback(long lEventType, char * data, uint8_t length)
{ {
lastAsyncEvent = lEventType;
lastAsyncEvent = lEventType; switch (lEventType)
{
switch (lEventType) { case HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE:
ulSmartConfigFinished = 1;
case HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE: ucStopSmartConfig = 1;
ulSmartConfigFinished = 1; asyncNotificationWaiting=true;
ucStopSmartConfig = 1; break;
asyncNotificationWaiting=true;
break; case HCI_EVNT_WLAN_UNSOL_CONNECT:
ulCC3000Connected = 1;
case HCI_EVNT_WLAN_UNSOL_CONNECT: asyncNotificationWaiting=true;
ulCC3000Connected = 1; break;
asyncNotificationWaiting=true;
break; case HCI_EVNT_WLAN_UNSOL_DISCONNECT:
ulCC3000Connected = 0;
case HCI_EVNT_WLAN_UNSOL_DISCONNECT: ulCC3000DHCP = 0;
ulCC3000Connected = 0; ulCC3000DHCP_configured = 0;
ulCC3000DHCP = 0; asyncNotificationWaiting=true;
ulCC3000DHCP_configured = 0; break;
asyncNotificationWaiting=true;
break; case HCI_EVNT_WLAN_UNSOL_DHCP:
// Notes:
case HCI_EVNT_WLAN_UNSOL_DHCP: // 1) IP config parameters are received swapped
// Notes: // 2) IP config parameters are valid only if status is OK, i.e. ulCC3000DHCP becomes 1
// 1) IP config parameters are received swapped // only if status is OK, the flag is set to 1 and the addresses are valid
// 2) IP config parameters are valid only if status is OK, i.e. ulCC3000DHCP becomes 1
// only if status is OK, the flag is set to 1 and the addresses are valid
if ( *(data + NETAPP_IPCONFIG_MAC_OFFSET) == 0) {
ulCC3000DHCP = 1;
dhcpIPAddress[0] = data[3];
dhcpIPAddress[1] = data[2];
dhcpIPAddress[2] = data[1];
dhcpIPAddress[3] = data[0];
}
else {
ulCC3000DHCP = 0;
dhcpIPAddress[0] = 0;
dhcpIPAddress[1] = 0;
dhcpIPAddress[2] = 0;
dhcpIPAddress[3] = 0;
}
asyncNotificationWaiting=true;
break;
case HCI_EVENT_CC3000_CAN_SHUT_DOWN:
OkToDoShutDown = 1;
asyncNotificationWaiting=true;
break;
default:
asyncNotificationWaiting=true;
break;
}
}
if (*(data + NETAPP_IPCONFIG_MAC_OFFSET) == 0)
{
ulCC3000DHCP = 1;
dhcpIPAddress[0] = data[3];
dhcpIPAddress[1] = data[2];
dhcpIPAddress[2] = data[1];
dhcpIPAddress[3] = data[0];
}
else
{
ulCC3000DHCP = 0;
dhcpIPAddress[0] = 0;
dhcpIPAddress[1] = 0;
dhcpIPAddress[2] = 0;
dhcpIPAddress[3] = 0;
}
asyncNotificationWaiting=true;
break;
case HCI_EVENT_CC3000_CAN_SHUT_DOWN:
OkToDoShutDown = 1;
asyncNotificationWaiting=true;
break;
default:
asyncNotificationWaiting=true;
break;
}
}
/*------------------------------------------------------------------- /*-------------------------------------------------------------------
The TI library calls these routines on CC3000 startup. The TI library calls these routines on CC3000 startup.
This library does not send firmware, driver, or bootloader patches This library does not send firmware, driver, or bootloader patches
so we do nothing and we return NULL. so we do nothing and we return NULL.
---------------------------------------------------------------------*/ ---------------------------------------------------------------------*/
char *SendFirmwarePatch(unsigned long *Length) { char *SendFirmwarePatch(unsigned long *Length)
*Length = 0; {
return NULL; *Length = 0;
return NULL;
} }
char *SendDriverPatch(unsigned long *Length)
char *SendDriverPatch(unsigned long *Length) { {
*Length = 0; *Length = 0;
return NULL; return NULL;
} }
char *SendBootloaderPatch(unsigned long *Length)
char *SendBootloaderPatch(unsigned long *Length) { {
*Length = 0; *Length = 0;
return NULL; return NULL;
} }
/*-------------------------------------------------------------------
The TI library calls these routines to enable or disable interrupts
on the WLAN_IRQ pin.
Originally WlanInterruptEnable() called attachInterrupt() and
WlanInterruptDisable() called detachInterrupt() but the library
was occationally locking up here, so now these routines just
set a flag. The interrupt routine will always fire but if the
flag isn't set it just returns immediately.
--------------------------------------------------------------------*/
void WlanInterruptEnable(void) {
SPIInterruptsEnabled = 1;
}
void WlanInterruptDisable(void) {
SPIInterruptsEnabled = 0;
}
/*------------------------------------------------------------------- /*-------------------------------------------------------------------
This is my routine to simplify CC3000 startup. This is my routine to simplify CC3000 startup.
It sets the Arduino pins then calls the normal CC3000 routines It sets the Arduino pins then calls the normal CC3000 routines
wlan_init() with all the callbacks and wlan_start() with 0 wlan_init() with all the callbacks and wlan_start() with 0
to indicate we're not sending any patches. to indicate we're not sending any patches.
--------------------------------------------------------------------*/ --------------------------------------------------------------------*/
void CC3000_Init(void) { void CC3000_Init(void)
{
SPIInterruptsEnabled = 0; wireless_archinitialize();
Wlan_Setup(); CC3000_wlan_init( CC3000_AsyncCallback,
SendFirmwarePatch,
wlan_init( CC3000_AsyncCallback, SendDriverPatch,
SendFirmwarePatch, SendBootloaderPatch);
SendDriverPatch,
SendBootloaderPatch, wlan_start(0);
ReadWlanInterruptPin,
WlanInterruptEnable,
WlanInterruptDisable,
WriteWlanEnablePin);
wlan_start(0);
} }

1036
examples/cc3000/cc3000basic.c
View File

File diff suppressed because it is too large Load Diff