Added Check shield present on wifi examples

mlafauci · mlafauci · commit bc088b6e84a8 · 2012-05-30T09:07:38.000+02:00
diff --git a/WiFi/examples/WifiChatServer/WifiChatServer.ino b/WiFi/examples/WifiChatServer/WifiChatServer.ino
@@ -42,6 +42,10 @@ void setup() {
     Serial.print("Attempting to connect to SSID: ");
     Serial.println(ssid);
     status = WiFi.begin(ssid, pass);
+        if ( status != WL_CONNECTED) { 
+      Serial.println("Couldn't get a wifi connection");
+      while(true);
+    }     
     // wait 10 seconds for connection:
     delay(10000);
   } 
diff --git a/WiFi/examples/WifiCosmClient/WifiCosmClient.ino b/WiFi/examples/WifiCosmClient/WifiCosmClient.ino
@@ -54,6 +54,10 @@ void setup() {
     Serial.print("Attempting to connect to SSID: ");
     Serial.println(ssid);
     status = WiFi.begin(ssid, pass);
+    if ( status != WL_CONNECTED) { 
+      Serial.println("Couldn't get a wifi connection");
+      while(true);
+    } 
     // wait 10 seconds for connection:
     delay(10000);
   } 
diff --git a/WiFi/examples/WifiCosmClientString/WifiCosmClientString.ino b/WiFi/examples/WifiCosmClientString/WifiCosmClientString.ino
@@ -59,6 +59,10 @@ void setup() {
     Serial.print("Attempting to connect to SSID: ");
     Serial.println(ssid);
     status = WiFi.begin(ssid, pass);
+    if ( status != WL_CONNECTED) { 
+      Serial.println("Couldn't get a wifi connection");
+      while(true);
+    } 
     // wait 10 seconds for connection:
     delay(10000);
   } 
diff --git a/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino b/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
@@ -57,6 +57,10 @@ void setup() {
     Serial.print("Attempting to connect to SSID: ");
     Serial.println(ssid);
     status = WiFi.begin(ssid, pass);
+    if ( status != WL_CONNECTED) { 
+      Serial.println("Couldn't get a wifi connection");
+      while(true);
+    }     
     // wait 10 seconds for connection:
     delay(10000);
   } 
diff --git a/WiFi/examples/WifiWebClient/WifiWebClient.ino b/WiFi/examples/WifiWebClient/WifiWebClient.ino
@@ -47,6 +47,10 @@ void setup() {
     Serial.print("Attempting to connect to SSID: ");
     Serial.println(ssid);
     status = WiFi.begin(ssid, pass);
+    if ( status != WL_CONNECTED) { 
+      Serial.println("Couldn't get a wifi connection");
+      while(true);
+    }     
     // wait 10 seconds for connection:
     delay(10000);
   } 
diff --git a/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino b/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
@@ -43,6 +43,10 @@ void setup() {
     Serial.print("Attempting to connect to SSID: ");
     Serial.println(ssid);
     status = WiFi.begin(ssid, pass);
+    if ( status != WL_CONNECTED) { 
+      Serial.println("Couldn't get a wifi connection");
+      while(true);
+    } 
     // wait 10 seconds for connection:
     delay(10000);
   } 
diff --git a/WiFi/utility/wifi_drv.cpp b/WiFi/utility/wifi_drv.cpp
@@ -75,7 +75,7 @@ int8_t WiFiDrv::wifiSetNetwork(char* ssid, uint8_t ssid_len)
     if (!SpiDrv::waitResponseCmd(SET_NET_CMD, PARAM_NUMS_1, &_data, &_dataLen))
     {
         WARN("error waitResponse");
-        return WL_FAILURE;
+        _data = WL_FAILURE;
     }
     SpiDrv::spiSlaveDeselect();
 
