diff --git a/esphome/components/nrf52/__init__.py b/esphome/components/nrf52/__init__.py index abfd9acabd..60407f280d 100644 --- a/esphome/components/nrf52/__init__.py +++ b/esphome/components/nrf52/__init__.py @@ -1,4 +1,10 @@ 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, @@ -12,15 +18,6 @@ from esphome.const import ( ) 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 ( - BOOTLOADER_MCUBOOT, - KEY_BOOTLOADER, - KEY_ZEPHYR, -) from .boards_zephyr import BOARDS_ZEPHYR from .const import BOOTLOADER_ADAFRUIT @@ -58,11 +55,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 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 e1e8449d36..6fde891a37 100644 --- a/esphome/components/nrf52/gpio.py +++ b/esphome/components/nrf52/gpio.py @@ -1,16 +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_INVERTED, - CONF_MODE, - CONF_NUMBER, -) -from esphome.components.zephyr.const import ( - zephyr_ns, -) +from esphome.const import CONF_ID, CONF_INVERTED, CONF_MODE, CONF_NUMBER ZephyrGPIOPin = zephyr_ns.class_("ZephyrGPIOPin", cg.InternalGPIOPin) diff --git a/esphome/components/time/__init__.py b/esphome/components/time/__init__.py index d7e7da98b9..ff1eeea0df 100644 --- a/esphome/components/time/__init__.py +++ b/esphome/components/time/__init__.py @@ -1,33 +1,33 @@ -import logging from importlib import resources +import logging from typing import Optional import tzlocal -import esphome.codegen as cg -import esphome.config_validation as cv from esphome import automation +from esphome.automation import Condition +import esphome.codegen as cg +from esphome.components.zephyr import zephyr_add_prj_conf +import esphome.config_validation as cv from esphome.const import ( - CONF_ID, + CONF_AT, CONF_CRON, CONF_DAYS_OF_MONTH, CONF_DAYS_OF_WEEK, + CONF_HOUR, CONF_HOURS, + CONF_ID, + CONF_MINUTE, CONF_MINUTES, CONF_MONTHS, CONF_ON_TIME, CONF_ON_TIME_SYNC, + CONF_SECOND, CONF_SECONDS, CONF_TIMEZONE, CONF_TRIGGER_ID, - CONF_AT, - CONF_SECOND, - CONF_HOUR, - CONF_MINUTE, ) -from esphome.core import coroutine_with_priority, CORE -from esphome.automation import Condition -from esphome.components.zephyr import zephyr_add_prj_conf +from esphome.core import CORE, coroutine_with_priority _LOGGER = logging.getLogger(__name__)