blownelco Plaetevoet
blabla
Fork of
ESP8266Interface
by 
ESP8266
Revision 8:04afe20d7927, committed 2014-04-08
- Comitter:
- screamer
- Date:
- Tue Apr 08 17:39:58 2014 +0000
- Parent:
- 6:5176e0864078
- Parent:
- 7:3152fcc74390
- Child:
- 9:f2439377c172
- Commit message:
- Merge
Changed in this revision
| Wifly/Wifly.cpp | Show annotated file Show diff for this revision Revisions of this file |
| Wifly/Wifly.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/Wifly/Wifly.cpp Thu Oct 17 23:23:00 2013 +0000
+++ b/Wifly/Wifly.cpp Tue Apr 08 17:39:58 2014 +0000
@@ -22,7 +22,7 @@
#include <algorithm>
//Debug is disabled by default
-#if (0 && !defined(TARGET_LPC11U24))
+#if (1 && defined(TARGET_LPC1768))
#define DBG(x, ...) std::printf("[Wifly : DBG]"x"\r\n", ##__VA_ARGS__);
#define WARN(x, ...) std::printf("[Wifly : WARN]"x"\r\n", ##__VA_ARGS__);
#define ERR(x, ...) std::printf("[Wifly : ERR]"x"\r\n", ##__VA_ARGS__);
@@ -114,7 +114,7 @@
// ssid
sprintf(cmd, "set w s %s\r", ssid);
- if (!sendCommand(cmd, "AOK"))
+ if (!sendCommand(cmd, "AOK", NULL, 1000))
continue;
//auth
@@ -146,7 +146,7 @@
else if (state.sec == WEP_128)
sprintf(cmd, "set w k %s\r", phrase);
- if (!sendCommand(cmd, "AOK"))
+ if (!sendCommand(cmd, "AOK", NULL, 1000))
continue;
}
--- a/Wifly/Wifly.h Thu Oct 17 23:23:00 2013 +0000
+++ b/Wifly/Wifly.h Tue Apr 08 17:39:58 2014 +0000
@@ -35,7 +35,8 @@
enum Security {
NONE = 0,
WEP_128 = 1,
- WPA = 3
+ WPA = 3,
+ WPA2 = 4,
};
enum Protocol {