Merge remote branch 'origin/hd_2.7'

Author: damellis

WiFi/WiFi.cpp

@@ -34,6 +34,11 @@ uint8_t WiFiClass::getSocket()
     return NO_SOCKET_AVAIL;
 }
 
+char* WiFiClass::firmwareVersion()
+{
+	return WiFiDrv::getFwVersion();
+}
+
 int WiFiClass::begin(char* ssid)
 {
 	uint8_t status = WL_IDLE_STATUS;
@@ -150,9 +155,20 @@ uint8_t WiFiClass::encryptionType()
 }
 
 
-uint8_t WiFiClass::scanNetworks()
+int8_t WiFiClass::scanNetworks()
 {
-	return WiFiDrv::scanNetworks();
+	uint8_t attempts = 10;
+	uint8_t numOfNetworks = 0;
+
+	if (WiFiDrv::startScanNetworks() == WL_FAILURE)
+		return WL_FAILURE;
+ 	do
+ 	{
+ 		delay(2000);
+ 		numOfNetworks = WiFiDrv::getScanNetworks();
+ 	}
+	while (( numOfNetworks == 0)&&(--attempts>0));
+	return numOfNetworks;
 }
 
 char* WiFiClass::SSID(uint8_t networkItem)

WiFi/WiFi.h

@@ -28,6 +28,12 @@ class WiFiClass
      */
     static uint8_t getSocket();
 
+    /*
+     * Get firmware version
+     */
+    static char* firmwareVersion();
+
+
     /* Start Wifi connection for OPEN networks
      *
      * param ssid: Pointer to the SSID string.
@@ -123,7 +129,7 @@ class WiFiClass
      *
      * return: Number of discovered networks
      */
