jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-07 02:47:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
J. Nick Koston 2025-06-29 14:59:41 -05:00
parent 344297b0a7
commit 3433ee8171
No known key found for this signature in database
2 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
esphome/components/web_server_base/web_server_base.cpp
View File

@ -14,7 +14,7 @@
#endif #endif
#endif #endif
#if defined(USE_ESP_IDF) && defined(USE_WEBSERVER_OTA) #ifdef USE_WEBSERVER_OTA
#include "esphome/components/ota/ota_backend.h" #include "esphome/components/ota/ota_backend.h"
#endif #endif
@ -23,6 +23,21 @@ namespace web_server_base {
static const char *const TAG = "web_server_base"; static const char *const TAG = "web_server_base";
#ifdef USE_WEBSERVER_OTA
void OTARequestHandler::report_ota_progress_(AsyncWebServerRequest *request) {
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;
}
}
#endif
void WebServerBase::add_handler(AsyncWebHandler *handler) { void WebServerBase::add_handler(AsyncWebHandler *handler) {
// remove all handlers // remove all handlers
@ -45,6 +60,7 @@ void report_ota_error() {
void OTARequestHandler::handleUpload(AsyncWebServerRequest *request, const String &filename, size_t index, void OTARequestHandler::handleUpload(AsyncWebServerRequest *request, const String &filename, size_t index,
uint8_t *data, size_t len, bool final) { uint8_t *data, size_t len, bool final) {
#ifdef USE_WEBSERVER_OTA
#ifdef USE_ARDUINO #ifdef USE_ARDUINO
bool success; bool success;
if (index == 0) { if (index == 0) {
@ -76,17 +92,7 @@ void OTARequestHandler::handleUpload(AsyncWebServerRequest *request, const Strin
return; return;
} }
this->ota_read_length_ += len; this->ota_read_length_ += len;
this->report_ota_progress_(request);
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 (final) {
if (Update.end(true)) { if (Update.end(true)) {
@ -96,9 +102,9 @@ void OTARequestHandler::handleUpload(AsyncWebServerRequest *request, const Strin
report_ota_error(); report_ota_error();
} }
} }
#endif #endif // USE_ARDUINO
#if defined(USE_ESP_IDF) && defined(USE_WEBSERVER_OTA) #ifdef USE_ESP_IDF
// ESP-IDF implementation // ESP-IDF implementation
if (index == 0) { if (index == 0) {
ESP_LOGI(TAG, "OTA Update Start: %s", filename.c_str()); ESP_LOGI(TAG, "OTA Update Start: %s", filename.c_str());
@ -133,17 +139,7 @@ void OTARequestHandler::handleUpload(AsyncWebServerRequest *request, const Strin
} }
this->ota_read_length_ += len; this->ota_read_length_ += len;
this->report_ota_progress_(request);
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 (final) {
@ -157,11 +153,13 @@ void OTARequestHandler::handleUpload(AsyncWebServerRequest *request, const Strin
this->ota_backend_.reset(); this->ota_backend_.reset();
this->ota_started_ = false; this->ota_started_ = false;
} }
#endif #endif // USE_ESP_IDF
#endif // USE_WEBSERVER_OTA
} }
void OTARequestHandler::handleRequest(AsyncWebServerRequest *request) { void OTARequestHandler::handleRequest(AsyncWebServerRequest *request) {
#ifdef USE_ARDUINO #ifdef USE_WEBSERVER_OTA
AsyncWebServerResponse *response; AsyncWebServerResponse *response;
#ifdef USE_ARDUINO
if (!Update.hasError()) { if (!Update.hasError()) {
response = request->beginResponse(200, "text/plain", "Update Successful!"); response = request->beginResponse(200, "text/plain", "Update Successful!");
} else { } else {
@ -170,19 +168,18 @@ void OTARequestHandler::handleRequest(AsyncWebServerRequest *request) {
Update.printError(ss); Update.printError(ss);
response = request->beginResponse(200, "text/plain", ss); response = request->beginResponse(200, "text/plain", ss);
} }
response->addHeader("Connection", "close"); #endif // USE_ARDUINO
request->send(response); #ifdef USE_ESP_IDF
#endif response = request->beginResponse(
#if defined(USE_ESP_IDF) && defined(USE_WEBSERVER_OTA)
AsyncWebServerResponse *response = request->beginResponse(
200, "text/plain", (this->ota_started_ && this->ota_backend_) ? "Update Successful!" : "Update Failed!"); 200, "text/plain", (this->ota_started_ && this->ota_backend_) ? "Update Successful!" : "Update Failed!");
#endif // USE_ESP_IDF
response->addHeader("Connection", "close"); response->addHeader("Connection", "close");
request->send(response); request->send(response);
#endif #endif // USE_WEBSERVER_OTA
} }
void WebServerBase::add_ota_handler() { void WebServerBase::add_ota_handler() {
#if defined(USE_ARDUINO) || (defined(USE_ESP_IDF) && defined(USE_WEBSERVER_OTA)) #ifdef USE_WEBSERVER_OTA
this->add_handler(new OTARequestHandler(this)); // NOLINT this->add_handler(new OTARequestHandler(this)); // NOLINT
#endif #endif
} }

4
esphome/components/web_server_base/web_server_base.h
View File

@ -139,8 +139,12 @@ class OTARequestHandler : public AsyncWebHandler {
bool isRequestHandlerTrivial() const override { return false; } bool isRequestHandlerTrivial() const override { return false; }
protected: protected:
#ifdef USE_WEBSERVER_OTA
void report_ota_progress_(AsyncWebServerRequest *request);
uint32_t last_ota_progress_{0}; uint32_t last_ota_progress_{0};
uint32_t ota_read_length_{0}; uint32_t ota_read_length_{0};
#endif
WebServerBase *parent_; WebServerBase *parent_;
#if defined(USE_ESP_IDF) && defined(USE_WEBSERVER_OTA) #if defined(USE_ESP_IDF) && defined(USE_WEBSERVER_OTA)
std::unique_ptr<ota::OTABackend> ota_backend_; std::unique_ptr<ota::OTABackend> ota_backend_;