Extracting code of CONNECTING case in update function into separated function update_handleConnecting

Author: aentinger

src/Arduino_WiFiConnectionHandler.cpp

@@ -98,6 +98,7 @@ unsigned long WiFiConnectionHandler::getTime() {
 #endif
 }
 
+
 void WiFiConnectionHandler::update() {
 
   unsigned long const now = millis();
@@ -107,36 +108,8 @@ void WiFiConnectionHandler::update() {
     lastConnectionTickTime = now;
 
     switch (netConnectionState) {
-      case NetworkConnectionState::INIT: update_handleInit(networkStatus); break;
-      case NetworkConnectionState::CONNECTING: {
-          Debug.print(DBG_VERBOSE, "::CONNECTING");
-          networkStatus = WiFi.status();
-
-          #if !defined(BOARD_ESP8266)
-
-          if (networkStatus != WL_CONNECTED) {
-            networkStatus = WiFi.begin(ssid, pass);
-          }
-
-          #else
-
-          networkStatus = WiFi.status();
-
-          #endif
-
-          Debug.print(DBG_VERBOSE, "WiFi.status(): %d", networkStatus);
-          if (networkStatus != NETWORK_CONNECTED) {
-            Debug.print(DBG_ERROR, "Connection to \"%s\" failed", ssid);
-            Debug.print(DBG_INFO, "Retrying in  \"%d\" milliseconds", connectionTickTimeInterval);
-
-            return;
-          } else {
-            Debug.print(DBG_INFO, "Connected to \"%s\"", ssid);
-            changeConnectionState(NetworkConnectionState::GETTIME);
-            return;
-          }
-        }
-        break;
+      case NetworkConnectionState::INIT:       update_handleInit      (networkStatus); break;
+      case NetworkConnectionState::CONNECTING: update_handleConnecting(networkStatus); break;
       case NetworkConnectionState::CONNECTED: {
 
           networkStatus = WiFi.status();
@@ -298,4 +271,31 @@ void WiFiConnectionHandler::update_handleInit(int & networkStatus) {
   changeConnectionState(NetworkConnectionState::CONNECTING);
 }
 
+void WiFiConnectionHandler::update_handleConnecting(int & networkStatus) {
+  Debug.print(DBG_VERBOSE, "::CONNECTING");
+  
+  networkStatus = WiFi.status();
+
+#ifndef BOARD_ESP8266
+
+  if (networkStatus != WL_CONNECTED) {
+    networkStatus = WiFi.begin(ssid, pass);
+  }
+#else
+    networkStatus = WiFi.status();
+#endif /* ifndef BOARD_ESP8266 */
+
+  Debug.print(DBG_VERBOSE, "WiFi.status(): %d", networkStatus);
+  if (networkStatus != NETWORK_CONNECTED) {
+    Debug.print(DBG_ERROR, "Connection to \"%s\" failed", ssid);
+    Debug.print(DBG_INFO, "Retrying in  \"%d\" milliseconds", connectionTickTimeInterval);
+    return;
+  }
+  else {
+    Debug.print(DBG_INFO, "Connected to \"%s\"", ssid);
+    changeConnectionState(NetworkConnectionState::GETTIME);
+    return;
+  }
+}
+
 #endif /* #ifdef BOARD_HAS_WIFI */

src/Arduino_WiFiConnectionHandler.h

@@ -84,7 +84,8 @@ class WiFiConnectionHandler : public ConnectionHandler {
 
     static void execNetworkEventCallback(OnNetworkEventCallback & callback, void * callback_arg);
 
-    void update_handleInit(int & networkStatus);
+    void update_handleInit      (int & networkStatus);
+    void update_handleConnecting(int & networkStatus);
 
 };