cleanup and retro-compatibility

Author: ubidefeo

src/ArduinoIoTCloud.cpp

@@ -46,6 +46,7 @@ int ArduinoIoTCloudClass::begin(ConnectionManager *c, String brokerAddress)
 int ArduinoIoTCloudClass::begin(Client& net, String brokerAddress)
 {
 
+  _net = &net;
   // store the broker address as class member
   _brokerAddress = brokerAddress;
 
@@ -80,15 +81,19 @@ int ArduinoIoTCloudClass::begin(Client& net, String brokerAddress)
   if(connection != NULL){
     _bearSslClient = new BearSSLClient(connection->getClient());
   }else{
-    _bearSslClient = new BearSSLClient(net);
+    _bearSslClient = new BearSSLClient(*_net);
   }
 
   _bearSslClient->setEccSlot(keySlot, ECCX08Cert.bytes(), ECCX08Cert.length());
   _mqttClient = new MqttClient(*_bearSslClient);
 
   // Bind ArduinoBearSSL callback using static "non-method" function
-  getTimeConnection = connection;
-  ArduinoBearSSL.onGetTime(getTime);
+  if(connection != NULL){
+    getTimeConnection = connection;
+    ArduinoBearSSL.onGetTime(getTime);
+  }
+  
+  
   // TODO: Find a better way to allow callback into object method
 
   // Begin function for the MQTTClient
@@ -99,6 +104,11 @@ int ArduinoIoTCloudClass::begin(Client& net, String brokerAddress)
   return 1;
 }
 
+void ArduinoIoTCloudClass::onGetTime(unsigned long(*callback)(void))
+{
+  ArduinoBearSSL.onGetTime(callback);
+}
+
 // private class method used to initialize mqttClient class member. (called in the begin class method)
 void ArduinoIoTCloudClass::mqttClientBegin()
 {
@@ -197,7 +207,7 @@ void ArduinoIoTCloudClass::update(int const reconnectionMaxRetries, int const re
   }
 }
 
