fixup! implemented stm32h7 ota class

Author: andreagilardoni

src/ota/implementation/OTASTM32H7.h

@@ -43,7 +43,6 @@ namespace portenta {
   };
 }
 
-template<portenta::StorageType storage=portenta::QSPI_FLASH_FATFS_MBR, uint32_t data_offset=2>
 class STM32H7OTACloudProcess: public OTADefaultCloudProcessInterface {
 public:
   STM32H7OTACloudProcess(MessageStream *ms, Client* client=nullptr);
@@ -93,6 +92,11 @@ class STM32H7OTACloudProcess: public OTADefaultCloudProcessInterface {
 
   mbed::MBRBlockDevice* cert_bd_qspi;
   mbed::FATFileSystem*  cert_fs_qspi;
+
+  const portenta::StorageType storage=portenta::QSPI_FLASH_FATFS_MBR;
+  const uint32_t data_offset=2;
+
+  static const char UPDATE_FILE_NAME[];
 };
 
 #include "OTASTM32H7.ipp"

src/ota/implementation/OTASTM32H7.ipp

@@ -16,11 +16,9 @@
 
 static bool findProgramLength(DIR * dir, uint32_t & program_length);
 
-// template<portenta::StorageType storage, uint32_t data_offset>
-static const char UPDATE_FILE_NAME[] = "/fs/UPDATE.BIN";
+static const char STM32H7OTACloudProcess::UPDATE_FILE_NAME[] = "/fs/UPDATE.BIN";
 
-template<portenta::StorageType storage, uint32_t data_offset>
-STM32H7OTACloudProcess<storage, data_offset>::STM32H7OTACloudProcess(MessageStream *ms, Client* client)
+STM32H7OTACloudProcess::STM32H7OTACloudProcess(MessageStream *ms, Client* client)
 : OTADefaultCloudProcessInterface(ms, client)
 , decompressed(nullptr)
 , _bd_raw_qspi(nullptr)
@@ -35,8 +33,7 @@ STM32H7OTACloudProcess<storage, data_offset>::STM32H7OTACloudProcess(MessageStre
 
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-STM32H7OTACloudProcess<storage, data_offset>::~STM32H7OTACloudProcess() {
+STM32H7OTACloudProcess::~STM32H7OTACloudProcess() {
   if(decompressed != nullptr) {
     fclose(decompressed);
     decompressed = nullptr;
@@ -45,27 +42,23 @@ STM32H7OTACloudProcess<storage, data_offset>::~STM32H7OTACloudProcess() {
   storageClean();
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-OTACloudProcessInterface::State STM32H7OTACloudProcess<storage, data_offset>::resume(Message* msg) {
+OTACloudProcessInterface::State STM32H7OTACloudProcess::resume(Message* msg) {
   return OtaBegin;
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-void STM32H7OTACloudProcess<storage, data_offset>::update() {
+void STM32H7OTACloudProcess::update() {
   OTADefaultCloudProcessInterface::update();
   watchdog_reset(); // FIXME this should npot be performed here
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-int STM32H7OTACloudProcess<storage, data_offset>::writeFlash(uint8_t* const buffer, size_t len) {
+int STM32H7OTACloudProcess::writeFlash(uint8_t* const buffer, size_t len) {
   if (decompressed == nullptr) {
     return -1;
   }
   return fwrite(buffer, sizeof(uint8_t), len, decompressed);
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-OTACloudProcessInterface::State STM32H7OTACloudProcess<storage, data_offset>::startOTA() {
+OTACloudProcessInterface::State STM32H7OTACloudProcess::startOTA() {
   if (!isOtaCapable()) {
     return NoCapableBootloaderFail;
   }
@@ -85,7 +78,6 @@ OTACloudProcessInterface::State STM32H7OTACloudProcess<storage, data_offset>::st
 
   // this could be useless, since we are writing over it
   remove(UPDATE_FILE_NAME);
-  remove("/fs/UPDATE.BIN.LZSS");
 
   decompressed = fopen(UPDATE_FILE_NAME, "wb");
 
@@ -94,8 +86,7 @@ OTACloudProcessInterface::State STM32H7OTACloudProcess<storage, data_offset>::st
 }
 
 
-template<portenta::StorageType storage, uint32_t data_offset>
-OTACloudProcessInterface::State STM32H7OTACloudProcess<storage, data_offset>::flashOTA() {
+OTACloudProcessInterface::State STM32H7OTACloudProcess::flashOTA() {
   fclose(decompressed);
   decompressed = nullptr;
 
@@ -113,8 +104,7 @@ OTACloudProcessInterface::State STM32H7OTACloudProcess<storage, data_offset>::fl
   return Reboot;
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-OTACloudProcessInterface::State STM32H7OTACloudProcess<storage, data_offset>::reboot() {
+OTACloudProcessInterface::State STM32H7OTACloudProcess::reboot() {
   // TODO save information about the progress reached in the ota
 
   // This command reboots the mcu
@@ -123,25 +113,22 @@ OTACloudProcessInterface::State STM32H7OTACloudProcess<storage, data_offset>::re
   return Resume; // This won't ever be reached
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-void STM32H7OTACloudProcess<storage, data_offset>::reset() {
+void STM32H7OTACloudProcess::reset() {
   OTADefaultCloudProcessInterface::reset();
 
   remove(UPDATE_FILE_NAME);
 
   storageClean();
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-void STM32H7OTACloudProcess<storage, data_offset>::storageClean() {
+void STM32H7OTACloudProcess::storageClean() {
   DEBUG_VERBOSE(F("storage clean"));
 
   if(decompressed != nullptr) {
     fclose(decompressed);
     decompressed = nullptr;
   }
 
-  // TODO close storage
   if(cert_bd_qspi != nullptr) {
     delete cert_bd_qspi;
     cert_bd_qspi = nullptr;
@@ -170,8 +157,7 @@ void STM32H7OTACloudProcess<storage, data_offset>::storageClean() {
 #endif // ARDUINO_PORTENTA_OTA_SDMMC_SUPPORT
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-bool STM32H7OTACloudProcess<storage, data_offset>::isOtaCapable() {
+bool STM32H7OTACloudProcess::isOtaCapable() {
   #define BOOTLOADER_ADDR   (0x8000000)
   uint32_t bootloader_data_offset = 0x1F000;
   uint8_t* bootloader_data = (uint8_t*)(BOOTLOADER_ADDR + bootloader_data_offset);
@@ -182,39 +168,36 @@ bool STM32H7OTACloudProcess<storage, data_offset>::isOtaCapable() {
     return true;
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-bool STM32H7OTACloudProcess<storage, data_offset>::caStorageInit() {
+bool STM32H7OTACloudProcess::caStorageInit() {
   _bd_raw_qspi = mbed::BlockDevice::get_default_instance();
 
   if (_bd_raw_qspi->init() != QSPIF_BD_ERROR_OK) {
-    DEBUG_ERROR(F("Error: QSPI init failure."));
+    DEBUG_VERBOSE(F("Error: QSPI init failure."));
     return false;
   }
 
   cert_bd_qspi = new mbed::MBRBlockDevice(_bd_raw_qspi, 1);
   cert_fs_qspi = new mbed::FATFileSystem("wlan");
   int const err_mount =  cert_fs_qspi->mount(cert_bd_qspi);
   if (err_mount) {
-    DEBUG_ERROR(F("Error while mounting the certificate filesystem. Err = %d"), err_mount);
+    DEBUG_VERBOSE(F("Error while mounting the certificate filesystem. Err = %d"), err_mount);
     return false;
   }
   return true;
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-bool STM32H7OTACloudProcess<storage, data_offset>::caStorageOpen() {
+bool STM32H7OTACloudProcess::caStorageOpen() {
   FILE* fp = fopen("/wlan/cacert.pem", "r");
   if (!fp) {
-    DEBUG_ERROR(F("Error while opening the certificate file."));
+    DEBUG_VERBOSE(F("Error while opening the certificate file."));
     return false;
   }
   fclose(fp);
 
   return true;
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-bool STM32H7OTACloudProcess<storage, data_offset>::storageInit() {
+bool STM32H7OTACloudProcess::storageInit() {
   int err_mount=1;
 
   if constexpr (storage == portenta::QSPI_FLASH_FATFS) {
@@ -243,12 +226,11 @@ bool STM32H7OTACloudProcess<storage, data_offset>::storageInit() {
   if (!err_mount) {
     return true;
   }
-  DEBUG_ERROR(F("Error while mounting the filesystem. Err = %d"), err_mount);
+  DEBUG_VERBOSE(F("Error while mounting the filesystem. Err = %d"), err_mount);
   return false;
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-bool STM32H7OTACloudProcess<storage, data_offset>::storageOpen() {
+bool STM32H7OTACloudProcess::storageOpen() {
   DIR * dir = NULL;
   if ((dir = opendir("/fs")) != NULL)
   {
@@ -282,14 +264,12 @@ extern uint32_t __etext;
 extern uint32_t _sdata;
 extern uint32_t _edata;
 
-template<portenta::StorageType storage, uint32_t data_offset>
-void* STM32H7OTACloudProcess<storage, data_offset>::appStartAddress() {
+void* STM32H7OTACloudProcess::appStartAddress() {
   return (void*)0x8040000;
   // return &__stext;
 }
 
-template<portenta::StorageType storage, uint32_t data_offset>
-uint32_t STM32H7OTACloudProcess<storage, data_offset>::appSize() {
+uint32_t STM32H7OTACloudProcess::appSize() {
   return ((&__etext - (uint32_t*)appStartAddress()) + (&_edata - &_sdata))*sizeof(void*);
 }