Conditional compilation of OTA logic only if OTA_ENABLED is defined to 1

Author: aentinger

src/ArduinoIoTCloudTCP.cpp

@@ -59,27 +59,29 @@ static unsigned long getTime()
    CTOR/DTOR
  ******************************************************************************/
 
-ArduinoIoTCloudTCP::ArduinoIoTCloudTCP():
-  _lastSyncRequestTickTime{0},
-  _mqtt_data_buf{0},
-  _mqtt_data_len{0},
-  _mqtt_data_request_retransmit{false},
-  _sslClient(NULL),
+ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()
+: _lastSyncRequestTickTime{0}
+, _mqtt_data_buf{0}
+, _mqtt_data_len{0}
+, _mqtt_data_request_retransmit{false}
+, _sslClient(NULL)
   #ifdef BOARD_ESP
-  _password(""),
+, _password("")
   #endif
-  _mqttClient(NULL),
-  _syncStatus{ArduinoIoTSynchronizationStatus::SYNC_STATUS_SYNCHRONIZED},
-  _stdinTopic(""),
-  _stdoutTopic(""),
-  _shadowTopicOut(""),
-  _shadowTopicIn(""),
-  _dataTopicOut(""),
-  _dataTopicIn(""),
-  _ota_topic_in{""},
-  _ota_logic{nullptr},
-  _ota_storage_type{static_cast<int>(OTAStorage::Type::NotAvailable)},
-  _ota_error{static_cast<int>(OTAError::None)}
+, _mqttClient(NULL)
+, _syncStatus{ArduinoIoTSynchronizationStatus::SYNC_STATUS_SYNCHRONIZED}
+, _stdinTopic("")
+, _stdoutTopic("")
+, _shadowTopicOut("")
+, _shadowTopicIn("")
+, _dataTopicOut("")
+, _dataTopicIn("")
+, _ota_topic_in{""}
+#if OTA_ENABLED
+, _ota_logic{nullptr}
+, _ota_storage_type{static_cast<int>(OTAStorage::Type::NotAvailable)}
+, _ota_error{static_cast<int>(OTAError::None)}
+#endif /* OTA_ENABLED */
 {
 
 }
@@ -207,6 +209,7 @@ void ArduinoIoTCloudTCP::printDebugInfo()
   Debug.print(DBG_INFO, "MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);
 }
 
+#if OTA_ENABLED
 void ArduinoIoTCloudTCP::setOTAStorage(OTAStorage & ota_storage)
 {
   _ota_storage_type = static_cast<int>(ota_storage.type());
@@ -215,6 +218,7 @@ void ArduinoIoTCloudTCP::setOTAStorage(OTAStorage & ota_storage)
   if(_ota_logic) delete _ota_logic;
   _ota_logic = new OTALogic(ota_storage);
 }
+#endif /* OTA_ENABLED */
 
 int ArduinoIoTCloudTCP::reconnect()
 {

src/ArduinoIoTCloudTCP.h

@@ -22,6 +22,8 @@
  * INCLUDE
  ******************************************************************************/
 
+#include <ArduinoIoTCloud_Config.h>
+
 #include <ArduinoIoTCloud.h>
 
 #ifdef BOARD_HAS_ECCX08
@@ -33,8 +35,10 @@
 
 #include <ArduinoMqttClient.h>
 
-#include "utility/ota/OTALogic.h"
-#include "utility/ota/OTAStorage.h"
+#if OTA_ENABLED
+  #include "utility/ota/OTALogic.h"
+  #include "utility/ota/OTAStorage.h"
+#endif /* OTA_ENABLED */
 
 /******************************************************************************
    CONSTANTS
@@ -76,7 +80,9 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     inline String   getBrokerAddress() const { return _brokerAddress; }
     inline uint16_t getBrokerPort   () const { return _brokerPort; }
 
+#if OTA_ENABLED
     void setOTAStorage(OTAStorage & ota_storage);
+#endif /* OTA_ENABLED */
 
     // Clean up existing Mqtt connection, create a new one and initialize it
     int reconnect();
@@ -121,9 +127,11 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     String _dataTopicIn;
     String _ota_topic_in;
 
+#if OTA_ENABLED
     OTALogic * _ota_logic;
     int _ota_storage_type;
     int _ota_error;
+#endif /* OTA_ENABLED */
 
     inline String getTopic_stdin    () { return String("/a/d/" + getDeviceId() + "/s/i"); }
     inline String getTopic_stdout   () { return String("/a/d/" + getDeviceId() + "/s/o"); }

src/utility/ota/OTALogic.cpp

@@ -19,6 +19,9 @@
  * INCLUDE
  ******************************************************************************/
 
+#include <ArduinoIoTCloud_Config.h>
+#if OTA_ENABLED
+
 #include "OTALogic.h"
 
 #ifndef HOST
@@ -242,3 +245,5 @@ void OTALogic::init_ota_binary_data()
   _ota_bin_data.bytes_received = 0;
   _ota_bin_data.crc32          = crc_init();
 }
+
+#endif /* OTA_ENABLED */

src/utility/ota/OTALogic.h

@@ -22,6 +22,9 @@
  * INCLUDE
  ******************************************************************************/
 
+#include <ArduinoIoTCloud_Config.h>
+#if OTA_ENABLED
+
 #include "OTAStorage.h"
 
 #include "crc.h"
@@ -111,4 +114,6 @@ class OTALogic
 
 };
 
+#endif /* OTA_ENABLED */
+
 #endif /* ARDUINO_OTA_LOGIC_H_ */

src/utility/ota/crc.cpp

@@ -13,6 +13,10 @@
  *  - ReflectOut    = True
  *  - Algorithm     = table-driven
  */
+
+#include <ArduinoIoTCloud_Config.h>
+#if OTA_ENABLED
+
 #include "crc.h"     /* include the header file generated with pycrc */
 #include <stdlib.h>
 #include <stdint.h>
@@ -70,3 +74,5 @@ crc_t crc_update(crc_t crc, const void *data, size_t data_len)
     }
     return crc & 0xffffffff;
 }
+
+#endif /* OTA_ENABLED */

src/utility/ota/crc.h

@@ -40,6 +40,9 @@
 #ifndef CRC_H
 #define CRC_H
 
+#include <ArduinoIoTCloud_Config.h>
+#if OTA_ENABLED
+
 #include <stdlib.h>
 #include <stdint.h>
 
@@ -104,3 +107,5 @@ static inline crc_t crc_finalize(crc_t crc)
 #endif
 
 #endif      /* CRC_H */
+
+#endif /* OTA_ENABLED */