Upstream
/
esphome
mirror of https://github.com/esphome/esphome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'separate-ota-backend' into oarcher/dev

This commit is contained in:
Keith Burzinski 2024-05-15 21:31:26 -05:00
parent 32a8792382 48847d6035
commit c8ebe4be73
No known key found for this signature in database
GPG Key ID: 802564C5F0EEFFBE
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/esphome/ota/__init__.py
View File

@ -62,12 +62,6 @@ async def to_code(config):
cg.add_define("USE_OTA_PASSWORD")
cg.add_define("USE_OTA_VERSION", config[CONF_VERSION])
if CORE.is_esp32 and CORE.using_arduino:
cg.add_library("Update", None)
if CORE.is_rp2040 and CORE.using_arduino:
cg.add_library("Updater", None)
await cg.register_component(var, config)
if config[CONF_SAFE_MODE]:

14
esphome/components/ota/__init__.py
View File

@ -1,6 +1,7 @@
import esphome.codegen as cg
import esphome.config_validation as cv
from esphome import automation
from esphome.core import CORE, coroutine_with_priority
from esphome.const import CONF_ESPHOME, CONF_OTA, CONF_PLATFORM, CONF_TRIGGER_ID
@ -75,6 +76,17 @@ BASE_OTA_SCHEMA = cv.Schema(
)
@coroutine_with_priority(50.0)
async def to_code(config):
cg.add_define("USE_OTA")
if CORE.is_esp32 and CORE.using_arduino:
cg.add_library("Update", None)
if CORE.is_rp2040 and CORE.using_arduino:
cg.add_library("Updater", None)
async def ota_to_code(var, config):
use_state_callback = False
for conf in config.get(CONF_ON_STATE_CHANGE, []):
@ -103,5 +115,3 @@ async def ota_to_code(var, config):
use_state_callback = True
if use_state_callback:
cg.add_define("USE_OTA_STATE_CALLBACK")
cg.add_define("USE_OTA")