rename NETWORK_CONFIGURATOR_ENABLED to HAS_NETWORK_CONFIGURATOR

Author: pennam

src/AIoTC_Config.h

@@ -24,9 +24,7 @@
   #endif
 
   #if __has_include (<ANetworkConfigurator_Config.h>)
-    #define NETWORK_CONFIGURATOR_ENABLED (1)
-  #else
-    #define NETWORK_CONFIGURATOR_ENABLED (0)
+    #define HAS_NETWORK_CONFIGURATOR
   #endif
 
 #endif

src/ArduinoIoTCloud.cpp

@@ -27,7 +27,7 @@
 
 ArduinoIoTCloudClass::ArduinoIoTCloudClass()
 : _connection{nullptr}
-#if NETWORK_CONFIGURATOR_ENABLED
+#if defined (HAS_NETWORK_CONFIGURATOR)
 , _configurator{nullptr}
 #endif
 , _time_service(TimeService)

src/ArduinoIoTCloud.h

@@ -104,9 +104,9 @@ class ArduinoIoTCloudClass
     inline unsigned long getInternalTime()              { return _time_service.getTime(); }
     inline unsigned long getLocalTime()                 { return _time_service.getLocalTime(); }
 
-    #if NETWORK_CONFIGURATOR_ENABLED
+#if defined (HAS_NETWORK_CONFIGURATOR)
     inline void setConfigurator(NetworkConfiguratorClass & configurator) { _configurator = &configurator; }
-    #endif
+#endif
     void addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback);
 
 #define addProperty( v, ...) addPropertyReal(v, #v, __VA_ARGS__)
@@ -152,9 +152,9 @@ class ArduinoIoTCloudClass
   protected:
 
     ConnectionHandler * _connection;
-    #if NETWORK_CONFIGURATOR_ENABLED
+#if defined (HAS_NETWORK_CONFIGURATOR)
     NetworkConfiguratorClass * _configurator;
-    #endif
+#endif
     TimeServiceClass & _time_service;
     String _thing_id;
     String _lib_version;

src/ArduinoIoTCloudTCP.cpp

@@ -188,7 +188,7 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
   }
 #endif
 
-#if NETWORK_CONFIGURATOR_ENABLED
+#if defined (HAS_NETWORK_CONFIGURATOR)
   if(_configurator != nullptr){
     _configurator->enableAgent(ConfiguratorAgent::AgentTypes::BLE,false);
     _configurator->begin();
@@ -233,11 +233,11 @@ void ArduinoIoTCloudTCP::update()
   /* Poll the network configurator to check if it is updating the configuration.
    * The polling must be performed only if the the first configuration is completed.
    */
-  #if NETWORK_CONFIGURATOR_ENABLED
+#if defined (HAS_NETWORK_CONFIGURATOR)
   if(_configurator != nullptr && _state > State::Init && _configurator->update() == NetworkConfiguratorStates::UPDATING_CONFIG){
     _state = State::ConfigPhy;
   }
-  #endif
+#endif
 
 #if OTA_ENABLED
   /* OTA FSM needs to reach the Idle state before being able to run independently from
@@ -293,7 +293,7 @@ void ArduinoIoTCloudTCP::disconnect() {
 
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConfigPhy()
 {
-#if NETWORK_CONFIGURATOR_ENABLED
+#if defined (HAS_NETWORK_CONFIGURATOR)
   if (_configurator == nullptr) {
     return State::Init;
   }