remove TEST_STORED_CONFIG state of NetworkConfigurator

Author: fabik111

examples/provisioning/provisioning.ino

@@ -129,7 +129,6 @@ void setup() {
     NetworkConfigurator.resetStoredConfiguration();
   }
 
-  NetworkConfigurator.setCheckStoredCred(false);
   NetworkConfigurator.updateNetworkOptions();
   NetworkConfigurator.begin();
   ClaimingHandler.begin(&secureElement, &uhwid, clearStoredCredentials);

src/NetworkConfigurator.cpp

@@ -30,18 +30,16 @@
 #endif
 constexpr char *STORAGE_KEY{ "NETWORK_CONFIGS" };
 
-NetworkConfiguratorClass::NetworkConfiguratorClass(AgentsManagerClass &agentManager, ConnectionHandler &connectionHandler, bool startConfigurationIfConnectionFails)
+NetworkConfiguratorClass::NetworkConfiguratorClass(AgentsManagerClass &agentManager, ConnectionHandler &connectionHandler)
   : _agentManager{ &agentManager },
     _connectionHandler{ &connectionHandler },
-    _startBLEIfConnectionFails{ startConfigurationIfConnectionFails },
     _connectionTimeout{ NC_CONNECTION_TIMEOUT_ms, NC_CONNECTION_TIMEOUT_ms },
     _connectionRetryTimer{ NC_CONNECTION_RETRY_TIMER_ms, NC_CONNECTION_RETRY_TIMER_ms },
     _optionUpdateTimer{ NC_UPDATE_NETWORK_OPTIONS_TIMER_ms, NC_UPDATE_NETWORK_OPTIONS_TIMER_ms } {
       _optionUpdateTimer.begin(NC_UPDATE_NETWORK_OPTIONS_TIMER_ms); //initialize the timer before calling begin
 }
 
 bool NetworkConfiguratorClass::begin() {
-  _connectionLostStatus = false;
   _state = NetworkConfiguratorStates::READ_STORED_CONFIG;
   memset(&_networkSetting, 0x00, sizeof(models::NetworkSetting));
 
@@ -95,15 +93,14 @@ NetworkConfiguratorStates NetworkConfiguratorClass::poll() {
   NetworkConfiguratorStates nextState = _state;
   switch (_state) {
 #ifdef BOARD_HAS_ETHERNET
-    case NetworkConfiguratorStates::CHECK_ETH:           nextState = handleCheckEth       (); break;
+    case NetworkConfiguratorStates::CHECK_ETH:           nextState = handleCheckEth     (); break;
 #endif
-    case NetworkConfiguratorStates::READ_STORED_CONFIG: nextState = handleReadStorage     (); break;
-    case NetworkConfiguratorStates::TEST_STORED_CONFIG: nextState = handleTestStoredConfig(); break;
-    case NetworkConfiguratorStates::WAITING_FOR_CONFIG: nextState = handleWaitingForConf  (); break;
-    case NetworkConfiguratorStates::CONNECTING:         nextState = handleConnecting      (); break;
-    case NetworkConfiguratorStates::CONFIGURED:         nextState = handleConfigured      (); break;
-    case NetworkConfiguratorStates::UPDATING_CONFIG:    nextState = handleUpdatingConfig  (); break;
-    case NetworkConfiguratorStates::END:                                                      break;
+    case NetworkConfiguratorStates::READ_STORED_CONFIG: nextState = handleReadStorage   (); break;
+    case NetworkConfiguratorStates::WAITING_FOR_CONFIG: nextState = handleWaitingForConf(); break;
+    case NetworkConfiguratorStates::CONNECTING:         nextState = handleConnecting    (); break;
+    case NetworkConfiguratorStates::CONFIGURED:         nextState = handleConfigured    (); break;
+    case NetworkConfiguratorStates::UPDATING_CONFIG:    nextState = handleUpdatingConfig(); break;
+    case NetworkConfiguratorStates::END:                                                    break;
   }
 
   if(_state != nextState){
@@ -292,6 +289,7 @@ void NetworkConfiguratorClass::connectReqHandler() {
 
 void NetworkConfiguratorClass::setNetworkSettingsHandler(models::NetworkSetting *netSetting) {
   memcpy(&_networkSetting, netSetting, sizeof(models::NetworkSetting));
+  printNetworkSettings();
   _receivedEvent = NetworkConfiguratorEvents::NEW_NETWORK_SETTINGS;
 }
 
@@ -343,11 +341,6 @@ NetworkConfiguratorStates NetworkConfiguratorClass::handleConnectRequest() {
   return nextState;
 }
 
-void NetworkConfiguratorClass::handleNewNetworkSettings() {
-  printNetworkSettings();
-  _connectionLostStatus = false;  //reset for updating the failure reason
-}
-
 String NetworkConfiguratorClass::decodeConnectionErrorMessage(NetworkConnectionState err, StatusMessage *errorCode) {
   switch (err) {
     case NetworkConnectionState::ERROR:
@@ -418,11 +411,7 @@ NetworkConfiguratorStates NetworkConfiguratorClass::handleReadStorage() {
       nextState = NetworkConfiguratorStates::WAITING_FOR_CONFIG;
     } else {
       _connectionHandlerIstantiated = true;
-      if (_checkStoredCred){
-        nextState = NetworkConfiguratorStates::TEST_STORED_CONFIG;
-      } else {
-        nextState = NetworkConfiguratorStates::CONFIGURED;
-      }
+      nextState = NetworkConfiguratorStates::CONFIGURED;
     }
 
   } else {
@@ -439,26 +428,6 @@ NetworkConfiguratorStates NetworkConfiguratorClass::handleReadStorage() {
   return nextState;
 }
 
-NetworkConfiguratorStates NetworkConfiguratorClass::handleTestStoredConfig() {
-  NetworkConfiguratorStates nextState = _state;
-  StatusMessage err;
-  ConnectionResult res = connectToNetwork(&err);
-  if (res == ConnectionResult::SUCCESS) {
-    nextState = NetworkConfiguratorStates::CONFIGURED;
-  } else if (res == ConnectionResult::FAILED) {
-    sendStatus(StatusMessage::CONNECTION_LOST);
-    _connectionLostStatus = true;
-    if (_startBLEIfConnectionFails) {
-      _agentManager->enableBLEAgent(true);
-    }
-    if(_optionUpdateTimer.getWaitTime() == 0) {
-      updateNetworkOptions();
-    }
-    nextState = NetworkConfiguratorStates::WAITING_FOR_CONFIG;
-  }
-  return nextState;
-}
-
 NetworkConfiguratorStates NetworkConfiguratorClass::handleWaitingForConf() {
   NetworkConfiguratorStates nextState = _state;
 
@@ -467,8 +436,8 @@ NetworkConfiguratorStates NetworkConfiguratorClass::handleWaitingForConf() {
   switch (_receivedEvent) {
     case NetworkConfiguratorEvents::SCAN_REQ:                updateNetworkOptions    (); break;
     case NetworkConfiguratorEvents::CONNECT_REQ: nextState = handleConnectRequest    (); break;
-    case NetworkConfiguratorEvents::NEW_NETWORK_SETTINGS:    handleNewNetworkSettings(); break;
     case NetworkConfiguratorEvents::GET_WIFI_FW_VERSION:     handleGetWiFiFWVersion  (); break;
+    case NetworkConfiguratorEvents::NEW_NETWORK_SETTINGS:                                break;
   }
   _receivedEvent = NetworkConfiguratorEvents::NONE;
   if (nextState == _state) {
@@ -495,9 +464,7 @@ NetworkConfiguratorStates NetworkConfiguratorClass::handleConnecting() {
   if (res == ConnectionResult::SUCCESS) {
     nextState = NetworkConfiguratorStates::CONFIGURED;
   } else if (res == ConnectionResult::FAILED) {
-    if (!_connectionLostStatus) {
-      sendStatus(err);
-    }
+    sendStatus(err);
     nextState = NetworkConfiguratorStates::WAITING_FOR_CONFIG;
   }
 

src/NetworkConfigurator.h

@@ -15,7 +15,6 @@
 
 enum class NetworkConfiguratorStates { CHECK_ETH,
                                        READ_STORED_CONFIG,
-                                       TEST_STORED_CONFIG,
                                        WAITING_FOR_CONFIG,
                                        CONNECTING,
                                        CONFIGURED,
@@ -24,15 +23,9 @@ enum class NetworkConfiguratorStates { CHECK_ETH,
 
 class NetworkConfiguratorClass {
 public:
-  NetworkConfiguratorClass(AgentsManagerClass &agentManager, ConnectionHandler &connectionHandler, bool startBLEIfConnectionFails = false);
+  NetworkConfiguratorClass(AgentsManagerClass &agentManager, ConnectionHandler &connectionHandler);
   bool begin();
   NetworkConfiguratorStates poll();
-  void startBLEIfConnectionFails(bool enable) {
-    _startBLEIfConnectionFails = enable;
-  };
-  void setCheckStoredCred(bool check) {
-    _checkStoredCred = check;
-  };
   bool resetStoredConfiguration();
   bool end();
   bool updateNetworkOptions();
@@ -41,13 +34,11 @@ class NetworkConfiguratorClass {
   AgentsManagerClass *_agentManager;
   ConnectionHandler *_connectionHandler;
   static inline models::NetworkSetting _networkSetting;
-  bool _startBLEIfConnectionFails;
   bool _connectionHandlerIstantiated = false;
-  bool _checkStoredCred = true;
   TimedAttempt _connectionTimeout;
   TimedAttempt _connectionRetryTimer;
   TimedAttempt _optionUpdateTimer;
-  bool _connectionLostStatus = false;
+
   enum class NetworkConfiguratorEvents { NONE,
                                          SCAN_REQ,
                                          CONNECT_REQ,
@@ -63,21 +54,19 @@ class NetworkConfiguratorClass {
   NetworkConfiguratorStates handleCheckEth();
 #endif
   NetworkConfiguratorStates handleReadStorage();
-  NetworkConfiguratorStates handleTestStoredConfig();
   NetworkConfiguratorStates handleWaitingForConf();
   NetworkConfiguratorStates handleConnecting();
   NetworkConfiguratorStates handleConfigured();
   NetworkConfiguratorStates handleUpdatingConfig();
 
   NetworkConfiguratorStates handleConnectRequest();
-  void handleNewNetworkSettings();
   void handleGetWiFiFWVersion();
 
   String decodeConnectionErrorMessage(NetworkConnectionState err, StatusMessage *errorCode);
   ConnectionResult connectToNetwork(StatusMessage *err);
   ConnectionResult disconnectFromNetwork();
   bool sendStatus(StatusMessage msg);
-  void printNetworkSettings();
+  static void printNetworkSettings();
 #ifdef BOARD_HAS_WIFI
   bool scanWiFiNetworks(WiFiOption &wifiOptObj);
   bool insertWiFiAP(WiFiOption &wifiOptObj, char *ssid, int rssi);