Diff: Wifly/Wifly.cpp

Revision:

7:3152fcc74390

Parent:

1:fb4494783863

Child:

8:04afe20d7927

Child:

10:131675c17372

diff -r fb4494783863 -r 3152fcc74390 Wifly/Wifly.cpp
--- a/Wifly/Wifly.cpp	Fri Aug 24 13:48:36 2012 +0000
+++ b/Wifly/Wifly.cpp	Fri Nov 08 21:27:08 2013 +0000
@@ -22,7 +22,7 @@
 #include <algorithm>
 
 //Debug is disabled by default
-#if (0 && defined(TARGET_LPC1768))
+#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__);
@@ -109,7 +109,7 @@
 
         // ssid
         sprintf(cmd, "set w s %s\r", ssid);
-        if (!sendCommand(cmd, "AOK"))
+        if (!sendCommand(cmd, "AOK", NULL, 1000))
             continue;
 
         //auth
@@ -141,7 +141,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;
         }
 
@@ -149,9 +149,12 @@
         sprintf(cmd, "join\r");
         if (!sendCommand(cmd, "Associated", NULL, 3000))
             continue;
+        
+        if (!sendCommand("", "IP=", NULL, 10000))
+            continue;
 
         if (state.dhcp) {
-            if (!sendCommand("", "DHCP=ON", NULL, 3000))
+            if (!sendCommand("get i\r", "DHCP=ON", NULL, 3000))
                 continue;
         }
 
@@ -317,7 +320,7 @@
     if (state.cmd_mode)
         return true;
         
-    if (send("$$$", 3, "CMD") == -1) {
+    if (send("$$$", 3, "CMD") == -1 && send("\r",1,">") != true) {
         ERR("cannot enter in cmd mode\r\n");
         return false;
     }