jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-09 11:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
J. Nick Koston 2025-06-29 18:59:09 -05:00
parent c420bf5f4f
commit 5205ff5c43
No known key found for this signature in database
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
esphome/components/ota/ota_backend_esp_idf.cpp
View File

@ -19,7 +19,6 @@ std::unique_ptr<ota::OTABackend> make_ota_backend() { return make_unique<ota::ID
OTAResponseTypes IDFOTABackend::begin(size_t image_size) { OTAResponseTypes IDFOTABackend::begin(size_t image_size) {
// Reset MD5 validation state // Reset MD5 validation state
this->md5_set_ = false; this->md5_set_ = false;
memset(this->expected_bin_md5_, 0, sizeof(this->expected_bin_md5_));
this->partition_ = esp_ota_get_next_update_partition(nullptr); this->partition_ = esp_ota_get_next_update_partition(nullptr);
if (this->partition_ == nullptr) { if (this->partition_ == nullptr) {

3
esphome/components/ota/ota_backend_esp_idf.h
View File

@ -6,14 +6,13 @@
#include "esphome/core/defines.h" #include "esphome/core/defines.h"
#include <esp_ota_ops.h> #include <esp_ota_ops.h>
#include <cstring>
namespace esphome { namespace esphome {
namespace ota { namespace ota {
class IDFOTABackend : public OTABackend { class IDFOTABackend : public OTABackend {
public: public:
IDFOTABackend() : md5_set_(false) { memset(expected_bin_md5_, 0, sizeof(expected_bin_md5_)); } IDFOTABackend() : md5_set_(false), expected_bin_md5_{} {}
OTAResponseTypes begin(size_t image_size) override; OTAResponseTypes begin(size_t image_size) override;
void set_update_md5(const char *md5) override; void set_update_md5(const char *md5) override;
OTAResponseTypes write(uint8_t *data, size_t len) override; OTAResponseTypes write(uint8_t *data, size_t len) override;

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

@ -129,14 +129,15 @@ void OTARequestHandler::handleUpload(AsyncWebServerRequest *request, const Strin
auto result = backend->begin(0); auto result = backend->begin(0);
if (result != ota::OTA_RESPONSE_OK) { if (result != ota::OTA_RESPONSE_OK) {
ESP_LOGE(TAG, "OTA begin failed: %d", result); ESP_LOGE(TAG, "OTA begin failed: %d", result);
this->ota_success_ = false;
return; return;
} }
// Store the backend pointer // Store the backend pointer
this->ota_backend_ = backend.release(); this->ota_backend_ = backend.release();
this->ota_started_ = true; this->ota_started_ = true;
} else if (!this->ota_started_ || !this->ota_backend_) { }
if (!this->ota_started_ || !this->ota_backend_) {
// Begin failed or was aborted // Begin failed or was aborted
return; return;
} }

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

@ -157,7 +157,7 @@ class OTARequestHandler : public AsyncWebHandler {
private: private:
#if defined(USE_ESP_IDF) && defined(USE_WEBSERVER_OTA) #if defined(USE_ESP_IDF) && defined(USE_WEBSERVER_OTA)
void *ota_backend_{nullptr}; // Actually ota::OTABackend*, stored as void* to avoid incomplete type issues void *ota_backend_{nullptr};
bool ota_started_{false}; bool ota_started_{false};
bool ota_success_{false}; bool ota_success_{false};
#endif #endif