Replacing direct storing of ota storage class with injecting it via 'setOTAStorage'

Author: aentinger

src/ArduinoIoTCloudTCP.cpp

@@ -77,7 +77,8 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP():
   _dataTopicOut(""),
   _dataTopicIn(""),
   _ota_topic_in{""},
-  _ota_topic_out{""}
+  _ota_topic_out{""},
+  _ota_storage{nullptr}
 {
 
 }
@@ -107,11 +108,9 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
   _brokerAddress = brokerAddress;
   _brokerPort = brokerPort;
 
-#if OTA_STORAGE_MKRMEM
-  if (!_ota.init()) {
+  if (_ota_storage && !_ota_storage->init()) {
     Debug.print(DBG_ERROR, "OTA storage medium initialisation failed - can't perform OTA");
   }
-#endif /* OTA_ENABLE */
 
   #ifdef BOARD_HAS_ECCX08
   if (!ECCX08.begin())                                                                                                                                                         { Debug.print(DBG_ERROR, "Cryptography processor failure. Make sure you have a compatible board."); return 0; }

src/ArduinoIoTCloudTCP.h

@@ -33,10 +33,7 @@
 
 #include <ArduinoMqttClient.h>
 
-#include "utility/ota/OTAConfig.h"
-#if OTA_STORAGE_MKRMEM
-  #include "utility/ota/OTAStorage_MKRMEM.h"
-#endif /* OTA_STORAGE_MKRMEM */
+#include "utility/ota/OTAStorage.h"
 
 /******************************************************************************
    CONSTANTS
@@ -78,6 +75,8 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     inline String   getBrokerAddress() const { return _brokerAddress; }
     inline uint16_t getBrokerPort   () const { return _brokerPort; }
 
+    inline void     setOTAStorage   (OTAStorage & ota_storage) { _ota_storage = &ota_storage; }
+
     // Clean up existing Mqtt connection, create a new one and initialize it
     int reconnect();
 
@@ -122,9 +121,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     String _ota_topic_in;
     String _ota_topic_out;
 
-#if OTA_STORAGE_MKRMEM
-    OTAStorage_MKRMEM _ota;
-#endif /* OTA_STORAGE_MKRMEM */
+    OTAStorage * _ota_storage;
 
     inline String getTopic_stdin    () { return String("/a/d/" + getDeviceId() + "/s/i"); }
     inline String getTopic_stdout   () { return String("/a/d/" + getDeviceId() + "/s/o"); }