-int ArduinoIoTCloudClass::reconnect()
+int ArduinoIoTCloudClass::reconnect(Client& /* net */)
 {
   if (_mqttClient->connected()) {
     _mqttClient->stop();
@@ -285,13 +295,20 @@ void ArduinoIoTCloudClass::connectionCheck() {
 
   switch (iotStatus) {
     case IOT_STATUS_IDLE:
-      if (!begin(connection)) {
-        debugMessage("Error Starting Arduino Cloud\nTrying again in a few seconds", 0);
-        iotStatus = IOT_STATUS_CLOUD_ERROR;
-        return;
+      if(connection == NULL){
+        if(!begin(*_net)){
+          debugMessage("Error Starting Arduino Cloud\nTrying again in a few seconds", 0);
+          iotStatus = IOT_STATUS_CLOUD_ERROR;
+          return;
+        }
+      }else{
+        if (!begin(connection)) {
+          debugMessage("Error Starting Arduino Cloud\nTrying again in a few seconds", 0);
+          iotStatus = IOT_STATUS_CLOUD_ERROR;
+          return;
+        }
       }
-      // TODO: Controlla bene che non serva
-      //ArduinoCloud.onGetTime(getTime);
+      
       iotStatus = IOT_STATUS_CLOUD_CONNECTING;
       break;
     case IOT_STATUS_CLOUD_ERROR:
@@ -306,7 +323,7 @@ void ArduinoIoTCloudClass::connectionCheck() {
     case IOT_STATUS_CLOUD_RECONNECTING:
       debugMessage("IoT Cloud reconnecting...", 1);
       //wifiClient.stop();
-      arduinoIoTConnectionAttempt = reconnect();
+      arduinoIoTConnectionAttempt = reconnect(*_net);
       *msgBuffer = 0;
       sprintf(msgBuffer, "ArduinoCloud.reconnect(): %d", arduinoIoTConnectionAttempt);
       debugMessage(msgBuffer, 1);

src/ArduinoIoTCloud.h

@@ -41,12 +41,15 @@ class ArduinoIoTCloudClass {
   ~ArduinoIoTCloudClass();
 
   int begin(ConnectionManager *connection = ArduinoIoTPreferredConnection, String brokerAddress = "mqtts-sa.iot.arduino.cc");
-  int begin(Client& net, String brokerAddress);
+  int begin(Client& net, String brokerAddress = "mqtts-sa.iot.arduino.cc");
   // Class constant declaration
   static const int MQTT_TRANSMIT_BUFFER_SIZE = 256;
   static const int MAX_RETRIES = 5;
   static const int RECONNECTION_TIMEOUT = 2000;
 
+
+  void onGetTime(unsigned long(*callback)(void));
+
   int  connect   ();
   bool disconnect();
 
@@ -58,7 +61,7 @@ class ArduinoIoTCloudClass {
 
   int connected();
   // Clean up existing Mqtt connection, create a new one and initialize it
-  int reconnect();
+  int reconnect(Client& /* net */);
 
   inline void setThingId(String const thing_id) { _thing_id = thing_id; };
 
@@ -121,6 +124,7 @@ class ArduinoIoTCloudClass {
   String _dataTopicOut;
   String _dataTopicIn;
   String _otaTopic;
+  Client *_net;
 };
 
 extern ArduinoIoTCloudClass ArduinoCloud;

src/ConnectionManager.h

@@ -33,32 +33,6 @@ class ConnectionManager {
   NetworkConnectionState netConnectionState = CONNECTION_STATE_IDLE;
 };
 
-// Network Connection Status
-//int networkStatus = NETWORK_IDLE_STATUS;
-
-// ********* NETWORK LAYER **********
-// max network layer connection retries
-#define NETWORK_LAYER_CONNECTION_RETRIES 6
-// ms to wait between each retry
-#define NETWORK_LAYER_CONNECTION_TIMEOUT 10000
-// ms to wait between each retry
-#define NETWORK_LAYER_RECONNECTION_TIMEOUT 2000
-
-// TODO: remove references to ArduinoIoTCloud
-// ********** CLOUD LAYER *********** 
-// max arduino cloud connection retries
-#define ARDUINO_IOT_CLOUD_CONNECTION_RETRIES 30
-// max wifi connection retries
-#define ARDUINO_IOT_CLOUD_CONNECTION_TIMEOUT 3000
-
-// === NETWORK CONNECTION MANAGEMENT ===
-// last time when the Network Connection was checked
-//unsigned long lastNetworkCheck = 0;
-// time interval to check the Network Connection
-//static const unsigned long NETWORK_CONNECTION_INTERVAL = 30000;
-// timeout between each network connection retry
-//static const unsigned long NETWORK_CONNECTION_TIMEOUT = 2000;
-
 #ifdef ARDUINO_SAMD_MKR1000
 #include <WiFi101.h>
 #define BOARD_HAS_WIFI
@@ -83,9 +57,6 @@ class ConnectionManager {
 #define NETWORK_CONNECTED GSM3_NetworkStatus_t::GPRS_READY
 #endif
 
-// TODO: remove references to ArduinoIoTCloud
-#include <ArduinoIoTCloud.h>
-
 inline void debugMessage(char *_msg, uint8_t _debugLevel) {
   if (_debugLevel <= ARDUINO_CLOUD_DEBUG_LEVEL) {
     char prepend[20];

src/WiFiConnectionManager.h

@@ -9,12 +9,10 @@ class WiFiConnectionManager : public ConnectionManager {
   virtual void init();
   virtual void check();
   virtual Client &getClient() { return wifiClient; };
-  // TODO: remove references to ArduinoIoTCloud
-  virtual ArduinoIoTConnectionStatus status() { return IOT_STATUS_IDLE; };
+  
 
 private:
-  // TODO: remove references to ArduinoIoTCloud
-  void iotConnectionCheck();
+  
   void changeConnectionState(NetworkConnectionState _newState);
 
   const int CHECK_INTERVAL_IDLE = 100;
@@ -65,8 +63,7 @@ void WiFiConnectionManager::changeConnectionState(NetworkConnectionState _newSta
       break;
     case CONNECTION_STATE_DISCONNECTED:
       newInterval = CHECK_INTERVAL_DISCONNECTED;
-      // TODO: Riportare in ArduinoIoTCloud
-      //iotStatus = IOT_STATUS_CLOUD_DISCONNECTED;
+      
       break;
   }
   connectionTickTimeInterval = newInterval;
@@ -96,7 +93,7 @@ void WiFiConnectionManager::check() {
         }
         *msgBuffer = 0;
         sprintf(msgBuffer, "WiFi Firmware v. %s", WiFi.firmwareVersion());
-        debugMessage(msgBuffer, 3);
+        debugMessage(msgBuffer, 0);
         changeConnectionState(CONNECTION_STATE_CONNECTING);
         break;
       case CONNECTION_STATE_CONNECTING: