Extracting function checkPhyConnection into base class ArduinoIoTCloudClass

Author: aentinger

src/ArduinoIoTCloud.cpp

@@ -142,9 +142,24 @@ ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, St
 }
 
 /******************************************************************************
- * PRIVATE MEMBER FUNCTIONS
+ * PROTECTED MEMBER FUNCTIONS
  ******************************************************************************/
 
+NetworkConnectionState ArduinoIoTCloudClass::checkPhyConnection()
+{
+  NetworkConnectionState const connect_state = _connection->check();
+
+  if (_connection->check() != NetworkConnectionState::CONNECTED)
+  {
+    if (_iotStatus == ArduinoIoTConnectionStatus::CONNECTED)
+    {
+      disconnect();
+    }
+  }
+
+  return connect_state;
+}
+
 void ArduinoIoTCloudClass::execCloudEventCallback(ArduinoIoTCloudEvent const event)
 {
   OnCloudEventCallback callback = _cloud_event_callback[static_cast<size_t>(event)];

src/ArduinoIoTCloud.h

@@ -140,6 +140,7 @@ class ArduinoIoTCloudClass
     ArduinoCloudThing _thing;
     ArduinoIoTConnectionStatus _iotStatus = ArduinoIoTConnectionStatus::IDLE;
 
+           NetworkConnectionState checkPhyConnection();
            void execCloudEventCallback(ArduinoIoTCloudEvent const event);
     static void printConnectionStatus(ArduinoIoTConnectionStatus status);
 

src/ArduinoIoTCloudLPWAN.cpp

@@ -121,21 +121,6 @@ int ArduinoIoTCloudLPWAN::writeProperties(const byte data[], int length) {
   return 1;
 }
 
-NetworkConnectionState ArduinoIoTCloudLPWAN::checkPhyConnection()
-{
-  NetworkConnectionState const connect_state = _connection->check();
-
-  if (_connection->check() != NetworkConnectionState::CONNECTED)
-  {
-    if (_iotStatus == ArduinoIoTConnectionStatus::CONNECTED)
-    {
-      disconnect();
-    }
-  }
-
-  return connect_state;
-}
-
 ArduinoIoTConnectionStatus ArduinoIoTCloudLPWAN::checkCloudConnection()
 {
   switch (_iotStatus) {

src/ArduinoIoTCloudLPWAN.h

@@ -59,7 +59,6 @@ class ArduinoIoTCloudLPWAN : public ArduinoIoTCloudClass {
 
     void sendPropertiesToCloud();
     int writeProperties(const byte data[], int length);
-    NetworkConnectionState checkPhyConnection();
     ArduinoIoTConnectionStatus checkCloudConnection();
 };
 

src/ArduinoIoTCloudTCP.cpp

@@ -273,21 +273,6 @@ void ArduinoIoTCloudTCP::requestLastValue() {
   write(_shadowTopicOut, CBOR_REQUEST_LAST_VALUE_MSG, sizeof(CBOR_REQUEST_LAST_VALUE_MSG));
 }
 
-NetworkConnectionState ArduinoIoTCloudTCP::checkPhyConnection()
-{
-  NetworkConnectionState const connect_state = _connection->check();
-
-  if (_connection->check() != NetworkConnectionState::CONNECTED)
-  {
-    if (_iotStatus == ArduinoIoTConnectionStatus::CONNECTED)
-    {
-      disconnect();
-    }
-  }
-
-  return connect_state;
-}
-
 ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
 {
   ArduinoIoTConnectionStatus next_iot_status = _iotStatus;

src/ArduinoIoTCloudTCP.h

@@ -119,7 +119,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     void handleMessage(int length);
     void sendPropertiesToCloud();
     void requestLastValue();
-    NetworkConnectionState checkPhyConnection();
     ArduinoIoTConnectionStatus checkCloudConnection();
     int write(String const topic, byte const data[], int const length);
 };