mirror of
https://github.com/Threnklyn/esphome-dev.git
synced 2026-05-20 04:53:28 +02:00
Otto Winter
ac0d921413
* Socket refactor and SSL * esp-idf temp * Fixes * Echo component and noise * Add noise API transport support * Updates * ESP-IDF * Complete * Fixes * Fixes * Versions update * New i2c APIs * Complete i2c refactor * SPI migration * Revert ESP Preferences migration, too complex for now * OTA support * Remove echo again * Remove ssl again * GPIOFlags updates * Rename esphal and ICACHE_RAM_ATTR * Make ESP32 arduino compilable again * Fix GPIO flags * Complete pin registry refactor and fixes * Fixes to make test1 compile * Remove sdkconfig file * Ignore sdkconfig file * Fixes in reviewing * Make test2 compile * Make test4 compile * Make test5 compile * Run clang-format * Fix lint errors * Use esp-idf APIs instead of btStart * Another round of fixes * Start implementing ESP8266 * Make test3 compile * Guard esp8266 code * Lint * Reformat * Fixes * Fixes v2 * more fixes * ESP-IDF tidy target * Convert ARDUINO_ARCH_ESPxx * Update WiFiSignalSensor * Update time ifdefs * OTA needs millis from hal * RestartSwitch needs delay from hal * ESP-IDF Uart * Fix OTA blank password * Allow setting sdkconfig * Fix idf partitions and allow setting sdkconfig from yaml * Re-add read/write compat APIs and fix esp8266 uart * Fix esp8266 store log strings in flash * Fix ESP32 arduino preferences not initialized * Update ifdefs * Change how sdkconfig change is detected * Add checks to ci-custom and fix them * Run clang-format * Add esp-idf clang-tidy target and fix errors * Fixes from clang-tidy idf round 2 * Fixes from compiling tests with esp-idf * Run clang-format * Switch test5.yaml to esp-idf * Implement ESP8266 Preferences * Lint * Re-do PIO package version selection a bit * Fix arduinoespressif32 package version * Fix unit tests * Lint * Lint fixes * Fix readv/writev not defined * Fix graphing component * Re-add all old options from core/config.py Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
104 lines
2.7 KiB
C++
104 lines
2.7 KiB
C++
#ifdef USE_ARDUINO
|
|
|
|
#include "web_server_base.h"
|
|
#include "esphome/core/log.h"
|
|
#include "esphome/core/application.h"
|
|
#include <StreamString.h>
|
|
|
|
#ifdef USE_ESP32
|
|
#include <Update.h>
|
|
#endif
|
|
#ifdef USE_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 USE_ESP8266
|
|
Update.runAsync(true);
|
|
// NOLINTNEXTLINE(readability-static-accessed-through-instance)
|
|
success = Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000);
|
|
#endif
|
|
#ifdef USE_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
|
|
|
|
#endif // USE_ARDUINO
|