From bc088b6e84a89d8753ec02637f6ba2d7378aeaaf Mon Sep 17 00:00:00 2001 From: Mimmo La Fauci Date: Wed, 30 May 2012 09:07:38 +0200 Subject: [PATCH] Added Check shield present on wifi examples --- WiFi/examples/WifiChatServer/WifiChatServer.ino | 4 ++++ WiFi/examples/WifiCosmClient/WifiCosmClient.ino | 4 ++++ .../WifiCosmClientString/WifiCosmClientString.ino | 4 ++++ WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino | 4 ++++ WiFi/examples/WifiWebClient/WifiWebClient.ino | 4 ++++ .../WifiWebClientRepeating/WifiWebClientRepeating.ino | 4 ++++ WiFi/utility/wifi_drv.cpp | 10 +++++----- 7 files changed, 29 insertions(+), 5 deletions(-) diff --git a/WiFi/examples/WifiChatServer/WifiChatServer.ino b/WiFi/examples/WifiChatServer/WifiChatServer.ino index 8b6698f40..7eb0ed545 100644 --- 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 index bd43d59fa..210c5134a 100644 --- 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 index ec3da3174..f862551aa 100644 --- 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 index 8bf7bb2c2..a8b3ef002 100644 --- 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 index f6a3cdf23..661b447ab 100644 --- 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 index 8e5b88547..f10d2191d 100644 --- 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 index 5dabc0c0b..5bd59d38d 100644 --- 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; }