sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 23:21:54 +00:00
Code Issues Releases Wiki Activity

Merge branch 'integration' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-10 19:29:03 -05:00
parent 6f817fd06a 2fc44ac831
commit 336fea4251
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/components/esphome/ota/ota_esphome.cpp
View File

@@ -432,12 +432,10 @@ bool ESPHomeOTAComponent::readall_(uint8_t *buf, size_t len) {
ssize_t read = this->client_->read(buf + at, len - at); ssize_t read = this->client_->read(buf + at, len - at);
if (read == -1) { if (read == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) { if (errno != EAGAIN && errno != EWOULDBLOCK) {
this->yield_and_feed_watchdog_(); ESP_LOGW(TAG, "Error reading %d bytes, errno %d", len, errno);
continue; return false;
} }
ESP_LOGW(TAG, "Error reading %d bytes, errno %d", len, errno);
return false;
} else if (read == 0) { } else if (read == 0) {
ESP_LOGW(TAG, "Remote closed connection"); ESP_LOGW(TAG, "Remote closed connection");
return false; return false;
@@ -461,12 +459,10 @@ bool ESPHomeOTAComponent::writeall_(const uint8_t *buf, size_t len) {
ssize_t written = this->client_->write(buf + at, len - at); ssize_t written = this->client_->write(buf + at, len - at);
if (written == -1) { if (written == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) { if (errno != EAGAIN && errno != EWOULDBLOCK) {
this->yield_and_feed_watchdog_(); ESP_LOGW(TAG, "Error writing %d bytes, errno %d", len, errno);
continue; return false;
} }
ESP_LOGW(TAG, "Error writing %d bytes, errno %d", len, errno);
return false;
} else { } else {
at += written; at += written;
} }