Skip to content

Adafruit CC3000 support #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
corbinstreehouse wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Adafruit CC3000 support #61

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5e62224
Add support for AdaFruit CC3000
corbinstreehouse Oct 11, 2014
8d64961
Updated git ignore
corbinstreehouse Oct 11, 2014
09b0b57
.cpp -> .ino for people who don't use Xcode (the crazies)
corbinstreehouse Oct 11, 2014
d600236
More updates; read me, etc
corbinstreehouse Oct 12, 2014
17d75aa
Add a state machine for connecting to help with stalling other code (…
corbinstreehouse Oct 12, 2014
df7bbef
Debuggin aides
corbinstreehouse Oct 14, 2014
c361025
Move the state to the CC3000 portion
corbinstreehouse Oct 31, 2014
be8ba3c
Tweaks to the server that i want
corbinstreehouse Nov 5, 2014
7fc4f83
allow uploading of files
corbinstreehouse Nov 9, 2014
640df33
Not sure what i was doing with this
corbinstreehouse Mar 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Debuggin aides
  • Loading branch information
@corbinstreehouse
corbinstreehouse committed Oct 14, 2014
commit df7bbef77a8b44b37ee062025c6a9b5642106de3
17 changes: 17 additions & 0 deletions WebServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,12 @@ void WebServer::updateState() {
case WSStateBegin: {
DEBUG_PRINTLN("cc3000 begin...");
if (m_cc3000.begin()) {
DEBUG_PRINTLN("... cc3000 done begin...");
// Go to the next state and fall through
m_state = WSStateConnecting;
// Intentional fall through!!
} else {
DEBUG_PRINTLN("... cc3000 init failed!!!...");
// wait...
break;
}
Expand All @@ -195,15 +197,26 @@ void WebServer::updateState() {
{
DEBUG_PRINTLN("...connected");
m_state = WSStateGettingDHCP;
delay(100); // give it a brief moment; note, instead of delays, I can keep timing in the state machine
// Intentional fall through!!
} else {
break;
}
}
case WSStateGettingDHCP: {
DEBUG_PRINTLN("waiting for DHCP server...");
if (!m_cc3000.checkConnected()) {
DEBUG_PRINTLN("?? Disconnectd? try connecting again in a brief moment");
delay(100);
m_state = WSStateConnecting; // next loop will connect again
break;
}
if (m_cc3000.checkDHCP()) {
DEBUG_PRINTLN("...DHCP done.");
uint32_t ipAddress, netmask, gateway, dhcpserv, dnsserv;
if(m_cc3000.getIPAddress(&ipAddress, &netmask, &gateway, &dhcpserv, &dnsserv))
Serial.print(F("\nIP Addr: ")); m_cc3000.printIPdotsRev(ipAddress);

m_state = WSStateBeginDNS;
// Intentional fall through!!
} else {
Expand All @@ -221,6 +234,10 @@ void WebServer::updateState() {
DEBUG_PRINTF("Server started at: %s. Waiting for connection\r\n", WLAN_MACHINE_NAME);
m_state = WSStateReady;
// NO fall through
} else {
// uint32_t ipAddress, netmask, gateway, dhcpserv, dnsserv;
// if(m_cc3000.getIPAddress(&ipAddress, &netmask, &gateway, &dhcpserv, &dnsserv))
// Serial.print(F("\nIP Addr: ")); m_cc3000.printIPdotsRev(ipAddress);
}
break; // done!
}
Expand Down