adding OTADOWNLOADSTART OTADOWNLOADPROGRESS AT commands to support non blocking download

Author: andreagilardoni

UNOR4USBBridge/cmds_ota.h

@@ -3,9 +3,9 @@
 
 #include "at_handler.h"
 #include "OTA.h"
-#include "BossaUnoR4WiFi.h"
 
 Arduino_UNOWIFIR4_OTA OTA;
+void otaDownloadProgress(CAtHandler* at_handler);
 
 void CAtHandler::add_cmds_ota() {
    /* ....................................................................... */
@@ -123,6 +123,75 @@ void CAtHandler::add_cmds_ota() {
       }
    };
 
+   /* ....................................................................... */
+   command_table[_OTA_DOWNLOAD_START] = [this](auto & srv, auto & parser) {
+   /* ....................................................................... */
+
+      switch (parser.cmd_mode) {
+         case chAT::CommandMode::Write: {
+            if (parser.args.size() == 1) {
+               auto &url = parser.args[0];
+               if (url.empty()) {
+                  return chAT::CommandStatus::ERROR;
+               }
+
+               int ota_error = OTA.startDownload(url.c_str());
+               String error = String((int)ota_error) + _ENDL;
+               srv.write_response_prompt();
+               srv.write_str((const char *)(error.c_str()));
+               srv.write_line_end();
+
+               this->addTask(std::bind(&otaDownloadProgress, this));
+
+               return chAT::CommandStatus::OK;
+            } else if(parser.args.size() == 2) {
+               auto &url = parser.args[0];
+               if (url.empty()) {
+                  return chAT::CommandStatus::ERROR;
+               }
+
+               auto &path = parser.args[1];
+               if (path.empty()) {
+                  return chAT::CommandStatus::ERROR;
+               }
+
+               int ota_error = OTA.startDownload(url.c_str(), path.c_str());
+
+               this->addTask(std::bind(&otaDownloadProgress, this));
+
+               String error = String((int)ota_error) + _ENDL;
+               srv.write_response_prompt();
+               srv.write_str((const char *)(error.c_str()));
+               srv.write_line_end();
+               return chAT::CommandStatus::OK;
+            } else {
+               return chAT::CommandStatus::ERROR;
+            }
+
+         }
+         default:
+            return chAT::CommandStatus::ERROR;
+      }
+   };
+
+   /* ....................................................................... */
+   command_table[_OTA_DOWNLOAD_PROGRESS] = [this](auto & srv, auto & parser) {
+   /* ....................................................................... */
+      switch (parser.cmd_mode) {
+         case chAT::CommandMode::Run: {
+            int progress = OTA.downloadProgress();
+            String pogress_str = String((int)progress) + _ENDL;
+            srv.write_response_prompt();
+            srv.write_str((const char *)(pogress_str.c_str()));
+            srv.write_line_end();
+
+            return chAT::CommandStatus::OK;
+         }
+         default:
+            return chAT::CommandStatus::ERROR;
+      }
+   };
+
    /* ....................................................................... */
    command_table[_OTA_VERIFY] = [this](auto & srv, auto & parser) {
    /* ....................................................................... */
@@ -162,8 +231,8 @@ void CAtHandler::add_cmds_ota() {
                return chAT::CommandStatus::ERROR;
             }
 
-            int flash_error = BOSSA.program(path.c_str(), Serial, GPIO_BOOT, GPIO_RST);
-            String error = String(flash_error) + "\r\n";
+            int flash_error = OTA.update(path.c_str());
+            String error = String(flash_error) + _ENDL;
             srv.write_response_prompt();
             srv.write_str((const char *)(error.c_str()));
             srv.write_line_end();
@@ -191,4 +260,15 @@ void CAtHandler::add_cmds_ota() {
    };
 }
 
+// in order to make the download progress downloadPoll must be called periodically
+// until the end, this function readds itself to the task list until completed
+void otaDownloadProgress(CAtHandler* at_handler) {
+   auto res = OTA.downloadPoll();
+
+   // continue to progress the download if the state is not completed or not an error
+   if(res == 0) {
+      at_handler->addTask(std::bind(&otaDownloadProgress, at_handler));
+   }
+};
+
 #endif

UNOR4USBBridge/commands.h

@@ -119,6 +119,8 @@ enum file_op {
 #define _OTA_SETCAROOT           "+OTASETCAROOT"
 #define _OTA_BEGIN               "+OTABEGIN"
 #define _OTA_DOWNLOAD            "+OTADOWNLOAD"
+#define _OTA_DOWNLOAD_START      "+OTADOWNLOADSTART"
+#define _OTA_DOWNLOAD_PROGRESS   "+OTADOWNLOADPROGRESS"
 #define _OTA_VERIFY              "+OTAVERIFY"
 #define _OTA_UPDATE              "+OTAUPDATE"
 #define _OTA_RESET               "+OTARESET"