rename LedFeedbackClass::poll into LedFeedbackClass::update

Author: fabik111

src/NetworkConfigurator.cpp

@@ -45,6 +45,7 @@ NetworkConfiguratorClass::NetworkConfiguratorClass(ConnectionHandler &connection
       _optionUpdateTimer.begin(NC_UPDATE_NETWORK_OPTIONS_TIMER_ms); //initialize the timer before calling begin
       _agentsManager = &AgentsManagerClass::getInstance();
       _resetInput = &ResetInput::getInstance();
+      _ledFeedback = &LEDFeedbackClass::getInstance();
 }
 
 bool NetworkConfiguratorClass::begin() {
@@ -57,7 +58,7 @@ bool NetworkConfiguratorClass::begin() {
   _state = NetworkConfiguratorStates::READ_STORED_CONFIG;
   #endif
   memset(&_networkSetting, 0x00, sizeof(models::NetworkSetting));
-  LEDFeedbackClass::getInstance().begin();
+  _ledFeedback->begin();
 #ifdef BOARD_HAS_WIFI
   String fv = WiFi.firmwareVersion();
   if (fv < WIFI_FIRMWARE_LATEST_VERSION) {
@@ -85,7 +86,7 @@ bool NetworkConfiguratorClass::begin() {
 
 NetworkConfiguratorStates NetworkConfiguratorClass::update() {
   NetworkConfiguratorStates nextState = _state;
-  LEDFeedbackClass::getInstance().poll();//TODO rename in update
+  _ledFeedback->update();
 
   switch (_state) {
 #if ZERO_TOUCH_ENABLED
@@ -342,7 +343,7 @@ bool NetworkConfiguratorClass::handleConnectRequest() {
     if (!_kvstore->begin()) {
       DEBUG_ERROR("NetworkConfiguratorClass::%s error initializing kvstore", __FUNCTION__);
       sendStatus(StatusMessage::ERROR_STORAGE_BEGIN);
-      LEDFeedbackClass::getInstance().setMode(LEDFeedbackClass::LEDFeedbackMode::ERROR);
+      _ledFeedback->setMode(LEDFeedbackClass::LEDFeedbackMode::ERROR);
       return false;
     }
     bool storeResult = _kvstore->putBytes(STORAGE_KEY, (uint8_t *)&_networkSetting, sizeof(models::NetworkSetting));
@@ -351,15 +352,15 @@ bool NetworkConfiguratorClass::handleConnectRequest() {
     if (!storeResult) {
       DEBUG_ERROR("NetworkConfiguratorClass::%s error saving network settings", __FUNCTION__);
       sendStatus(StatusMessage::ERROR);
-      LEDFeedbackClass::getInstance().setMode(LEDFeedbackClass::LEDFeedbackMode::ERROR);
+      _ledFeedback->setMode(LEDFeedbackClass::LEDFeedbackMode::ERROR);
       return false;
     }
   }
 
   if (_connectionHandlerIstantiated) {
     if(disconnectFromNetwork() == ConnectionResult::FAILED) {
       sendStatus(StatusMessage::ERROR);
-      LEDFeedbackClass::getInstance().setMode(LEDFeedbackClass::LEDFeedbackMode::ERROR);
+      _ledFeedback->setMode(LEDFeedbackClass::LEDFeedbackMode::ERROR);
       return false;
     }
   }
@@ -370,7 +371,7 @@ bool NetworkConfiguratorClass::handleConnectRequest() {
   }
 
   _connectionHandlerIstantiated = true;
-  LEDFeedbackClass::getInstance().setMode(LEDFeedbackClass::LEDFeedbackMode::CONNECTING_TO_NETWORK);
+  _ledFeedback->setMode(LEDFeedbackClass::LEDFeedbackMode::CONNECTING_TO_NETWORK);
   return true;
 }
 
@@ -460,7 +461,7 @@ NetworkConfiguratorStates NetworkConfiguratorClass::handleReadStorage() {
   if (!_kvstore->begin()) {
     DEBUG_ERROR("NetworkConfiguratorClass::%s error initializing kvstore", __FUNCTION__);
     sendStatus(StatusMessage::ERROR_STORAGE_BEGIN);
-    LEDFeedbackClass::getInstance().setMode(LEDFeedbackClass::LEDFeedbackMode::ERROR);
+    _ledFeedback->setMode(LEDFeedbackClass::LEDFeedbackMode::ERROR);
     return NetworkConfiguratorStates::ERROR;
   }
 
@@ -539,7 +540,7 @@ NetworkConfiguratorStates NetworkConfiguratorClass::handleConfigured() {
   bool configInprogress = _agentsManager->isConfigInProgress();
 
   if (configInprogress) {
-    LEDFeedbackClass::getInstance().setMode(LEDFeedbackClass::LEDFeedbackMode::PEER_CONNECTED);
+    _ledFeedback->setMode(LEDFeedbackClass::LEDFeedbackMode::PEER_CONNECTED);
   }
 
   _agentsManager->poll();

src/NetworkConfigurator.h

@@ -17,6 +17,7 @@
 #include <Arduino_TimedAttempt.h>
 #include <Arduino_KVStore.h>
 #include "Utility/ResetInput/ResetInput.h"
+#include "Utility/LEDFeedback/LEDFeedback.h"
 
 enum class NetworkConfiguratorStates { ZERO_TOUCH_CONFIG,
                                        READ_STORED_CONFIG,
@@ -141,6 +142,7 @@ class NetworkConfiguratorClass {
   static inline models::NetworkSetting _networkSetting;
   bool _connectionHandlerIstantiated;
   ResetInput *_resetInput;
+  LEDFeedbackClass *_ledFeedback;
   bool _bleEnabled;
   TimedAttempt _connectionTimeout;
   TimedAttempt _connectionRetryTimer;

src/Utility/LEDFeedback/LEDFeedback.cpp

@@ -197,7 +197,7 @@ void LEDFeedbackClass::restart() {
   stopped = false;
 }
 
-void LEDFeedbackClass::poll() {
+void LEDFeedbackClass::update() {
   if(stopped) {
     return;
   }

src/Utility/LEDFeedback/LEDFeedback.h

@@ -25,7 +25,7 @@ class LEDFeedbackClass {
     void setMode(LEDFeedbackMode mode);
     void stop();
     void restart();
-    void poll();
+    void update();
 private:
     LEDFeedbackClass() {};
     void turnON();