@@ -99,7 +99,7 @@ int8_t WiFiDrv::wifiSetPassphrase(char* ssid, uint8_t ssid_len, const char *pass
     if (!SpiDrv::waitResponseCmd(SET_PASSPHRASE_CMD, PARAM_NUMS_1, &_data, &_dataLen))
     {
         WARN("error waitResponse");
-        return WL_FAILURE;
+        _data = WL_FAILURE;
     }
     SpiDrv::spiSlaveDeselect();
     return _data;
@@ -124,7 +124,7 @@ int8_t WiFiDrv::wifiSetKey(char* ssid, uint8_t ssid_len, uint8_t key_idx, const
     if (!SpiDrv::waitResponseCmd(SET_KEY_CMD, PARAM_NUMS_1, &_data, &_dataLen))
     {
         WARN("error waitResponse");
-        return WL_FAILURE;
+        _data = WL_FAILURE;
     }
     SpiDrv::spiSlaveDeselect();
     return _data;
@@ -319,12 +319,12 @@ int8_t WiFiDrv::startScanNetworks()
     if (!SpiDrv::waitResponseCmd(START_SCAN_NETWORKS, PARAM_NUMS_1, &_data, &_dataLen))
      {
          WARN("error waitResponse");
-         return WL_FAILURE;
+         _data = WL_FAILURE;
      }
 
     SpiDrv::spiSlaveDeselect();
 
-    return WL_SUCCESS;
+    return (_data == WL_FAILURE)? _data : WL_SUCCESS;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ int8_t WiFiDrv::wifiSetNetwork(char* ssid, uint8_t ssid_len)`
`75`	`75`	`if (!SpiDrv::waitResponseCmd(SET_NET_CMD, PARAM_NUMS_1, &_data, &_dataLen))`
`76`	`76`	`{`
`77`	`77`	`WARN("error waitResponse");`
`78`		`- return WL_FAILURE;`
	`78`	`+ _data = WL_FAILURE;`
`79`	`79`	`}`
`80`	`80`	`SpiDrv::spiSlaveDeselect();`
`81`	`81`
`@@ -99,7 +99,7 @@ int8_t WiFiDrv::wifiSetPassphrase(char* ssid, uint8_t ssid_len, const char *pass`
`99`	`99`	`if (!SpiDrv::waitResponseCmd(SET_PASSPHRASE_CMD, PARAM_NUMS_1, &_data, &_dataLen))`
`100`	`100`	`{`
`101`	`101`	`WARN("error waitResponse");`
`102`		`- return WL_FAILURE;`
	`102`	`+ _data = WL_FAILURE;`
`103`	`103`	`}`
`104`	`104`	`SpiDrv::spiSlaveDeselect();`
`105`	`105`	`return _data;`
`@@ -124,7 +124,7 @@ int8_t WiFiDrv::wifiSetKey(char* ssid, uint8_t ssid_len, uint8_t key_idx, const`
`124`	`124`	`if (!SpiDrv::waitResponseCmd(SET_KEY_CMD, PARAM_NUMS_1, &_data, &_dataLen))`
`125`	`125`	`{`
`126`	`126`	`WARN("error waitResponse");`
`127`		`- return WL_FAILURE;`
	`127`	`+ _data = WL_FAILURE;`
`128`	`128`	`}`
`129`	`129`	`SpiDrv::spiSlaveDeselect();`
`130`	`130`	`return _data;`
`@@ -319,12 +319,12 @@ int8_t WiFiDrv::startScanNetworks()`
`319`	`319`	`if (!SpiDrv::waitResponseCmd(START_SCAN_NETWORKS, PARAM_NUMS_1, &_data, &_dataLen))`
`320`	`320`	`{`
`321`	`321`	`WARN("error waitResponse");`
`322`		`- return WL_FAILURE;`
	`322`	`+ _data = WL_FAILURE;`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`SpiDrv::spiSlaveDeselect();`
`326`	`326`
`327`		`- return WL_SUCCESS;`
	`327`	`+ return (_data == WL_FAILURE)? _data : WL_SUCCESS;`
`328`	`328`	`}`
`329`	`329`
`330`	`330`