924df1e7de
* Add macros header with more usable Arduino version defines * Change Arduino version checking to use our version defines * Add missing ESP8266 check * Rename Arduino version macro to ARDUINO_VERSION_CODE * Upgrade clang-tidy to use Arduino 3 * Fix clang-tidy warnings * Upgrade NeoPixelBus to upstream 2.6.7 * Use Arduino-version-appropriate API to set redirect flags * Remove now unnecessary CLANG_TIDY ifdefs * Add preprocessor hackery to avoid including pgmspace.h * Bump base image to 4.1.1 and update lint * Fix nfctag * Fix make_unique ambiguous * Fix ignore name * Fix ambiguous v2 * Remove unused begin * Cast time_t to prevent issues on platforms where time_t is 32bit Co-authored-by: Otto winter <otto@otto-winter.com>
100 lines
2.7 KiB
C++
100 lines
2.7 KiB
C++
#include "web_server_base.h"
|
|
#include "esphome/core/log.h"
|
|
#include "esphome/core/application.h"
|
|
#include <StreamString.h>
|
|
|
|
#ifdef ARDUINO_ARCH_ESP32
|
|
#include <Update.h>
|
|
#endif
|
|
#ifdef ARDUINO_ARCH_ESP8266
|
|
#include <Updater.h>
|
|
#endif
|
|
|
|
namespace esphome {
|
|
namespace web_server_base {
|
|
|
|
static const char *const TAG = "web_server_base";
|
|
|
|
void report_ota_error() {
|
|
StreamString ss;
|
|
Update.printError(ss);
|
|
ESP_LOGW(TAG, "OTA Update failed! Error: %s", ss.c_str());
|
|
}
|
|
|
|
void OTARequestHandler::handleUpload(AsyncWebServerRequest *request, const String &filename, size_t index,
|
|
uint8_t *data, size_t len, bool final) {
|
|
bool success;
|
|
if (index == 0) {
|
|
ESP_LOGI(TAG, "OTA Update Start: %s", filename.c_str());
|
|
this->ota_read_length_ = 0;
|
|
#ifdef ARDUINO_ARCH_ESP8266
|
|
Update.runAsync(true);
|
|
// NOLINTNEXTLINE(readability-static-accessed-through-instance)
|
|
success = Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000);
|
|
#endif
|
|
#ifdef ARDUINO_ARCH_ESP32
|
|
if (Update.isRunning())
|
|
Update.abort();
|
|
success = Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH);
|
|
#endif
|
|
if (!success) {
|
|
report_ota_error();
|
|
return;
|
|
}
|
|
} else if (Update.hasError()) {
|
|
// don't spam logs with errors if something failed at start
|
|
return;
|
|
}
|
|
|
|
success = Update.write(data, len) == len;
|
|
if (!success) {
|
|
report_ota_error();
|
|
return;
|
|
}
|
|
this->ota_read_length_ += len;
|
|
|
|
const uint32_t now = millis();
|
|
if (now - this->last_ota_progress_ > 1000) {
|
|
if (request->contentLength() != 0) {
|
|
float percentage = (this->ota_read_length_ * 100.0f) / request->contentLength();
|
|
ESP_LOGD(TAG, "OTA in progress: %0.1f%%", percentage);
|
|
} else {
|
|
ESP_LOGD(TAG, "OTA in progress: %u bytes read", this->ota_read_length_);
|
|
}
|
|
this->last_ota_progress_ = now;
|
|
}
|
|
|
|
if (final) {
|
|
if (Update.end(true)) {
|
|
ESP_LOGI(TAG, "OTA update successful!");
|
|
this->parent_->set_timeout(100, []() { App.safe_reboot(); });
|
|
} else {
|
|
report_ota_error();
|
|
}
|
|
}
|
|
}
|
|
void OTARequestHandler::handleRequest(AsyncWebServerRequest *request) {
|
|
AsyncWebServerResponse *response;
|
|
if (!Update.hasError()) {
|
|
response = request->beginResponse(200, "text/plain", "Update Successful!");
|
|
} else {
|
|
StreamString ss;
|
|
ss.print("Update Failed: ");
|
|
Update.printError(ss);
|
|
response = request->beginResponse(200, "text/plain", ss);
|
|
}
|
|
response->addHeader("Connection", "close");
|
|
request->send(response);
|
|
}
|
|
|
|
void WebServerBase::add_ota_handler() {
|
|
this->add_handler(new OTARequestHandler(this)); // NOLINT
|
|
}
|
|
float WebServerBase::get_setup_priority() const {
|
|
// Before WiFi (captive portal)
|
|
return setup_priority::WIFI + 2.0f;
|
|
}
|
|
|
|
} // namespace web_server_base
|
|
} // namespace esphome
|