Turning cloud event callback func pointers to be private

Author: aentinger

src/ArduinoIoTCloud.cpp

@@ -27,13 +27,8 @@
 
 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;
-  }
-};
+  _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))
 {
@@ -150,8 +145,9 @@ ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, St
  * PRIVATE MEMBER FUNCTIONS
  ******************************************************************************/
 
-void ArduinoIoTCloudClass::execCloudEventCallback(OnCloudEventCallback& callback)
+void ArduinoIoTCloudClass::execCloudEventCallback(ArduinoIoTCloudEvent const event)
 {
+  OnCloudEventCallback callback = _cloud_event_callback[static_cast<size_t>(event)];
   if (callback) {
     (*callback)();
   }

src/ArduinoIoTCloud.h

@@ -62,9 +62,9 @@ enum class ArduinoIoTSynchronizationStatus
   SYNC_STATUS_VALUES_PROCESSED
 };
 
-enum class ArduinoIoTCloudEvent
+enum class ArduinoIoTCloudEvent : size_t
 {
-  SYNC, CONNECT, DISCONNECT
+  SYNC = 0, CONNECT = 1, DISCONNECT = 2
 };
 
 typedef void (*OnCloudEventCallback)(void);
@@ -134,17 +134,14 @@ class ArduinoIoTCloudClass
 
     ArduinoCloudThing _thing;
 
-    OnCloudEventCallback _on_sync_event_callback       = NULL;
-    OnCloudEventCallback _on_connect_event_callback    = NULL;
-    OnCloudEventCallback _on_disconnect_event_callback = NULL;
-
-    static void execCloudEventCallback(OnCloudEventCallback & callback);
+           void execCloudEventCallback(ArduinoIoTCloudEvent const event);
     static void printConnectionStatus(ArduinoIoTConnectionStatus status);
 
   private:
 
     String _thing_id = "";
     String _device_id = "";
+    OnCloudEventCallback _cloud_event_callback[3] = {nullptr};
 };
 
 #ifdef HAS_TCP

src/ArduinoIoTCloudLPWAN.cpp

@@ -91,7 +91,7 @@ void ArduinoIoTCloudLPWAN::update() {
   sendPropertiesToCloud();
 
 
-  execCloudEventCallback(_on_sync_event_callback);
+  execCloudEventCallback(ArduinoIoTCloudEvent::SYNC);
 
 }
 
@@ -124,7 +124,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudLPWAN::connectionCheck() {
         if (_connection->getStatus() != NetworkConnectionState::CONNECTED) {
           _iotStatus = ArduinoIoTConnectionStatus::DISCONNECTED;
           printConnectionStatus(_iotStatus);
-          execCloudEventCallback(_on_disconnect_event_callback);
+          execCloudEventCallback(ArduinoIoTCloudEvent::DISCONNECT);
         }
       }
       break;
@@ -150,7 +150,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudLPWAN::connectionCheck() {
         if (net_status == NetworkConnectionState::CONNECTED) {
           _iotStatus = ArduinoIoTConnectionStatus::CONNECTED;
           printConnectionStatus(_iotStatus);
-          execCloudEventCallback(_on_connect_event_callback);
+          execCloudEventCallback(ArduinoIoTCloudEvent::CONNECT);
         }
 
       }

src/ArduinoIoTCloudTCP.cpp

@@ -188,7 +188,7 @@ void ArduinoIoTCloudTCP::update() {
       }
       break;
     case ArduinoIoTSynchronizationStatus::SYNC_STATUS_VALUES_PROCESSED: {
-        execCloudEventCallback(_on_sync_event_callback);
+        execCloudEventCallback(ArduinoIoTCloudEvent::SYNC);
         _syncStatus = ArduinoIoTSynchronizationStatus::SYNC_STATUS_SYNCHRONIZED;
       }
       break;
@@ -302,7 +302,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
           _iotStatus = ArduinoIoTConnectionStatus::DISCONNECTED;
           _mqtt_data_request_retransmit = true;
           printConnectionStatus(_iotStatus);
-          execCloudEventCallback(_on_disconnect_event_callback);
+          execCloudEventCallback(ArduinoIoTCloudEvent::DISCONNECT);
         }
       }
       break;
@@ -317,7 +317,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
         if (ret_code_reconnect == CONNECT_SUCCESS) {
           _iotStatus = ArduinoIoTConnectionStatus::CONNECTED;
           printConnectionStatus(_iotStatus);
-          execCloudEventCallback(_on_connect_event_callback);
+          execCloudEventCallback(ArduinoIoTCloudEvent::CONNECT);
           CloudSerial.begin(9600);
           CloudSerial.println("Hello from Cloud Serial!");
         }
@@ -329,7 +329,7 @@ ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
         if (ret_code_connect == CONNECT_SUCCESS) {
           _iotStatus = ArduinoIoTConnectionStatus::CONNECTED;
           printConnectionStatus(_iotStatus);
-          execCloudEventCallback(_on_connect_event_callback);
+          execCloudEventCallback(ArduinoIoTCloudEvent::CONNECT);
           CloudSerial.begin(9600);
           CloudSerial.println("Hello from Cloud Serial!");
         } else if (ret_code_connect == CONNECT_FAILURE_SUBSCRIBE) {