Fixes from review

Author: k3ldar

libraries/WiFiS3/examples/WiFiWebClient/WiFiWebClient.ino

@@ -69,7 +69,7 @@ void setup() {
   }
 
   // 3 second wait for connection
-  client.setConnectionTimeout(3000);
+  client.setTimeout(3000);
 }
 
 void connectToWifi() {
@@ -149,6 +149,7 @@ void loop() {
           Serial.println();
           Serial.println("disconnecting from server.");
           client.stop();
+		  status = WL_CONNECTED;
         }
       }
     }

libraries/WiFiS3/examples/WiFiWebClientSSL/WiFiWebClientSSL.ino

@@ -57,7 +57,7 @@ void setup() {
   }
 
   // 3 second wait for connection
-  modem.readTimeout(3000);
+  modem.setTimeout(3000);
 }
 
 void connectToWifi() {
@@ -115,7 +115,7 @@ void loop() {
     printWifiStatus();
 
     Serial.println("\nStarting connection to server...");
-    clientConnected = client.connect(server, 80);
+    clientConnected = client.connect(server, 443);
 
     if (clientConnected) {
       connectionCount++;

libraries/WiFiS3/src/Modem.cpp

@@ -37,7 +37,7 @@ void ModemClass::begin(int badurate, int retry){
       string res = "";
       _serial->flush();
 
-	  unsigned long modemTimeout = _timeout;
+      unsigned long modemTimeout = _timeout;
       modem.timeout(500);
       while(!beginned && retry > 0) {
          beginned = modem.write(string(PROMPT(_SOFTRESETWIFI)),res, "%s" , CMD(_SOFTRESETWIFI));

libraries/WiFiS3/src/WiFi.cpp

@@ -5,7 +5,7 @@
 using namespace std;
 
 /* -------------------------------------------------------------------------- */
-CWifi::CWifi() : _timeout(10000){
+CWifi::CWifi() : _timeout(10000), _start_connection_time(0){
 }
 /* -------------------------------------------------------------------------- */
 
@@ -66,15 +66,21 @@ int CWifi::begin(const char* ssid, const char *passphrase) {
 
 int CWifi::isConnected()
 {
-  if (status() == WL_CONNECTED)
-	return WL_CONNECTED;
-	
-  if (millis() - _start_connection_time < _timeout)
-  {
-	return WL_CONNECTING;
-  } 
-
-  return WL_CONNECT_FAILED;
+   uint8_t current_status = status();
+   
+   if (current_status == WL_CONNECTED) {
+      return WL_CONNECTED;
+   }
+   
+   if (current_status == WL_CONNECT_FAILED) {
+      return WL_CONNECT_FAILED;
+   }
+   
+   if (millis() - _start_connection_time < _timeout) {
+      return WL_CONNECTING;
+   }
+   
+   return WL_CONNECT_FAILED;
 }
 
 /* passphrase is needed so a default one will be set */

libraries/WiFiS3/src/WiFi.h

@@ -63,7 +63,7 @@ class CWifi {
     void _config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1, IPAddress dns2);
     void _sortAPlist(uint8_t num);
     unsigned long _timeout;
-	unsigned long _start_connection_time;
+    unsigned long _start_connection_time;
     CAccessPoint access_points[WIFI_MAX_SSID_COUNT];
     uint8_t _apsFound = 0;
     std::string ssid;
@@ -449,12 +449,12 @@ class CWifi {
 
     /**
      * @brief Sets the timeout value for the WiFi connection.
-     * 
+     *
      * @param `timeout` The timeout value in milliseconds.
      */
     void setTimeout(unsigned long timeout);
 
-	/*
+	/**
 	 * @brief Retrieves the connected state
 	 * 
 	 * @return Current connection state of WL_CONNECT_FAILED, WL_CONNECTED or WL_CONNECTING

libraries/WiFiS3/src/WiFiClient.h

@@ -236,7 +236,7 @@ class WiFiClient : public Client {
    * @return Returns the connection timeout in milliseconds
    */
   int getConnectionTimeout() {
-	  return _connectionTimeout;
+    return _connectionTimeout;
   }
 
   /**