Make begin(bool, String, uint16_t) private

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -102,6 +102,56 @@ int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, bool const enable_
   return begin(enable_watchdog, _brokerAddress, _brokerPort);
 }
 
+void ArduinoIoTCloudTCP::update()
+{
+  /* Feed the watchdog. If any of the functions called below
+   * get stuck than we can at least reset and recover.
+   */
+#if defined (ARDUINO_ARCH_SAMD) || defined (ARDUINO_ARCH_MBED)
+  watchdog_reset();
+#endif
+
+  /* Run through the state machine. */
+  State next_state = _state;
+  switch (_state)
+  {
+  case State::ConnectPhy:           next_state = handle_ConnectPhy();           break;
+  case State::SyncTime:             next_state = handle_SyncTime();             break;
+  case State::ConnectMqttBroker:    next_state = handle_ConnectMqttBroker();    break;
+  case State::Connected:            next_state = handle_Connected();            break;
+  case State::Disconnect:           next_state = handle_Disconnect();           break;
+  }
+  _state = next_state;
+
+  /* This watchdog feed is actually needed only by the RP2040 Connect because its
+   * maximum watchdog window is 8389 ms; despite this we feed it for all
+   * supported ARCH to keep code aligned.
+   */
+#if defined (ARDUINO_ARCH_SAMD) || defined (ARDUINO_ARCH_MBED)
+  watchdog_reset();
+#endif
+
+  /* Check for new data from the MQTT client. */
+  if (_mqttClient.connected())
+    _mqttClient.poll();
+}
+
+int ArduinoIoTCloudTCP::connected()
+{
+  return _mqttClient.connected();
+}
+
+void ArduinoIoTCloudTCP::printDebugInfo()
+{
+  DEBUG_INFO("***** Arduino IoT Cloud - configuration info *****");
+  DEBUG_INFO("Device ID: %s", getDeviceId().c_str());
+  DEBUG_INFO("MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);
+}
+
+/******************************************************************************
+ * PRIVATE MEMBER FUNCTIONS
+ ******************************************************************************/
+
 int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress, uint16_t brokerPort)
 {
   _brokerAddress = brokerAddress;
@@ -204,56 +254,6 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
   return 1;
 }
 
-void ArduinoIoTCloudTCP::update()
-{
-  /* Feed the watchdog. If any of the functions called below
-   * get stuck than we can at least reset and recover.
-   */
-#if defined (ARDUINO_ARCH_SAMD) || defined (ARDUINO_ARCH_MBED)
-  watchdog_reset();
-#endif
-
-  /* Run through the state machine. */
-  State next_state = _state;
-  switch (_state)
-  {
-  case State::ConnectPhy:           next_state = handle_ConnectPhy();           break;
-  case State::SyncTime:             next_state = handle_SyncTime();             break;
-  case State::ConnectMqttBroker:    next_state = handle_ConnectMqttBroker();    break;
-  case State::Connected:            next_state = handle_Connected();            break;
-  case State::Disconnect:           next_state = handle_Disconnect();           break;
-  }
-  _state = next_state;
-
-  /* This watchdog feed is actually needed only by the RP2040 Connect because its
-   * maximum watchdog window is 8389 ms; despite this we feed it for all
-   * supported ARCH to keep code aligned.
-   */
-#if defined (ARDUINO_ARCH_SAMD) || defined (ARDUINO_ARCH_MBED)
-  watchdog_reset();
-#endif
-
-  /* Check for new data from the MQTT client. */
-  if (_mqttClient.connected())
-    _mqttClient.poll();
-}
-
-int ArduinoIoTCloudTCP::connected()
-{
-  return _mqttClient.connected();
-}
-
-void ArduinoIoTCloudTCP::printDebugInfo()
-{
-  DEBUG_INFO("***** Arduino IoT Cloud - configuration info *****");
-  DEBUG_INFO("Device ID: %s", getDeviceId().c_str());
-  DEBUG_INFO("MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);
-}
-
-/******************************************************************************
- * PRIVATE MEMBER FUNCTIONS
- ******************************************************************************/
-
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectPhy()
 {
   if (_connection->check() == NetworkConnectionState::CONNECTED)

src/ArduinoIoTCloudTCP.h

@@ -75,7 +75,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     virtual void printDebugInfo() override;
 
     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);
 
     #ifdef BOARD_HAS_SECRET_KEY
     inline void setBoardId        (String const device_id) { setDeviceId(device_id); }
@@ -104,6 +103,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
 #endif
 
   private:
+    int begin(bool const enable_watchdog = true, String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
     static const int MQTT_TRANSMIT_BUFFER_SIZE = 256;
 
     enum class State