Merge branch 'rename-networkconfig' into cbor-provisioning-messages

fabik111 · fabik111 · commit a95169515632 · 2025-01-31T11:12:33.000+01:00
diff --git a/examples/ArduinoIoTCloud-NetConfig/thingProperties.h b/examples/ArduinoIoTCloud-NetConfig/thingProperties.h
@@ -44,4 +44,4 @@ void initProperties() {
 
 GenericConnectionHandler ArduinoIoTPreferredConnection;
 
-NetworkConfigurator NetworkConf(ConfiguratorManager, ArduinoIoTPreferredConnection);
+NetworkConfiguratorClass NetworkConf(ConfiguratorManager, ArduinoIoTPreferredConnection);
diff --git a/src/ArduinoIoTCloud.h b/src/ArduinoIoTCloud.h
@@ -147,7 +147,7 @@ class ArduinoIoTCloudClass
   protected:
 
     ConnectionHandler * _connection;
-    NetworkConfigurator * _configurator;
+    NetworkConfiguratorClass * _configurator;
     TimeServiceClass & _time_service;
     String _thing_id;
     String _lib_version;
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
@@ -76,7 +76,7 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()
  * PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
-int ArduinoIoTCloudTCP::begin(NetworkConfigurator & configurator, ConnectionHandler & connection, bool const enable_watchdog, String brokerAddress, uint16_t brokerPort)
+int ArduinoIoTCloudTCP::begin(NetworkConfiguratorClass & configurator, ConnectionHandler & connection, bool const enable_watchdog, String brokerAddress, uint16_t brokerPort)
 {
   _configurator = &configurator;
   return begin(connection, enable_watchdog, brokerAddress, brokerPort);
diff --git a/src/ArduinoIoTCloudTCP.h b/src/ArduinoIoTCloudTCP.h
@@ -74,7 +74,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     virtual int  connected     () override;
     virtual void printDebugInfo() override;
 
-    int begin(NetworkConfigurator & configurator, ConnectionHandler & connection, bool const enable_watchdog = true, String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
+    int begin(NetworkConfiguratorClass & configurator, ConnectionHandler & connection, bool const enable_watchdog = true, String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
     int begin(ConnectionHandler & connection, bool const enable_watchdog = true, String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
     int begin(bool const enable_watchdog = true, String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
 

Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,4 @@ void initProperties() {`
`44`	`44`
`45`	`45`	`GenericConnectionHandler ArduinoIoTPreferredConnection;`
`46`	`46`
`47`		`-NetworkConfigurator NetworkConf(ConfiguratorManager, ArduinoIoTPreferredConnection);`
	`47`	`+NetworkConfiguratorClass NetworkConf(ConfiguratorManager, ArduinoIoTPreferredConnection);`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()`
`76`	`76`	`* PUBLIC MEMBER FUNCTIONS`
`77`	`77`	`******************************************************************************/`
`78`	`78`
`79`		`-int ArduinoIoTCloudTCP::begin(NetworkConfigurator & configurator, ConnectionHandler & connection, bool const enable_watchdog, String brokerAddress, uint16_t brokerPort)`
	`79`	`+int ArduinoIoTCloudTCP::begin(NetworkConfiguratorClass & configurator, ConnectionHandler & connection, bool const enable_watchdog, String brokerAddress, uint16_t brokerPort)`
`80`	`80`	`{`
`81`	`81`	`_configurator = &configurator;`
`82`	`82`	`return begin(connection, enable_watchdog, brokerAddress, brokerPort);`