OTA: add format on failure flag

Author: pennam

UNOR4USBBridge/OTA.cpp

@@ -41,12 +41,12 @@ Arduino_UNOWIFIR4_OTA::~Arduino_UNOWIFIR4_OTA() {
  closeStorage();
 }
 
-Arduino_ESP32_OTA::Error Arduino_UNOWIFIR4_OTA::begin(const char* file_path, uint32_t magic)
+Arduino_ESP32_OTA::Error Arduino_UNOWIFIR4_OTA::begin(const char* file_path, uint32_t magic, bool formatOnFail)
 {
  /* ... configure board Magic number */
  setMagic(magic);
 
- if(!SPIFFS.begin()) {
+ if(!SPIFFS.begin(formatOnFail)) {
  DEBUG_ERROR("%s: failed to initialize SPIFFS", __FUNCTION__);
  return Error::OtaStorageInit;
  }

UNOR4USBBridge/OTA.h

@@ -46,7 +46,7 @@ class Arduino_UNOWIFIR4_OTA : public Arduino_ESP32_OTA
  };
 
  using Arduino_ESP32_OTA::begin;
- Arduino_ESP32_OTA::Error begin(const char* file_path, uint32_t magic = ARDUINO_RA4M1_OTA_MAGIC);
+ Arduino_ESP32_OTA::Error begin(const char* file_path, uint32_t magic = ARDUINO_RA4M1_OTA_MAGIC, bool formatOnfail = false);
 
  using Arduino_ESP32_OTA::download;
  int download(const char * ota_url, const char* file_path);

UNOR4USBBridge/cmds_ota.h

@@ -57,7 +57,7 @@ void CAtHandler::add_cmds_ota() {
  return chAT::CommandStatus::OK;
  }
  case chAT::CommandMode::Write: {
- if (parser.args.size() != 1) {
+ if (parser.args.size() != 1 && parser.args.size() != 2) {
  return chAT::CommandStatus::ERROR;
  }
 
@@ -66,7 +66,16 @@ void CAtHandler::add_cmds_ota() {
  return chAT::CommandStatus::ERROR;
  }
 
- Arduino_ESP32_OTA::Error ota_error = OTA.begin(path.c_str());
+ bool formatOnFail = false;
+ if (parser.args.size() == 2) {
+ auto &format = parser.args[1];
+ if (format.empty()) {
+ return chAT::CommandStatus::ERROR;
+ }
+ formatOnFail = strtol(format.c_str(), NULL, 10) != 0;
+ }
+
+ Arduino_ESP32_OTA::Error ota_error = OTA.begin(path.c_str(), ARDUINO_RA4M1_OTA_MAGIC, formatOnFail);
  String error = String((int)ota_error) + _ENDL;
  srv.write_response_prompt();
  srv.write_str((const char *)(error.c_str()));