Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-30 13:04:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2853 from esphome/bump-2021.12.0b2

Browse Source 
2021.12.0b2
This commit is contained in:
Jesse Hills 2021-12-03 08:07:30 +13:00 committed by GitHub
commit 0826b367d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/ota/ota_component.cpp
View File

@ -277,6 +277,7 @@ void OTAComponent::handle_() {
ssize_t read = this->client_->read(buf, requested); ssize_t read = this->client_->read(buf, requested);
if (read == -1) { if (read == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) { if (errno == EAGAIN || errno == EWOULDBLOCK) {
App.feed_wdt();
delay(1); delay(1);
continue; continue;
} }
@ -305,8 +306,9 @@ void OTAComponent::handle_() {
#ifdef USE_OTA_STATE_CALLBACK #ifdef USE_OTA_STATE_CALLBACK
this->state_callback_.call(OTA_IN_PROGRESS, percentage, 0); this->state_callback_.call(OTA_IN_PROGRESS, percentage, 0);
#endif #endif
// slow down OTA update to avoid getting killed by task watchdog (task_wdt) // feed watchdog and give other tasks a chance to run
delay(10); App.feed_wdt();
yield();
} }
} }

2
esphome/const.py
View File

@ -1,6 +1,6 @@
"""Constants used by esphome.""" """Constants used by esphome."""
__version__ = "2021.12.0b1" __version__ = "2021.12.0b2"
ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_" ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"