Added implementation for WiFiConnection Manager (WIP)

Author: cmaglie

src/ArduinoIoTCloud.cpp

@@ -182,9 +182,8 @@ void ArduinoIoTCloudClass::update(int const reconnectionMaxRetries, int const re
   }
 }
 
-int ArduinoIoTCloudClass::reconnect(Client& /*net*/)
+int ArduinoIoTCloudClass::reconnect()
 {
-  // check if MQTT client is still connected
   if (_mqttClient->connected()) {
     _mqttClient->stop();
   }
@@ -256,4 +255,61 @@ void ArduinoIoTCloudClass::handleMessage(int length)
   }
 }
 
+void ArduinoIoTCloudClass::connectionCheck() {
+  connection->check();
+  if (connection->getStatus() != CONNECTION_STATE_CONNECTED) {
+    iotStatus = IOT_STATUS_CLOUD_DISCONNECTED;
+    return;
+  }
+  char msgBuffer[120];
+  int arduinoIoTConnectionAttempt;
+
+  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;
+      }
+      // TODO: Controlla bene che non serva
+      //ArduinoCloud.onGetTime(getTime);
+      iotStatus = IOT_STATUS_CLOUD_CONNECTING;
+      break;
+    case IOT_STATUS_CLOUD_ERROR:
+      debugMessage("Cloud Error. Retrying...", 0);
+      break;
+    case IOT_STATUS_CLOUD_CONNECTED:
+      debugMessage("connected to Arduino IoT Cloud", 2);
+      break;
+    case IOT_STATUS_CLOUD_DISCONNECTED:
+      iotStatus = IOT_STATUS_CLOUD_RECONNECTING;
+      break;
+    case IOT_STATUS_CLOUD_RECONNECTING:
+      debugMessage("IoT Cloud reconnecting...", 1);
+      //wifiClient.stop();
+      arduinoIoTConnectionAttempt = reconnect();
+      *msgBuffer = 0;
+      sprintf(msgBuffer, "ArduinoCloud.reconnect(): %d", arduinoIoTConnectionAttempt);
+      debugMessage(msgBuffer, 1);
+      if (arduinoIoTConnectionAttempt) {
+        CloudSerial.begin(9600);
+        CloudSerial.println("Hello from Cloud Serial!");
+        iotStatus = IOT_STATUS_CLOUD_CONNECTED;
+      }
+      break;
+    case IOT_STATUS_CLOUD_CONNECTING:
+      debugMessage("IoT Cloud connecting...", 3);
+      arduinoIoTConnectionAttempt = connect();
+      *msgBuffer = 0;
+      sprintf(msgBuffer, "ArduinoCloud.connect(): %d", arduinoIoTConnectionAttempt);
+      debugMessage(msgBuffer, 2);
+      if (arduinoIoTConnectionAttempt) {
+        CloudSerial.begin(9600);
+        CloudSerial.println("Hello from Cloud Serial!");
+        iotStatus = IOT_STATUS_CLOUD_CONNECTED;
+      }
+      break;
+  }
+}
+
 ArduinoIoTCloudClass ArduinoCloud;

src/ArduinoIoTCloud.h

