implemented non blocking download in ota interface

Author: andreagilardoni

UNOR4USBBridge/OTA.cpp

@@ -22,19 +22,27 @@
 #include <SPIFFS.h>
 #include <Arduino_ESP32_OTA.h>
 #include "OTA.h"
+#include "BossaUnoR4WiFi.h"
+
+#include "FS.h"
+#include "SPIFFS.h"
+#include "at_handler.h"
 
 /******************************************************************************
    PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
-Arduino_ESP32_OTA::Error Arduino_UNOWIFIR4_OTA::begin(const char* file_path, uint32_t magic)
-{
-  /* initialize private variables */
-  otaInit();
+Arduino_UNOWIFIR4_OTA::Arduino_UNOWIFIR4_OTA()
+: _updating_renesas(true) {
 
-  /* ... initialize CRC ... */
-  crc32Init();
+}
 
+Arduino_UNOWIFIR4_OTA::~Arduino_UNOWIFIR4_OTA() {
+  closeStorage();
+}
+
+Arduino_ESP32_OTA::Error Arduino_UNOWIFIR4_OTA::begin(const char* file_path, uint32_t magic)
+{
   /* ... configure board Magic number */
   setMagic(magic);
 
@@ -47,23 +55,22 @@ Arduino_ESP32_OTA::Error Arduino_UNOWIFIR4_OTA::begin(const char* file_path, uin
     SPIFFS.remove(file_path);
   }
 
-  _spiffs = true;
+  _updating_renesas = true;
 
   SPIFFS.end();
   return Error::None;
 }
 
 void Arduino_UNOWIFIR4_OTA::write_byte_to_flash(uint8_t data)
 {
-  if(_spiffs) {
+  if(_updating_renesas) {
     int ret = fwrite(&data, sizeof(data), 1, _file);
   } else {
     Arduino_ESP32_OTA::write_byte_to_flash(data);
   }
 }
 
-int Arduino_UNOWIFIR4_OTA::download(const char * ota_url, const char* file_path)
-{
+int Arduino_UNOWIFIR4_OTA::initStorage(const char* file_path) {
   if(!SPIFFS.begin()) {
     DEBUG_ERROR("%s: failed to initialize SPIFFS", __FUNCTION__);
     return static_cast<int>(Error::OtaStorageInit);
@@ -76,33 +83,66 @@ int Arduino_UNOWIFIR4_OTA::download(const char * ota_url, const char* file_path)
     DEBUG_ERROR("%s: failed to write SPIFFS", __FUNCTION__);
     return static_cast<int>(Error::OtaStorageInit);
   }
+  return static_cast<int>(Error::None);
+}
 
-  /* Download and decode OTA file */
-  size_t size = download(ota_url);
+int Arduino_UNOWIFIR4_OTA::closeStorage() {
+  int res = 0;
+  if(_file != nullptr) {
+    res = fclose(_file);
+    _file = nullptr;
+  }
 
-  fclose(_file);
-  _file = nullptr;
   SPIFFS.end();
-  return size;
+  return res;
 }
 
-Arduino_ESP32_OTA::Error Arduino_UNOWIFIR4_OTA::verify()
+int Arduino_UNOWIFIR4_OTA::download(const char * ota_url, const char* file_path)
 {
-  /* ... then finalize ... */
-  crc32Finalize();
+  int res = initStorage(file_path);
 
-  if(!crc32Verify()) {
-    DEBUG_ERROR("%s: CRC32 mismatch", __FUNCTION__);
-    return Error::OtaHeaderCrc;
+  if(res < 0) {
+    return res;
   }
-  return Error::None;
+
+  /* Download and decode OTA file */
+  res = download(ota_url);
+
+  closeStorage();
+
+  return res;
 }
 
-Arduino_ESP32_OTA::Error Arduino_UNOWIFIR4_OTA::update()
+int Arduino_UNOWIFIR4_OTA::startDownload(const char * ota_url, const char* file_path)
 {
-  if (!Update.end(true)) {
-    DEBUG_ERROR("%s: Failure to apply OTA update. Error: %s", __FUNCTION__, Update.errorString());
-    return Error::OtaStorageEnd;
+  int res = initStorage(file_path);
+
+  if(res < 0) {
+    return res;
   }
-  return Error::None;
+
+  /* Download and decode OTA file */
+  res = startDownload(ota_url);
+
+  if(res < 0) {
+    closeStorage();
+  }
+
+  return res;
+}
+
+int Arduino_UNOWIFIR4_OTA::downloadPoll()
+{
+  auto res = Arduino_ESP32_OTA::downloadPoll();
+
+  if(_updating_renesas && res != 0) {
+    closeStorage();
+  }
+
+  return res;
+}
+
+int Arduino_UNOWIFIR4_OTA::update(const char* file_path)
+{
+  return BOSSA.program(file_path, Serial, GPIO_BOOT, GPIO_RST);
 }

UNOR4USBBridge/OTA.h

@@ -35,26 +35,41 @@
 
 class Arduino_UNOWIFIR4_OTA : public Arduino_ESP32_OTA
 {
-
 public:
 
+  Arduino_UNOWIFIR4_OTA();
+  ~Arduino_UNOWIFIR4_OTA();
+
   enum class UNO_WiFi_R4_Error : int
   {
     StorageConfig = -20,
   };
 
   using Arduino_ESP32_OTA::begin;
   Arduino_ESP32_OTA::Error begin(const char* file_path, uint32_t magic = ARDUINO_RA4M1_OTA_MAGIC);
+
   using Arduino_ESP32_OTA::download;
   int download(const char * ota_url, const char* file_path);
+
+  using Arduino_ESP32_OTA::startDownload;
+  int startDownload(const char * ota_url, const char* file_path);
+
+  int downloadPoll() override;
+  using Arduino_ESP32_OTA::downloadProgress;
+
   void write_byte_to_flash(uint8_t data);
-  Arduino_ESP32_OTA::Error verify();
-  Arduino_ESP32_OTA::Error update();
 
-private:
+  using Arduino_ESP32_OTA::verify;
+
+  using Arduino_ESP32_OTA::update;
+  int update(const char* file_path);
 
+  int initStorage(const char* file_path);
+  int closeStorage();
+
+private:
   FILE* _file;
-  bool _spiffs;
+  bool _updating_renesas;
 };
 
 #endif /* ARDUINO_UNOWIFIR4_OTA_H_ */