sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-04-21 18:20:31 +01:00
Code Issues Releases Wiki Activity

remove split default

Browse Source
This commit is contained in:
Tomasz Duda 2025-01-25 10:35:30 +01:00
parent aaf41ab55b
commit 6a4b1a23cd
4 changed files with 29 additions and 39 deletions

47
esphome/components/logger/__init__.py

@ -20,6 +20,7 @@ from esphome.components.zephyr import (
zephyr_add_overlay,
zephyr_add_prj_conf,
)
from esphome.components.zephyr.const import KEY_ZEPHYR
import esphome.config_validation as cv
from esphome.const import (
CONF_ARGS,
@ -157,7 +158,7 @@ def uart_selection(value):
return cv.one_of(*UART_SELECTION_LIBRETINY[component], upper=True)(value)
if CORE.is_host:
raise cv.Invalid("Uart selection not valid for host platform")
if CORE.is_nrf52:
if CORE.target_platform == PLATFORM_NRF52:
return cv.one_of(*UART_SELECTION_NRF52, upper=True)(value)
raise NotImplementedError
@ -187,22 +188,25 @@ CONFIG_SCHEMA = cv.All(
cv.Optional(CONF_BAUD_RATE, default=115200): cv.positive_int,
cv.Optional(CONF_TX_BUFFER_SIZE, default=512): cv.validate_bytes,
cv.Optional(CONF_DEASSERT_RTS_DTR, default=False): cv.boolean,
cv.SplitDefault(
CONF_HARDWARE_UART,
esp8266=UART0,
esp32=UART0,
esp32_s2=USB_CDC,
esp32_s3_arduino=USB_CDC,
esp32_s3_idf=USB_SERIAL_JTAG,
esp32_c3_arduino=USB_CDC,
esp32_c3_idf=USB_SERIAL_JTAG,
esp32_c6_arduino=USB_CDC,
esp32_c6_idf=USB_SERIAL_JTAG,
rp2040=USB_CDC,
bk72xx=DEFAULT,
rtl87xx=DEFAULT,
nrf52=USB_CDC,
): cv.All(
cv.Optional(CONF_HARDWARE_UART, default=USB_CDC):
# https://github.com/esphome/esphome/pull/7715
# cv.SplitDefault(
# CONF_HARDWARE_UART,
# esp8266=UART0,
# esp32=UART0,
# esp32_s2=USB_CDC,
# esp32_s3_arduino=USB_CDC,
# esp32_s3_idf=USB_SERIAL_JTAG,
# esp32_c3_arduino=USB_CDC,
# esp32_c3_idf=USB_SERIAL_JTAG,
# esp32_c6_arduino=USB_CDC,
# esp32_c6_idf=USB_SERIAL_JTAG,
# rp2040=USB_CDC,
# bk72xx=DEFAULT,
# rtl87xx=DEFAULT,
# nrf52=USB_CDC,
# ):
cv.All(
cv.only_on(
[
PLATFORM_ESP8266,
@ -227,9 +231,10 @@ CONFIG_SCHEMA = cv.All(
cv.Optional(CONF_LEVEL, default="WARN"): is_log_level,
}
),
cv.SplitDefault(
CONF_ESP8266_STORE_LOG_STRINGS_IN_FLASH, esp8266=True
): cv.All(cv.only_on_esp8266, cv.boolean),
# https://github.com/esphome/esphome/pull/7715
# cv.SplitDefault(
# CONF_ESP8266_STORE_LOG_STRINGS_IN_FLASH, esp8266=True
# ): cv.All(cv.only_on_esp8266, cv.boolean),
}
).extend(cv.COMPONENT_SCHEMA),
validate_local_no_higher_than_global,
@ -315,7 +320,7 @@ async def to_code(config):
except cv.Invalid:
pass
if CORE.using_zephyr:
if CORE.target_framework == KEY_ZEPHYR:
if config[CONF_HARDWARE_UART] == UART0:
zephyr_add_overlay("""&uart0 { status = "okay";};""")
if config[CONF_HARDWARE_UART] == UART1:

5
esphome/components/time/__init__.py

@ -8,6 +8,7 @@ from esphome import automation
from esphome.automation import Condition
import esphome.codegen as cg
from esphome.components.zephyr import zephyr_add_prj_conf
from esphome.components.zephyr.const import KEY_ZEPHYR
import esphome.config_validation as cv
from esphome.const import (
CONF_AT,
@ -298,7 +299,7 @@ TIME_SCHEMA = cv.Schema(
async def setup_time_core_(time_var, config):
if not CORE.using_zephyr:
if not CORE.target_framework == KEY_ZEPHYR:
cg.add(time_var.set_timezone(config[CONF_TIMEZONE]))
for conf in config.get(CONF_ON_TIME, []):
@ -333,7 +334,7 @@ async def register_time(time_var, config):
@coroutine_with_priority(100.0)
async def to_code(config):
if CORE.using_zephyr:
if CORE.target_framework == KEY_ZEPHYR:
zephyr_add_prj_conf("POSIX_CLOCK", True)
cg.add_define("USE_TIME")
cg.add_global(time_ns.using)

7
esphome/config_validation.py

@ -59,7 +59,6 @@ from esphome.const import (
KEY_TARGET_PLATFORM,
PLATFORM_ESP32,
PLATFORM_ESP8266,
PLATFORM_NRF52,
PLATFORM_RP2040,
TYPE_GIT,
TYPE_LOCAL,
@ -620,11 +619,9 @@ def only_with_framework(frameworks):
only_on_esp32 = only_on(PLATFORM_ESP32)
only_on_esp8266 = only_on(PLATFORM_ESP8266)
only_on_nrf52 = only_on(PLATFORM_NRF52)
only_on_rp2040 = only_on(PLATFORM_RP2040)
only_with_arduino = only_with_framework("arduino")
only_with_esp_idf = only_with_framework("esp-idf")
only_with_zephyr = only_with_framework("zephyr")
# Adapted from:
@ -1672,7 +1669,6 @@ class SplitDefault(Optional):
bk72xx=vol.UNDEFINED,
rtl87xx=vol.UNDEFINED,
host=vol.UNDEFINED,
nrf52=vol.UNDEFINED,
):
super().__init__(key)
self._esp8266_default = vol.default_factory(esp8266)
@ -1716,7 +1712,6 @@ class SplitDefault(Optional):
self._bk72xx_default = vol.default_factory(bk72xx)
self._rtl87xx_default = vol.default_factory(rtl87xx)
self._host_default = vol.default_factory(host)
self._nrf52_default = vol.default_factory(nrf52)
@property
def default(self):
@ -1771,8 +1766,6 @@ class SplitDefault(Optional):
return self._rtl87xx_default
if CORE.is_host:
return self._host_default
if CORE.is_nrf52:
return self._nrf52_default
raise NotImplementedError
@default.setter

9
esphome/core/__init__.py

@ -19,7 +19,6 @@ from esphome.const import (
PLATFORM_ESP32,
PLATFORM_ESP8266,
PLATFORM_HOST,
PLATFORM_NRF52,
PLATFORM_RP2040,
PLATFORM_RTL87XX,
)
@ -655,10 +654,6 @@ class EsphomeCore:
def is_host(self):
return self.target_platform == PLATFORM_HOST
@property
def is_nrf52(self):
return self.target_platform == PLATFORM_NRF52
@property
def target_framework(self):
return self.data[KEY_CORE][KEY_TARGET_FRAMEWORK]
@ -671,10 +666,6 @@ class EsphomeCore:
def using_esp_idf(self):
return self.target_framework == "esp-idf"
@property
def using_zephyr(self):
return self.target_framework == "zephyr"
def add_job(self, func, *args, **kwargs):
self.event_loop.add_job(func, *args, **kwargs)