Refactoring ArduinoIoTCloud

src/utility/ECCX08TLSConfig.h → examples/utility/Provisioning/ECCX08TLSConfig.h

@@ -18,10 +18,6 @@
 #ifndef _ECCX08_TLS_CONFIG_H_
 #define _ECCX08_TLS_CONFIG_H_
 
-#include <ArduinoIoTCloud_Defines.h>
-
-#ifdef BOARD_HAS_ECCX08
-
 const byte DEFAULT_ECCX08_TLS_CONFIG[128] = {
   // Read only - start
   // SN[0:3]
@@ -106,6 +102,4 @@ const byte DEFAULT_ECCX08_TLS_CONFIG[128] = {
   0x1C, 0x00
 };
 
-#endif /* BOARD_HAS_ECCX08 */
-
 #endif /* _ECCX08_TLS_CONFIG_H_ */

examples/utility/Provisioning/Provisioning.ino

@@ -1,6 +1,5 @@
 #include <ArduinoIoTCloud.h>
-#include <utility/ECCX08Cert.h>
-#include <utility/ECCX08TLSConfig.h>
+#include "ECCX08TLSConfig.h"
 
 #include <ArduinoBearSSL.h>
 #include <ArduinoECCX08.h>
@@ -11,6 +10,8 @@ const int compressedCertSlot                        = 10;
 const int serialNumberAndAuthorityKeyIdentifierSlot = 11;
 const int deviceIdSlot                              = 12;
 
+ECCX08CertClass ECCX08Cert;
+
 void setup() {
   Serial.begin(9600);
   while (!Serial);

src/ArduinoIoTCloud.cpp

@@ -15,13 +15,28 @@
    a commercial license, send an email to [email protected].
 */
 
+/******************************************************************************
+ * INCLUDE
+ ******************************************************************************/
+
 #include <ArduinoIoTCloud.h>
 
-void ArduinoIoTCloudClass::addPropertyReal(ArduinoCloudProperty& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property)) {
+/******************************************************************************
+ * PUBLIC MEMBER FUNCTIONS
+ ******************************************************************************/
+
+void ArduinoIoTCloudClass::addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback)
+{
+  _cloud_event_callback[static_cast<size_t>(event)] = callback;
+}
+
+void ArduinoIoTCloudClass::addPropertyReal(ArduinoCloudProperty& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
+{
   addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
 }
 
-void ArduinoIoTCloudClass::addPropertyReal(ArduinoCloudProperty& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property)) {
+void ArduinoIoTCloudClass::addPropertyReal(ArduinoCloudProperty& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
+{
   Permission permission = Permission::ReadWrite;
   if (permission_type == READ) {
     permission = Permission::Read;
@@ -32,102 +47,136 @@ void ArduinoIoTCloudClass::addPropertyReal(ArduinoCloudProperty& property, Strin
   }
 
   if (seconds == ON_CHANGE) {
-    Thing.addPropertyReal(property, name, permission, tag).publishOnChange(minDelta, DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);
+    _thing.addPropertyReal(property, name, permission, tag).publishOnChange(minDelta, DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);
   } else {
-    Thing.addPropertyReal(property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);
+    _thing.addPropertyReal(property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);
   }
 }
 
-void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property)) {
+void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
+{
   addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
 }
 
-void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property)) {
+void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
+{
   ArduinoCloudProperty* p = new CloudWrapperBool(property);
   addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
 }
-ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, Permission const permission) {
+
+ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, Permission const permission)
+{
   return addPropertyReal(property, name, -1, permission);
 }
-ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, Permission const permission) {
+
+ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, Permission const permission)
+{
   ArduinoCloudProperty* p = new CloudWrapperBool(property);
-  return Thing.addPropertyReal(*p, name, permission, tag);
+  return _thing.addPropertyReal(*p, name, permission, tag);
 }
 
-void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property)) {
+void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
+{
   addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
 }
 
-void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property)) {
+void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
+{
   ArduinoCloudProperty* p = new CloudWrapperFloat(property);
   addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
 }
 
-ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, Permission const permission) {
+ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, Permission const permission)
+{
   return addPropertyReal(property, name, -1, permission);
 }
 
-ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, Permission const permission) {
+ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, Permission const permission)
+{
   ArduinoCloudProperty* p = new CloudWrapperFloat(property);
-  return Thing.addPropertyReal(*p, name, permission, tag);
+  return _thing.addPropertyReal(*p, name, permission, tag);
 }
 
-void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property)) {
+void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
+{
   addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
 }
 
-void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property)) {
+void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
+{
   ArduinoCloudProperty* p = new CloudWrapperInt(property);
   addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
 }
 
-ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, Permission const permission) {
+ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, Permission const permission)
+{
   return addPropertyReal(property, name, -1, permission);
 }
 
-ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, Permission const permission) {
+ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, Permission const permission)
+{
   ArduinoCloudProperty* p = new CloudWrapperInt(property);
-  return Thing.addPropertyReal(*p, name, permission, tag);
+  return _thing.addPropertyReal(*p, name, permission, tag);
 }
 
-void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property)) {
+void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
+{
   addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
 }
 
-void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property)) {
+void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
+{
   ArduinoCloudProperty* p = new CloudWrapperString(property);
   addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
 }
 
-ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, Permission const permission) {
+ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, Permission const permission)
+{
   return addPropertyReal(property, name, -1, permission);
 }
 
-ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, Permission const permission) {
+ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, Permission const permission)
+{
   ArduinoCloudProperty* p = new CloudWrapperString(property);
-  return Thing.addPropertyReal(*p, name, permission, tag);
+  return _thing.addPropertyReal(*p, name, permission, tag);
 }
 
-void ArduinoIoTCloudClass::addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback) {
-  switch (event) {
-    case ArduinoIoTCloudEvent::SYNC:       _on_sync_event_callback       = callback; break;
-    case ArduinoIoTCloudEvent::CONNECT:    _on_connect_event_callback    = callback; break;
-    case ArduinoIoTCloudEvent::DISCONNECT: _on_disconnect_event_callback = callback; break;
+/******************************************************************************
+ * PROTECTED MEMBER FUNCTIONS
+ ******************************************************************************/
+
+NetworkConnectionState ArduinoIoTCloudClass::checkPhyConnection()
+{
+  NetworkConnectionState const connect_state = _connection->check();
+
+  if (_connection->check() != NetworkConnectionState::CONNECTED)
+  {
+    if (_iot_status == ArduinoIoTConnectionStatus::CONNECTED)
+    {
+      disconnect();
+    }
   }
-};
 
-void ArduinoIoTCloudClass::execCloudEventCallback(OnCloudEventCallback& callback, void* callback_arg) {
+  return connect_state;
+}
+
+void ArduinoIoTCloudClass::execCloudEventCallback(ArduinoIoTCloudEvent const event)
+{
+  OnCloudEventCallback callback = _cloud_event_callback[static_cast<size_t>(event)];
   if (callback) {
-    (*callback)(callback_arg);
+    (*callback)();
   }
 }
-void ArduinoIoTCloudClass::printConnectionStatus(ArduinoIoTConnectionStatus status) {
-  switch (status) {
+
+void ArduinoIoTCloudClass::printConnectionStatus(ArduinoIoTConnectionStatus status)
+{
+  switch (status)
+  {
     case ArduinoIoTConnectionStatus::IDLE:         Debug.print(DBG_INFO,  "Arduino IoT Cloud Connection status: IDLE");         break;
     case ArduinoIoTConnectionStatus::ERROR:        Debug.print(DBG_ERROR, "Arduino IoT Cloud Connection status: ERROR");        break;
     case ArduinoIoTConnectionStatus::CONNECTING:   Debug.print(DBG_INFO,  "Arduino IoT Cloud Connection status: CONNECTING");   break;
     case ArduinoIoTConnectionStatus::RECONNECTING: Debug.print(DBG_INFO,  "Arduino IoT Cloud Connection status: RECONNECTING"); break;
     case ArduinoIoTConnectionStatus::CONNECTED:    Debug.print(DBG_INFO,  "Arduino IoT Cloud Connection status: CONNECTED");    break;
     case ArduinoIoTConnectionStatus::DISCONNECTED: Debug.print(DBG_ERROR, "Arduino IoT Cloud Connection status: DISCONNECTED"); break;
   }
-}
+}