@@ -23,6 +23,22 @@ typedef struct {
 
 extern ConnectionManager *ArduinoIoTPreferredConnection;
 
+enum ArduinoIoTConnectionStatus {
+  IOT_STATUS_IDLE,/* only at start */
+  IOT_STATUS_CLOUD_IDLE,
+  IOT_STATUS_CLOUD_CONNECTING,
+  IOT_STATUS_CLOUD_CONNECTED,
+  IOT_STATUS_CLOUD_DISCONNECTED,
+  IOT_STATUS_CLOUD_RECONNECTING,
+  IOT_STATUS_CLOUD_ERROR,
+  IOT_STATUS_NETWORK_IDLE,
+  IOT_STATUS_NETWORK_CONNECTED,
+  IOT_STATUS_NETWORK_CONNECTING,
+  IOT_STATUS_NETWORK_DISCONNECTED,
+  IOT_STATUS_NETWORK_ERROR,
+  IOT_STATUS_ERROR_GENERIC
+};
+
 class ArduinoIoTCloudClass {
 
 public:
@@ -47,7 +63,7 @@ class ArduinoIoTCloudClass {
 
   int connected();
   // Clean up existing Mqtt connection, create a new one and initialize it
-  int reconnect(Client& net);
+  int reconnect();
 
   inline void setThingId(String const thing_id) { _thing_id = thing_id; };
 
@@ -78,6 +94,8 @@ class ArduinoIoTCloudClass {
     return Thing.addPropertyReal(property, name, permission);
   }
 
+  void connectionCheck();
+
 protected:
   friend class CloudSerialClass;
   int writeStdout(const byte data[], int length);
@@ -87,7 +105,10 @@ class ArduinoIoTCloudClass {
   // Function in charge of perform MQTT reconnection, basing on class parameters(retries,and timeout)
   bool mqttReconnect(int const maxRetries, int const timeout);
 
+  ArduinoIoTConnectionStatus getIoTStatus() { return iotStatus; }
+
 private:
+  ArduinoIoTConnectionStatus iotStatus = IOT_STATUS_IDLE;
   ConnectionManager *connection;
   static void onMessage(int length);
   void handleMessage(int length);

src/ConnectionManager.h

@@ -1,33 +1,41 @@
+
 #ifndef CONNECTION_MANAGER_H_INCLUDED
 #define CONNECTION_MANAGER_H_INCLUDED
 
+#ifndef ARDUINO_CLOUD_DEBUG_LEVEL
+#define ARDUINO_CLOUD_DEBUG_LEVEL 3
+#endif
+
 #include <Client.h>
 
-/* NOT USED FOR NOW */
-enum ArduinoIoTConnectionStatus {
-  IOT_STATUS_IDLE,/* only at start */
-  IOT_STATUS_CLOUD_IDLE,
-  IOT_STATUS_CLOUD_CONNECTING,
-  IOT_STATUS_CLOUD_CONNECTED,
-  IOT_STATUS_CLOUD_DISCONNECTED,
-  IOT_STATUS_CLOUD_ERROR,
-  IOT_STATUS_NETWORK_IDLE,
-  IOT_STATUS_NETWORK_CONNECTED,
-  IOT_STATUS_NETWORK_CONNECTING,
-  IOT_STATUS_NETWORK_DISCONNECTED,
-  IOT_STATUS_NETWORK_ERROR,
-  IOT_STATUS_ERROR_GENERIC
+enum NetworkConnectionState {
+  CONNECTION_STATE_IDLE,
+  CONNECTION_STATE_INIT,
+  CONNECTION_STATE_CONNECTING,
+  CONNECTION_STATE_CONNECTED,
+  CONNECTION_STATE_GETTIME,
+  CONNECTION_STATE_DISCONNECTING,
+  CONNECTION_STATE_DISCONNECTED,
+  CONNECTION_STATE_ERROR
 };
 
 class ConnectionManager {
 public:
   virtual void init() = 0;
   virtual void check() = 0;
-  virtual ArduinoIoTConnectionStatus status() = 0;
   virtual unsigned long getTime() = 0;
   virtual Client &getClient();
+
+  virtual NetworkConnectionState getStatus() { return netConnectionState; }
+
+protected:
+  unsigned long lastValidTimestamp = 0;
+  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
@@ -42,10 +50,6 @@ class ConnectionManager {
 // max wifi connection retries
 #define ARDUINO_IOT_CLOUD_CONNECTION_TIMEOUT 3000
 
-// Network Connection Status
-//int iotStatus = IOT_STATUS_IDLE;   
-//int networkStatus = NETWORK_IDLE_STATUS;
-
 // === NETWORK CONNECTION MANAGEMENT ===
 // last time when the Network Connection was checked
 //unsigned long lastNetworkCheck = 0;
@@ -56,7 +60,6 @@ class ConnectionManager {
 
 #ifdef ARDUINO_SAMD_MKR1000
 #include <WiFi101.h>
-#include "WiFiConnectionManager.h"
 #define BOARD_HAS_WIFI
 #define NETWORK_HARDWARE_ERROR WL_NO_SHIELD
 #define NETWORK_IDLE_STATUS WL_IDLE_STATUS
@@ -65,7 +68,6 @@ class ConnectionManager {
 
 #ifdef ARDUINO_SAMD_MKRWIFI1010
 #include <WiFiNINA.h>
-#include "WiFiConnectionManager.h"
 #define BOARD_HAS_WIFI
 #define NETWORK_HARDWARE_ERROR WL_NO_MODULE
 #define NETWORK_IDLE_STATUS WL_IDLE_STATUS
@@ -82,4 +84,13 @@ class ConnectionManager {
 
 #include <ArduinoIoTCloud.h>
 
-#endif
+inline void debugMessage(char *_msg, uint8_t _debugLevel) {
+  if (_debugLevel <= ARDUINO_CLOUD_DEBUG_LEVEL) {
+    char prepend[20];
+    sprintf(prepend, "\n[ %d ] ", millis());
+    Serial.print(prepend);
+    Serial.println(_msg);
+  }
+}
+
+#endif

src/GSMConnectionManager.h

@@ -9,7 +9,6 @@ class GSMConnectionManager : public ConnectionManager {
   virtual void init();
   virtual void check();
   virtual Client &getClient() { return networkClient; };
-  virtual ArduinoIoTConnectionStatus status() { return IOT_STATUS_IDLE; };
 
   GSMClient networkClient;
   GSM gsmAccess;