From 244bd9256f94945be5c539d32b9b9bdcc3218f7f Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 30 Jun 2025 06:55:08 -0500 Subject: [PATCH] tidy --- esphome/components/ota/ota_backend_esp_idf.h | 2 +- .../components/web_server_base/web_server_base.cpp | 2 +- esphome/components/web_server_idf/multipart.h | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/esphome/components/ota/ota_backend_esp_idf.h b/esphome/components/ota/ota_backend_esp_idf.h index deed354499..51d9563112 100644 --- a/esphome/components/ota/ota_backend_esp_idf.h +++ b/esphome/components/ota/ota_backend_esp_idf.h @@ -12,7 +12,7 @@ namespace ota { class IDFOTABackend : public OTABackend { public: - IDFOTABackend() : md5_set_(false), expected_bin_md5_{} {} + IDFOTABackend() : expected_bin_md5_{}, md5_set_(false) {} OTAResponseTypes begin(size_t image_size) override; void set_update_md5(const char *md5) override; OTAResponseTypes write(uint8_t *data, size_t len) override; diff --git a/esphome/components/web_server_base/web_server_base.cpp b/esphome/components/web_server_base/web_server_base.cpp index 39cae36b2d..f0a8ea58e6 100644 --- a/esphome/components/web_server_base/web_server_base.cpp +++ b/esphome/components/web_server_base/web_server_base.cpp @@ -51,7 +51,7 @@ void OTARequestHandler::report_ota_progress_(AsyncWebServerRequest *request) { void OTARequestHandler::schedule_ota_reboot_() { ESP_LOGI(TAG, "OTA update successful!"); - this->parent_->set_timeout(100, [this]() { + this->parent_->set_timeout(100, []() { ESP_LOGI(TAG, "Performing OTA reboot now"); App.safe_reboot(); }); diff --git a/esphome/components/web_server_idf/multipart.h b/esphome/components/web_server_idf/multipart.h index 073e1e7c2b..967c72ffa5 100644 --- a/esphome/components/web_server_idf/multipart.h +++ b/esphome/components/web_server_idf/multipart.h @@ -2,12 +2,13 @@ #include "esphome/core/defines.h" #if defined(USE_ESP_IDF) && defined(USE_WEBSERVER_OTA) -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include namespace esphome { namespace web_server_idf { @@ -33,8 +34,8 @@ class MultipartReader { ~MultipartReader(); // Set callbacks for handling data - void set_data_callback(DataCallback callback) { data_callback_ = callback; } - void set_part_complete_callback(PartCompleteCallback callback) { part_complete_callback_ = callback; } + void set_data_callback(DataCallback callback) { data_callback_ = std::move(callback); } + void set_part_complete_callback(PartCompleteCallback callback) { part_complete_callback_ = std::move(callback); } // Parse incoming data size_t parse(const char *data, size_t len);