diff --git a/esphome/components/nrf52/__init__.py b/esphome/components/nrf52/__init__.py index 6a8e7bc6ed..6eab6d524d 100644 --- a/esphome/components/nrf52/__init__.py +++ b/esphome/components/nrf52/__init__.py @@ -1,30 +1,25 @@ import esphome.codegen as cg +from esphome.components.zephyr import zephyr_set_core_data, zephyr_to_code +from esphome.components.zephyr.const import ( + BOOTLOADER_MCUBOOT, + KEY_BOOTLOADER, + KEY_ZEPHYR, +) import esphome.config_validation as cv from esphome.const import ( CONF_BOARD, + CONF_FRAMEWORK, + CONF_PLATFORM_VERSION, + CONF_TYPE, KEY_CORE, KEY_TARGET_FRAMEWORK, KEY_TARGET_PLATFORM, PLATFORM_NRF52, - CONF_TYPE, - CONF_FRAMEWORK, - CONF_PLATFORM_VERSION, ) from esphome.core import CORE, coroutine_with_priority -from esphome.components.zephyr import ( - zephyr_set_core_data, - zephyr_to_code, -) -from esphome.components.zephyr.const import ( - KEY_ZEPHYR, - KEY_BOOTLOADER, - BOOTLOADER_MCUBOOT, -) from .boards_zephyr import BOARDS_ZEPHYR -from .const import ( - BOOTLOADER_ADAFRUIT, -) +from .const import BOOTLOADER_ADAFRUIT # force import gpio to register pin schema from .gpio import nrf52_pin_to_code # noqa @@ -59,11 +54,10 @@ def _detect_bootloader(value): if bootloader is None: bootloader = BOOTLOADER_MCUBOOT value[KEY_BOOTLOADER] = bootloader - else: - if bootloader is not None and bootloader != value[KEY_BOOTLOADER]: - raise cv.Invalid( - f"{value[CONF_FRAMEWORK][CONF_TYPE]} does not support '{bootloader}' bootloader for {value[CONF_BOARD]}" - ) + elif bootloader is not None and bootloader != value[KEY_BOOTLOADER]: + raise cv.Invalid( + f"{value[CONF_FRAMEWORK][CONF_TYPE]} does not support '{bootloader}' bootloader for {value[CONF_BOARD]}" + ) return value @@ -103,5 +97,4 @@ async def to_code(config): cg.add_platformio_option("board_upload.use_1200bps_touch", "true") cg.add_platformio_option("board_upload.require_upload_port", "true") cg.add_platformio_option("board_upload.wait_for_upload_port", "true") - # zephyr_to_code(conf) diff --git a/esphome/components/nrf52/boards_zephyr.py b/esphome/components/nrf52/boards_zephyr.py index 0d9e5453c4..a7afbd5ae3 100644 --- a/esphome/components/nrf52/boards_zephyr.py +++ b/esphome/components/nrf52/boards_zephyr.py @@ -1,4 +1,5 @@ from esphome.components.zephyr.const import KEY_BOOTLOADER + from .const import BOOTLOADER_ADAFRUIT BOARDS_ZEPHYR = { diff --git a/esphome/components/nrf52/gpio.py b/esphome/components/nrf52/gpio.py index 5b31d63b57..d6867c29d9 100644 --- a/esphome/components/nrf52/gpio.py +++ b/esphome/components/nrf52/gpio.py @@ -1,17 +1,8 @@ from esphome import pins - import esphome.codegen as cg +from esphome.components.zephyr.const import zephyr_ns import esphome.config_validation as cv -from esphome.const import ( - CONF_ID, - CONF_MODE, - CONF_INVERTED, - CONF_NUMBER, - CONF_ANALOG, -) -from esphome.components.zephyr.const import ( - zephyr_ns, -) +from esphome.const import CONF_ANALOG, CONF_ID, CONF_INVERTED, CONF_MODE, CONF_NUMBER GPIOPin = zephyr_ns.class_("ZephyrGPIOPin", cg.InternalGPIOPin) diff --git a/esphome/components/zephyr/__init__.py b/esphome/components/zephyr/__init__.py index 076bed0fd1..f98d03c8cf 100644 --- a/esphome/components/zephyr/__init__.py +++ b/esphome/components/zephyr/__init__.py @@ -1,26 +1,21 @@ import os from typing import Union -import esphome.codegen as cg -from esphome.core import CORE -from esphome.helpers import ( - write_file_if_changed, - copy_file_if_changed, -) -from esphome.const import ( - CONF_BOARD, - KEY_NAME, -) -from .const import ( - KEY_ZEPHYR, - KEY_PRJ_CONF, - KEY_OVERLAY, - zephyr_ns, - BOOTLOADER_MCUBOOT, - KEY_EXTRA_BUILD_FILES, - KEY_PATH, - KEY_BOOTLOADER, -) +import esphome.codegen as cg +from esphome.const import CONF_BOARD, KEY_NAME +from esphome.core import CORE +from esphome.helpers import copy_file_if_changed, write_file_if_changed + +from .const import ( + BOOTLOADER_MCUBOOT, + KEY_BOOTLOADER, + KEY_EXTRA_BUILD_FILES, + KEY_OVERLAY, + KEY_PATH, + KEY_PRJ_CONF, + KEY_ZEPHYR, + zephyr_ns, +) AUTO_LOAD = ["preferences"] KEY_BOARD = "board"