Почетна Преглед Помоћ
Регистрација Пријавите се
benjamin.harris
/
DSP-ADAU1467
1
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

Initial OTA Implementation

Benjamin Harris пре 1 месец
родитељ
19f22f3847
комит
0cfb10907c
2 измењених фајлова са 164 додато и 0 уклоњено
Један поглед Покажи статистику Diff
  1. 61 0
      ModulosDSP_101.ino
  2. 103 0
      ota_html.h

+ 61 - 0
ModulosDSP_101.ino
Прегледај датотеку 

@@ -59,6 +59,7 @@
 
 #include <Adafruit_NeoPixel.h>
 
 #include <Adafruit_NeoPixel.h>
 
 #include "FS.h"
 
 #include "FS.h"
 
 #include <LittleFS.h>
 
 #include <LittleFS.h>
 
+#include <Update.h>
 
 
 
 //=============================================================
 
 //=============================================================
 
 // WiFi / UI
 
 // WiFi / UI
 
@@ -74,6 +75,7 @@ WiFiServer tcpServer(8086);
 
 WebServer  httpServer(80);
 
 WebServer  httpServer(80);
 
 
 
 #include "index_html.h"
 
 #include "index_html.h"
 
+#include "ota_html.h"
 
 
 
 hd44780_I2Cexp lcd;
 
 hd44780_I2Cexp lcd;
 
 static bool s_lcdOk = false;
 
 static bool s_lcdOk = false;
 
@@ -441,6 +443,63 @@ static void handleUploadStream() {
 
   }
 
   }
 
 }
 
 }
 
 
 
+//=============================================================
 
+// HTTP OTA handlers
 
+//=============================================================
 
+static void handleOtaPage() {
 
+  String html = FPSTR(OTA_HTML);
 
+  html.replace("{{IP}}", WiFi.localIP().toString());
 
+  httpServer.send(200, "text/html; charset=utf-8", html);
 
+}
 
+
 
+static void handleOtaDone() {
 
+  if (Update.hasError()) {
 
+    String err = "OTA failed: " + String(Update.errorString());
 
+    Serial.println(err);
 
+    httpServer.send(500, "text/plain", err);
 
+  } else {
 
+    httpServer.send(200, "text/plain", "Firmware updated — rebooting now.");
 
+    Serial.println("OTA success — rebooting");
 
+    delay(500);
 
+    ESP.restart();
 
+  }
 
+}
 
+
 
+static void handleOtaStream() {
 
+  HTTPUpload& up = httpServer.upload();
 
+
 
+  if (up.status == UPLOAD_FILE_START) {
 
+    Serial.printf("OTA start: %s\n", up.filename.c_str());
 
+    ledCyan();
 
+    if (!Update.begin(UPDATE_SIZE_UNKNOWN)) {
 
+      Serial.print("OTA begin failed: ");
 
+      Update.printError(Serial);
 
+    }
 
+  }
 
+  else if (up.status == UPLOAD_FILE_WRITE) {
 
+    if (Update.write(up.buf, up.currentSize) != up.currentSize) {
 
+      Serial.print("OTA write failed: ");
 
+      Update.printError(Serial);
 
+      ledErrorFlash();
 
+    }
 
+  }
 
+  else if (up.status == UPLOAD_FILE_END) {
 
+    if (Update.end(true)) {
 
+      Serial.printf("OTA end: %u bytes written\n", up.totalSize);
 
+    } else {
 
+      Serial.print("OTA end failed: ");
 
+      Update.printError(Serial);
 
+      ledErrorFlash();
 
+    }
 
+    ledOff();
 
+  }
 
+  else if (up.status == UPLOAD_FILE_ABORTED) {
 
+    Update.abort();
 
+    Serial.println("OTA aborted");
 
+    ledOff();
 
+  }
 
+}
 
+
 
 //=============================================================
 
 //=============================================================
 
 // Setup
 
 // Setup
 
 //=============================================================
 
 //=============================================================
 
