move wifi scan from begin and run it when necessary

Author: fabik111

examples/auto-retry/auto-retry.ino

@@ -71,6 +71,7 @@ void setup() {
     NetworkConf.resetStoredConfiguration();
   }
   NetworkConf.startBLEIfConnectionFails(true);
+  NetworkConf.updateNetworkOptions();
   NetworkConf.begin();
   ProvisioningSystem.begin();
 

examples/provisioning/provisioning.ino

@@ -113,7 +113,7 @@ void setup() {
 #if defined(ARDUINO_UNOR4_WIFI)
   WiFi.end();
 #endif
-clearStoredCredentials();
+
 #if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_PORTENTA_H7_M7)
   pinMode(RESETCRED_BUTTON, INPUT_PULLDOWN);
 #else
@@ -130,6 +130,7 @@ clearStoredCredentials();
   }
 
   NetworkConf.setCheckStoredCred(false);
+  NetworkConf.updateNetworkOptions();
   NetworkConf.begin();
   ClaimingHandler.begin(&secureElement, &uhwid, clearStoredCredentials);
 

src/NetworkConfigurator.cpp

@@ -59,7 +59,6 @@ bool NetworkConfigurator::begin() {
     DEBUG_ERROR("NetworkConfigurator::%s Error registering \"network settings\" callback to AgentManager", __FUNCTION__);
   }
 
-  updateNetworkOptions(); //TODO MOVE
   if (!_agentManager->begin(SERVICE_ID_FOR_AGENTMANAGER)) {
     DEBUG_ERROR("NetworkConfigurator::%s Failed to initialize the AgentsConfiguratorManager", __FUNCTION__);
   }
@@ -408,8 +407,12 @@ NetworkConfiguratorStates NetworkConfigurator::handleReadStorage() {
   }
   _kvstore.end();
 #else
-  nextState = NetworkConfiguratorStates::CONFIGURED; //Fix when implement the check if the provided connectionhandler is already configured
+  nextState = NetworkConfiguratorStates::CONFIGURED;
 #endif
+
+  if (nextState == NetworkConfiguratorStates::WAITING_FOR_CONFIG && _lastOptionUpdate == 0) {
+    updateNetworkOptions();
+  }
   return nextState;
 }
 
@@ -425,6 +428,9 @@ NetworkConfiguratorStates NetworkConfigurator::handleTestStoredConfig() {
     if (_startBLEIfConnectionFails) {
       _agentManager->enableBLEAgent(true);
     }
+    if(_lastOptionUpdate == 0) {
+      updateNetworkOptions();
+    }
     nextState = NetworkConfiguratorStates::WAITING_FOR_CONFIG;
   }
   return nextState;

src/NetworkConfigurator.h

@@ -35,7 +35,7 @@ class NetworkConfigurator {
   };
   bool resetStoredConfiguration();
   bool end();
-
+  bool updateNetworkOptions();
 private:
   NetworkConfiguratorStates _state = NetworkConfiguratorStates::END;
   AgentsConfiguratorManager *_agentManager;
@@ -74,7 +74,6 @@ class NetworkConfigurator {
   String decodeConnectionErrorMessage(NetworkConnectionState err, int *errorCode);
   ConnectionResult connectToNetwork(StatusMessage *err);
   ConnectionResult disconnectFromNetwork();
-  bool updateNetworkOptions();
   bool sendStatus(StatusMessage msg);
   void printNetworkSettings();
 #ifdef BOARD_HAS_WIFI