-    uint8_t scanNetworks();
+    int8_t scanNetworks();
 
     /*
      * Return the SSID discovered during the network scan.

WiFi/WiFiClient.cpp

@@ -35,8 +35,19 @@ int WiFiClient::connect(IPAddress ip, uint16_t port) {
     {
     	ServerDrv::startClient(uint32_t(ip), port, _sock);
     	WiFiClass::_state[_sock] = _sock;
-    	while(!connected());
+
+    	unsigned long start = millis();
+
+    	// wait 4 second for the connection to close
+    	while (!connected() && millis() - start < 10000)
+    		delay(1);
+
+    	if (!connected())
+       	{
+    		return 0;
+    	}
     }else{
+    	Serial.println("No Socket available");
     	return 0;
     }
     return 1;
@@ -59,12 +70,17 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size) {
   }
 
 
-  if ((!ServerDrv::sendData(_sock, buf, size)) ||
-		  (!ServerDrv::checkDataSent(_sock)))
+  if (!ServerDrv::sendData(_sock, buf, size))
   {
 	  setWriteError();
       return 0;
   }
+  if (!ServerDrv::checkDataSent(_sock))
+  {
+	  setWriteError();
+      return 0;
+  }
+
   return size;
 }
 
@@ -94,8 +110,12 @@ int WiFiClient::read(uint8_t* buf, size_t size) {
 }
 
 int WiFiClient::peek() {
-	//TODO to be implemented
-	return 0;
+	  uint8_t b;
+	  if (!available())
+	    return -1;
+
+	  ServerDrv::getData(_sock, &b, 1);
+	  return b;
 }
 
 void WiFiClient::flush() {
@@ -112,10 +132,10 @@ void WiFiClient::stop() {
 
   unsigned long start = millis();
 
+
   // wait a second for the connection to close
   while (status() != CLOSED && millis() - start < 1000)
     delay(1);
-    
   _sock = 255;
 }
 
@@ -128,6 +148,7 @@ uint8_t WiFiClient::connected() {
 
     return !(s == LISTEN || s == CLOSED || s == FIN_WAIT_1 ||
     		s == FIN_WAIT_2 || s == TIME_WAIT ||
+    		s == SYN_SENT || s== SYN_RCVD ||
              (s == CLOSE_WAIT && !available()));
   }
 }

WiFi/examples/ConnectNoEncryption/ConnectNoEncryption.ino

@@ -9,34 +9,42 @@
  
  created 13 July 2010
  by dlf (Metodo2 srl)
- modified 29 Feb 2012
- by Scott Fitzgerald
+ modified 31 May 2012
+ by Tom Igoe
  */
  #include <WiFi.h>
 
 char ssid[] = "yourNetwork";     // the name of your network
 int status = WL_IDLE_STATUS;     // the Wifi radio's status
 
 void setup() {
-  // initialize serial:
-  Serial.begin(9600);
-
-  // attempt to connect to an open network:
-  Serial.print("Attempting to connect to open network: ");
-  Serial.println(ssid);
-  status = WiFi.begin(ssid);
-
-  // if you're not connected, stop here:
-  if ( status != WL_CONNECTED) { 
-    Serial.println("Couldn't get a wifi connection");
+  //Initialize serial and wait for port to open:
+  Serial.begin(9600); 
+  while (!Serial) {
+    ; // wait for serial port to connect. Needed for Leonardo only
+  }
+  
+  // check for the presence of the shield:
+  if (WiFi.status() == WL_NO_SHIELD) {
+    Serial.println("WiFi shield not present"); 
+    // don't continue:
     while(true);
   } 
-  // if you are connected :
-  else {
-      Serial.print("You're connected to the network");
-      printCurrentNet();
-      printWifiData();
+  
+ // attempt to connect to Wifi network:
+  while ( status != WL_CONNECTED) { 
+    Serial.print("Attempting to connect to open SSID: ");
+    Serial.println(ssid);
+    status = WiFi.begin(ssid);
+
+    // wait 10 seconds for connection:
+    delay(10000);
   }
+   
+  // you're connected now, so print out the data:
+  Serial.print("You're connected to the network");
+  printCurrentNet();
+  printWifiData();
 }
 
 void loop() {

WiFi/examples/ConnectWithWEP/ConnectWithWEP.ino

@@ -19,7 +19,7 @@
  
  created 13 July 2010
  by dlf (Metodo2 srl)
- modified 4 Mar 2012
+ modified 31 May 2012
  by Tom Igoe
  */
 #include <WiFi.h>
@@ -30,25 +30,33 @@ int keyIndex = 0;                                // your network key Index numbe
 int status = WL_IDLE_STATUS;                     // the Wifi radio's status
 
 void setup() {
-  // initialize serial:
-  Serial.begin(9600);
-
-  // attempt to connect to an open network:
-  Serial.print("Attempting to connect to WEP network: ");
-  Serial.println(ssid);
-  status = WiFi.begin(ssid, keyIndex, key);
+  //Initialize serial and wait for port to open:
+  Serial.begin(9600); 
+  while (!Serial) {
+    ; // wait for serial port to connect. Needed for Leonardo only
+  }
 
-  // if you're not connected, stop here:
-  if ( status != WL_CONNECTED) { 
-    Serial.println("Couldn't get a wifi connection");
+  // check for the presence of the shield:
+  if (WiFi.status() == WL_NO_SHIELD) {
+    Serial.println("WiFi shield not present"); 
+    // don't continue:
     while(true);
   } 
-  // if you are connected :
-  else {
-    Serial.print("You're connected to the network");
-    printCurrentNet();
-    printWifiData();
+
+  // attempt to connect to Wifi network:
+  while ( status != WL_CONNECTED) { 
+    Serial.print("Attempting to connect to WEP network, SSID: ");
+    Serial.println(ssid);
+    status = WiFi.begin(ssid, keyIndex, key);
+
+    // wait 10 seconds for connection:
+    delay(10000);
   }
+
+  // once you are connected :
+  Serial.print("You're connected to the network");
+  printCurrentNet();
+  printWifiData();
 }
 
 void loop() {
@@ -60,7 +68,7 @@ void loop() {
 void printWifiData() {
   // print your WiFi shield's IP address:
   IPAddress ip = WiFi.localIP();
-    Serial.print("IP Address: ");
+  Serial.print("IP Address: ");
   Serial.println(ip);
   Serial.println(ip);
 
@@ -115,3 +123,4 @@ void printCurrentNet() {
 }
 
 
+

WiFi/examples/ConnectWithWPA/ConnectWithWPA.ino

@@ -9,35 +9,45 @@
  
  created 13 July 2010
  by dlf (Metodo2 srl)
- modified 29 Feb 2012
- by Scott Fitzgerald
+ modified 31 May 2012
+ by Tom Igoe
  */
  #include <WiFi.h>
 
-char ssid[] = "networkName";     //  your network SSID (name) 
-char pass[] = "yourPassword";    // your network password
+char ssid[] = "yourNetwork";     //  your network SSID (name) 
+char pass[] = "secretPassword";  // your network password
 int status = WL_IDLE_STATUS;     // the Wifi radio's status
 
 void setup() {
-  // initialize serial:
-  Serial.begin(9600);
-
-  // attempt to connect to an open network:
-  Serial.print("Attempting to connect to WPA network: ");
-  Serial.println(ssid);
-  status = WiFi.begin(ssid, pass);
+  //Initialize serial and wait for port to open:
+  Serial.begin(9600); 
+  while (!Serial) {
+    ; // wait for serial port to connect. Needed for Leonardo only
+  }
 
-  // if you're not connected, stop here:
-  if ( status != WL_CONNECTED) { 
-    Serial.println("Couldn't get a wifi connection");
+  // check for the presence of the shield:
+  if (WiFi.status() == WL_NO_SHIELD) {
+    Serial.println("WiFi shield not present"); 
+    // don't continue:
     while(true);
   } 
-  // if you are connected :
-  else {
-      Serial.print("You're connected to the network");
-      printCurrentNet();
-      printWifiData();
+  
+ // attempt to connect to Wifi network:
+  while ( status != WL_CONNECTED) { 
+    Serial.print("Attempting to connect to WPA SSID: ");
+    Serial.println(ssid);
+    // Connect to WPA/WPA2 network:    
+    status = WiFi.begin(ssid, pass);
+
+    // wait 10 seconds for connection:
+    delay(10000);
   }
+   
+  // you're connected now, so print out the data:
+  Serial.print("You're connected to the network");
+  printCurrentNet();
+  printWifiData();
+
 }
 
 void loop() {