@@ -487,6 +546,8 @@ void setup() {
 
   httpServer.on("/", HTTP_GET, handleRoot);
 
   httpServer.on("/", HTTP_GET, handleRoot);
 
   httpServer.on("/status", HTTP_GET, handleStatus);
 
   httpServer.on("/status", HTTP_GET, handleStatus);
 
   httpServer.on("/upload", HTTP_POST, handleUploadDone, handleUploadStream);
 
   httpServer.on("/upload", HTTP_POST, handleUploadDone, handleUploadStream);
 
+  httpServer.on("/ota", HTTP_GET, handleOtaPage);
 
+  httpServer.on("/ota_do", HTTP_POST, handleOtaDone, handleOtaStream);
 
   httpServer.onNotFound([]() {
 
   httpServer.onNotFound([]() {
 
     String uri = httpServer.uri();
 
     String uri = httpServer.uri();
 
     if (streamFromFS(uri)) return;
 
     if (streamFromFS(uri)) return;

+ 103 - 0
ota_html.h
Прегледај датотеку 

@@ -0,0 +1,103 @@
 
+#pragma once
 
+#include <pgmspace.h>
 
+
 
+static const char OTA_HTML[] PROGMEM = R"HTML(
 
+<!doctype html>
 
+<html lang="en-AU">
 
+<head>
 
+  <meta charset="utf-8">
 
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 
+  <link rel="icon" type="image/x-icon" href="/favicon.ico">
 
+  <link rel="stylesheet" href="yeti-bootstrap.min.css">
 
+  <link rel="stylesheet" href="font-awesome.min.css">
 
+  <script src="jquery-3.7.1.slim.min.js" crossorigin="anonymous"></script>
 
+
 
+  <title>Modulos DSP - Firmware Update</title>
 
+  <style>
 
+    body { padding-top: 40px; }
 
+    .ota-card { max-width: 520px; margin: 0 auto; }
 
+    #progressWrap { display: none; margin-top: 1.2rem; }
 
+    #resultBox   { display: none; margin-top: 1rem; }
 
+  </style>
 
+</head>
 
+<body>
 
+<div class="container ota-card">
 
+
 
+  <h4 class="mb-1"><i class="fa fa-microchip"></i> Firmware Update (OTA)</h4>
 
+  <p class="text-muted small mb-4">Device: <strong>{{IP}}</strong></p>
 
+
 
+  <form id="otaForm" action="/ota_do" method="POST" enctype="multipart/form-data">
 
+    <div class="mb-3">
 
+      <label class="form-label fw-semibold">Firmware binary (.bin)</label>
 
+      <input class="form-control" type="file" id="fwFile" name="firmware" accept=".bin" required>
 
+      <div class="form-text">Export from Arduino IDE: <em>Sketch &rarr; Export Compiled Binary</em></div>
 
+    </div>
 
+    <button type="submit" id="flashBtn" class="btn btn-warning w-100">
 
+      <i class="fa fa-upload"></i>&nbsp; Flash Firmware
 
+    </button>
 
+  </form>
 
+
 
+  <div id="progressWrap">
 
+    <div class="progress" style="height:22px">
 
+      <div class="progress-bar progress-bar-striped progress-bar-animated bg-warning"
 
+           style="width:100%; font-size:0.8rem; line-height:22px">
 
+        Uploading&hellip;
 
+      </div>
 
+    </div>
 
+    <p class="text-center text-muted small mt-2">
 
+      <i class="fa fa-spinner fa-spin"></i>
 
+      Do not power off the device.
 
+    </p>
 
+  </div>
 
+
 
+  <div id="resultBox" class="alert" role="alert"></div>
 
+
 
+  <hr class="mt-4">
 
+  <a href="/" class="text-muted small"><i class="fa fa-arrow-left"></i> Back to EEPROM Uploader</a>
 
+</div>
 
+
 
+<script>
 
+document.getElementById('otaForm').addEventListener('submit', function(e) {
 
+  e.preventDefault();
 
+  var file = document.getElementById('fwFile').files[0];
 
+  if (!file) return;
 
+
 
+  document.getElementById('flashBtn').disabled = true;
 
+  document.getElementById('progressWrap').style.display = 'block';
 
+  document.getElementById('resultBox').style.display = 'none';
 
+
 
+  var fd = new FormData(this);
 
+  var xhr = new XMLHttpRequest();
 
+  xhr.open('POST', '/ota_do', true);
 
+
 
+  xhr.onload = function() {
 
+    document.getElementById('progressWrap').style.display = 'none';
 
+    var box = document.getElementById('resultBox');
 
+    box.style.display = 'block';
 
+    if (xhr.status === 200) {
 
+      box.className = 'alert alert-success';
 
+      box.innerHTML = '<i class="fa fa-check-circle"></i> ' + xhr.responseText +
 
+                      '<br><small>Reconnecting in 5 seconds&hellip;</small>';
 
+      setTimeout(function(){ window.location.href = '/'; }, 5500);
 
+    } else {
 
+      box.className = 'alert alert-danger';
 
+      box.innerHTML = '<i class="fa fa-times-circle"></i> ' + xhr.responseText;
 
+      document.getElementById('flashBtn').disabled = false;
 
+    }
 
+  };
 
+
 
+  xhr.onerror = function() {
 
+    document.getElementById('progressWrap').style.display = 'none';
 
+    var box = document.getElementById('resultBox');
 
+    box.style.display = 'block';
 
+    box.className = 'alert alert-danger';
 
+    box.innerHTML = '<i class="fa fa-times-circle"></i> Upload error — check Serial log.';
 
+    document.getElementById('flashBtn').disabled = false;
 
+  };
 
+
 
+  xhr.send(fd);
 
+});
 
+</script>
 
+</body>
 
+</html>
 
+)HTML";