remove serviceId

Author: fabik111

src/ConfiguratorAgents/AgentsManager.cpp

@@ -28,8 +28,7 @@ AgentsManagerClass &AgentsManagerClass::getInstance() {
   return instance;
 };
 
-bool AgentsManagerClass::begin(uint8_t id) {
-  _servicesList.push_back(id);
+bool AgentsManagerClass::begin() {
   _instances++;
 
   if (_state != AgentsManagerStates::END) {
@@ -82,14 +81,7 @@ bool AgentsManagerClass::isBLEAgentEnabled() {
   return _bleAgentEnabled;
 }
 
-bool AgentsManagerClass::end(uint8_t id) {
-  std::list<uint8_t>::iterator it = std::find(_servicesList.begin(), _servicesList.end(), id);
-  if (it != _servicesList.end()) {
-    _servicesList.erase(it);
-  } else {
-    return false;
-  }
-
+bool AgentsManagerClass::end() {
   _instances--;
   if (_instances == 0) {
     std::for_each(_agentsList.begin(), _agentsList.end(), [](ConfiguratorAgent *agent) {

src/ConfiguratorAgents/AgentsManager.h

@@ -33,8 +33,8 @@ enum class RequestType: int { NONE = -1,
 class AgentsManagerClass {
 public:
   static AgentsManagerClass &getInstance();
-  bool begin(uint8_t id);
-  bool end(uint8_t id);
+  bool begin();
+  bool end();
   void disconnect();
   AgentsManagerStates poll();
   void enableBLEAgent(bool enable);
@@ -54,7 +54,6 @@ class AgentsManagerClass {
   AgentsManagerClass();
   AgentsManagerStates _state;
   std::list<ConfiguratorAgent *> _agentsList;
-  std::list<uint8_t> _servicesList;
   ConfiguratorRequestHandler _reqHandlers[6];
   ReturnTimestamp _returnTimestampCb;
   ReturnNetworkSettings _returnNetworkSettingsCb;

src/NetworkConfigurator.cpp

@@ -18,8 +18,6 @@
 #endif
 #include "NetworkConfigurator.h"
 
-#define SERVICE_ID_FOR_AGENTMANAGER 0xB0
-
 #define NC_CONNECTION_RETRY_TIMER_ms 120000
 #define NC_CONNECTION_TIMEOUT_ms 15000
 #define NC_UPDATE_NETWORK_OPTIONS_TIMER_ms 120000
@@ -73,7 +71,7 @@ bool NetworkConfiguratorClass::begin() {
 
   _agentsManager->addRequestHandler(RequestType::GET_WIFI_FW_VERSION, getWiFiFWVersionHandler);
 
-  if (!_agentsManager->begin(SERVICE_ID_FOR_AGENTMANAGER)) { //TODO check if this is needed if the counter is enough
+  if (!_agentsManager->begin()) {
     DEBUG_ERROR("NetworkConfiguratorClass::%s Failed to initialize the AgentsManagerClass", __FUNCTION__);
   }
 
@@ -155,12 +153,16 @@ bool NetworkConfiguratorClass::resetStoredConfiguration() {
 }
 
 bool NetworkConfiguratorClass::end() {
+  if (_state == NetworkConfiguratorStates::END) {
+    return true;
+  }
+
   _agentsManager->removeReturnNetworkSettingsCallback();
   _agentsManager->removeRequestHandler(RequestType::SCAN);
   _agentsManager->removeRequestHandler(RequestType::CONNECT);
   _agentsManager->removeRequestHandler(RequestType::GET_WIFI_FW_VERSION);
   _state = NetworkConfiguratorStates::END;
-  return _agentsManager->end(SERVICE_ID_FOR_AGENTMANAGER);
+  return _agentsManager->end();
 }
 
 bool NetworkConfiguratorClass::scanNetworkOptions() {