added wait on IP address to wait for DHCP

Former-commit-id: dc0d049

Author: maidnl

libraries/WiFiS3/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino

@@ -14,10 +14,8 @@
  This code is in the public domain.
  */
 
-#include "WiFi.h"
-#include "WiFiClient.h"
-#include "IPAddress.h"
-#include "MemoryFree.h"
+#include "WiFiS3.h"
+
 
 #include "arduino_secrets.h" 
 ///////please enter your sensitive data in the Secret tab/arduino_secrets.h
@@ -35,7 +33,7 @@ char server[] = "example.org";
 //IPAddress server(64,131,82,241);
 
 unsigned long lastConnectionTime = 0;            // last time you connected to the server, in milliseconds
-const unsigned long postingInterval = 10L * 2000L; // delay between updates, in milliseconds
+const unsigned long postingInterval = 10L * 200L; // delay between updates, in milliseconds
 
 /* -------------------------------------------------------------------------- */
 void setup() {
@@ -54,7 +52,7 @@ void setup() {
   }
 
   String fv = WiFi.firmwareVersion();
-  if (fv < WiFi_FIRMWARE_LATEST_VERSION) {
+  if (fv < WIFI_FIRMWARE_LATEST_VERSION) {
     Serial.println("Please upgrade the firmware");
   }
 
@@ -66,7 +64,7 @@ void setup() {
     status = WiFi.begin(ssid, pass);
 
     // wait 10 seconds for connection:
-    delay(10000);
+    //delay(10000);
   }
   // you're connected now, so print out the status:
   printWifiStatus();
@@ -82,12 +80,13 @@ void read_request() {
     /* actual data reception */
     char c = client.read();
     /* print data to serial port */
-    Serial.print(c);
+    //Serial.print(c);
     /* wrap data to 80 columns*/
     received_data_num++;
     if(received_data_num % 80 == 0) { 
-      Serial.println();
+      Serial.print('.');
     }
+    
   }  
 }
 

libraries/WiFiS3/src/WiFi.cpp

@@ -332,24 +332,31 @@ IPAddress CWifi::localIP() {
 /* -------------------------------------------------------------------------- */
    modem.begin();
    string res = "";
-   if(modem.write(string(PROMPT(_MODE)),res, "%s" , CMD_READ(_MODE)))  {
-      if(atoi(res.c_str()) == 1) {
-         if(modem.write(string(PROMPT(_IPSTA)),res, "%s%d\r\n" , CMD_WRITE(_IPSTA), IP_ADDR)) {
-            IPAddress local_IP;
-            local_IP.fromString(res.c_str());
-            return local_IP;
+   int attempts = 0;
+   IPAddress local_IP(0,0,0,0);
+
+   do {
+      delay(100);
+      if(modem.write(string(PROMPT(_MODE)),res, "%s" , CMD_READ(_MODE)))  {
+         if(atoi(res.c_str()) == 1) {
+            if(modem.write(string(PROMPT(_IPSTA)),res, "%s%d\r\n" , CMD_WRITE(_IPSTA), IP_ADDR)) {
+               
+               local_IP.fromString(res.c_str());
+               
+            }
          }
-      }
-      else if(atoi(res.c_str()) == 2) {
-         if(modem.write(string(PROMPT(_IPSOFTAP)),res,  CMD(_IPSOFTAP))) {
-            IPAddress local_IP;
-            local_IP.fromString(res.c_str());
-            return local_IP;
+         else if(atoi(res.c_str()) == 2) {
+            if(modem.write(string(PROMPT(_IPSOFTAP)),res,  CMD(_IPSOFTAP))) {
+               
+               local_IP.fromString(res.c_str());
+            }
          }
       }
+      attempts++;
    }
+   while(local_IP == IPAddress(0,0,0,0) && attempts < 50);
 
-   return IPAddress(0,0,0,0);
+   return local_IP;
 }
 
 /* -------------------------------------------------------------------------- */