sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-15 14:25:45 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into select_options_convert_remaining

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-04 18:15:28 -06:00
committed by GitHub
parent de01cb13de 64f8963566
commit 58fb37ead3
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
esphome/components/const/__init__.py
View File

@@ -8,6 +8,7 @@ BYTE_ORDER_BIG = "big_endian"
CONF_COLOR_DEPTH = "color_depth" CONF_COLOR_DEPTH = "color_depth"
CONF_DRAW_ROUNDING = "draw_rounding" CONF_DRAW_ROUNDING = "draw_rounding"
CONF_ENABLED = "enabled"
CONF_ON_RECEIVE = "on_receive" CONF_ON_RECEIVE = "on_receive"
CONF_ON_STATE_CHANGE = "on_state_change" CONF_ON_STATE_CHANGE = "on_state_change"
CONF_REQUEST_HEADERS = "request_headers" CONF_REQUEST_HEADERS = "request_headers"

2
esphome/components/modbus_controller/__init__.py
View File

@@ -3,6 +3,7 @@ import binascii
from esphome import automation from esphome import automation
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import modbus from esphome.components import modbus
from esphome.components.const import CONF_ENABLED
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import ( from esphome.const import (
CONF_ADDRESS, CONF_ADDRESS,
@@ -20,7 +21,6 @@ from .const import (
CONF_BYTE_OFFSET, CONF_BYTE_OFFSET,
CONF_COMMAND_THROTTLE, CONF_COMMAND_THROTTLE,
CONF_CUSTOM_COMMAND, CONF_CUSTOM_COMMAND,
CONF_ENABLED,
CONF_FORCE_NEW_RANGE, CONF_FORCE_NEW_RANGE,
CONF_MAX_CMD_RETRIES, CONF_MAX_CMD_RETRIES,
CONF_MODBUS_CONTROLLER_ID, CONF_MODBUS_CONTROLLER_ID,

1
esphome/components/modbus_controller/const.py
View File

@@ -2,7 +2,6 @@ CONF_ALLOW_DUPLICATE_COMMANDS = "allow_duplicate_commands"
CONF_BITMASK = "bitmask" CONF_BITMASK = "bitmask"
CONF_BYTE_OFFSET = "byte_offset" CONF_BYTE_OFFSET = "byte_offset"
CONF_COMMAND_THROTTLE = "command_throttle" CONF_COMMAND_THROTTLE = "command_throttle"
CONF_ENABLED = "enabled"
CONF_OFFLINE_SKIP_UPDATES = "offline_skip_updates" CONF_OFFLINE_SKIP_UPDATES = "offline_skip_updates"
CONF_CUSTOM_COMMAND = "custom_command" CONF_CUSTOM_COMMAND = "custom_command"
CONF_FORCE_NEW_RANGE = "force_new_range" CONF_FORCE_NEW_RANGE = "force_new_range"

3
esphome/components/wireguard/binary_sensor.py
View File

@@ -1,5 +1,6 @@
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import binary_sensor from esphome.components import binary_sensor
from esphome.components.const import CONF_ENABLED
import esphome.config_validation as cv import esphome.config_validation as cv
from esphome.const import ( from esphome.const import (
CONF_STATUS, CONF_STATUS,
@@ -9,8 +10,6 @@ from esphome.const import (
from . import CONF_WIREGUARD_ID, Wireguard from . import CONF_WIREGUARD_ID, Wireguard
CONF_ENABLED = "enabled"
DEPENDENCIES = ["wireguard"] DEPENDENCIES = ["wireguard"]
CONFIG_SCHEMA = { CONFIG_SCHEMA = {