Renaming MKRGSM to SSU in order to better reflect that the ota storage is used in combi with the SSU bootloader

Author: aentinger

src/ArduinoIoTCloudTCP.cpp

@@ -29,7 +29,7 @@
   #include "tls/utility/CryptoUtil.h"
 #endif
 
-#include "utility/ota/OTAStorage_MKRGSM.h"
+#include "utility/ota/OTAStorage_SSU.h"
 #include "utility/ota/OTAStorage_MKRMEM.h"
 
 #include "cbor/CBOREncoder.h"
@@ -40,8 +40,8 @@
 
 TimeService time_service;
 
-#if   OTA_STORAGE_MKRGSM
-  static OTAStorage_MKRGSM ota_storage_ssu;
+#if   OTA_STORAGE_SSU
+  static OTAStorage_SSU ota_storage_ssu;
 #elif OTA_STORAGE_MKRMEM
   static OTAStorage_MKRMEM ota_storage_sfu;
 #endif
@@ -144,7 +144,7 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
 
   printConnectionStatus(_iot_status);
 
-#if   OTA_STORAGE_MKRGSM
+#if   OTA_STORAGE_SSU
   setOTAStorage(ota_storage_ssu);
 #elif OTA_STORAGE_MKRMEM
   setOTAStorage(ota_storage_sfu);

src/ArduinoIoTCloud_Config.h

@@ -27,16 +27,16 @@
 #endif
 
 #ifdef ARDUINO_SAMD_MKRGSM1400
-  #define OTA_STORAGE_MKRGSM      (1)
+  #define OTA_STORAGE_SSU         (1)
 #else
-  #define OTA_STORAGE_MKRGSM      (0)
+  #define OTA_STORAGE_SSU         (0)
 #endif
 
 /******************************************************************************
  * AUTOMATIC CONFIGURED DEFINES
  ******************************************************************************/
 
-#if OTA_STORAGE_MKRMEM || OTA_STORAGE_MKRGSM
+#if OTA_STORAGE_MKRMEM || OTA_STORAGE_SSU
   #define OTA_ENABLED             (1)
 #else
   #define OTA_ENABLED             (0)

src/utility/ota/OTAStorage_MKRGSM.cpp renamed to src/utility/ota/OTAStorage_SSU.cpp

@@ -20,9 +20,9 @@
  ******************************************************************************/
 
 #include <ArduinoIoTCloud_Config.h>
-#if OTA_STORAGE_MKRGSM
+#if OTA_STORAGE_SSU
 
-#include "OTAStorage_MKRGSM.h"
+#include "OTAStorage_SSU.h"
 
 /******************************************************************************
    CONSTANTS
@@ -35,7 +35,7 @@ static char const SSU_CHECK_FILE_NAME[] = "UPDATE.OK";
    PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
-bool OTAStorage_MKRGSM::init()
+bool OTAStorage_SSU::init()
 {
   if (!_fileUtils.begin())
     return false;
@@ -49,28 +49,28 @@ bool OTAStorage_MKRGSM::init()
       return false;
 }
 
-bool OTAStorage_MKRGSM::open(char const * /* file_name */)
+bool OTAStorage_SSU::open(char const * /* file_name */)
 {
   return true;
 }
 
-size_t OTAStorage_MKRGSM::write(uint8_t const* const buf, size_t const num_bytes)
+size_t OTAStorage_SSU::write(uint8_t const* const buf, size_t const num_bytes)
 {
   _fileUtils.appendFile(SSU_UPDATE_FILENAME, (const char*)buf, num_bytes);
   return num_bytes;
 }
 
-void OTAStorage_MKRGSM::close()
+void OTAStorage_SSU::close()
 {
   /* Nothing to do */
 }
 
-void OTAStorage_MKRGSM::remove(char const * /* file_name */)
+void OTAStorage_SSU::remove(char const * /* file_name */)
 {
   _fileUtils.deleteFile(SSU_UPDATE_FILENAME);
 }
 
-bool OTAStorage_MKRGSM::rename(char const * /* old_file_name */, char const * /* new_file_name */)
+bool OTAStorage_SSU::rename(char const * /* old_file_name */, char const * /* new_file_name */)
 {
   /* Create a file 'UPDATE.OK' which is used by the SSU
    * 2nd stage bootloader to recognise that the update
@@ -82,9 +82,9 @@ bool OTAStorage_MKRGSM::rename(char const * /* old_file_name */, char const * /*
   return (_fileUtils.appendFile(SSU_CHECK_FILE_NAME, &c, sizeof(c)) == sizeof(c));
 }
 
-void OTAStorage_MKRGSM::deinit()
+void OTAStorage_SSU::deinit()
 {
   /* Nothing to do */
 }
 
-#endif /* OTA_STORAGE_MKRGSM */
+#endif /* OTA_STORAGE_SSU */

src/utility/ota/OTAStorage_MKRGSM.h renamed to src/utility/ota/OTAStorage_SSU.h

@@ -15,15 +15,15 @@
    a commercial license, send an email to [email protected].
 */
 
-#ifndef ARDUINO_OTA_STORAGE_MKRGSM_H_
-#define ARDUINO_OTA_STORAGE_MKRGSM_H_
+#ifndef ARDUINO_OTA_STORAGE_SSU_H_
+#define ARDUINO_OTA_STORAGE_SSU_H_
 
 /******************************************************************************
  * INCLUDE
  ******************************************************************************/
 
 #include <ArduinoIoTCloud_Config.h>
-#if OTA_STORAGE_MKRGSM
+#if OTA_STORAGE_SSU
 
 #include <SSU.h>
 
@@ -35,11 +35,11 @@
  * CLASS DECLARATION
  ******************************************************************************/
 
-class OTAStorage_MKRGSM : public OTAStorage
+class OTAStorage_SSU : public OTAStorage
 {
 public:
 
-  virtual ~OTAStorage_MKRGSM() { }
+  virtual ~OTAStorage_SSU() { }
 
 
   virtual bool   init  () override;
@@ -56,6 +56,6 @@ class OTAStorage_MKRGSM : public OTAStorage
 
 };
 
-#endif /* OTA_STORAGE_MKRGSM */
+#endif /* OTA_STORAGE_SSU */
 
-#endif /* ARDUINO_OTA_STORAGE_MKRGSM_H_ */
+#endif /* ARDUINO_OTA_STORAGE_SSU_H_ */