sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-02-08 06:00:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into nvds-new-espnow

Browse Source
This commit is contained in:
NP v/d Spek 2024-11-04 02:45:30 +01:00 committed by GitHub
commit f3ff5d163f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,8 +70,6 @@ def _validate_time_present(config):
_DATETIME_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend( _DATETIME_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
web_server.WEBSERVER_SORTING_SCHEMA,
cv.MQTT_COMMAND_COMPONENT_SCHEMA,
cv.Schema( cv.Schema(
{ {
cv.Optional(CONF_ON_VALUE): automation.validate_automation( cv.Optional(CONF_ON_VALUE): automation.validate_automation(
@ -81,7 +79,9 @@ _DATETIME_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
), ),
cv.Optional(CONF_TIME_ID): cv.use_id(time.RealTimeClock), cv.Optional(CONF_TIME_ID): cv.use_id(time.RealTimeClock),
} }
), )
.extend(web_server.WEBSERVER_SORTING_SCHEMA)
.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA)
).add_extra(_validate_time_present) ).add_extra(_validate_time_present)

1
tests/components/mqtt/common.yaml
View File

@ -230,6 +230,7 @@ datetime:
id: test_date id: test_date
type: date type: date
state_topic: some/topic/date state_topic: some/topic/date
command_topic: test_date/custom_command_topic
qos: 2 qos: 2
subscribe_qos: 2 subscribe_qos: 2
set_action: set_action:

8
tests/components/web_server/common_v3.yaml
View File

@ -35,3 +35,11 @@ switch:
web_server: web_server:
sorting_group_id: sorting_group_2 sorting_group_id: sorting_group_2
sorting_weight: -10 sorting_weight: -10
datetime:
- platform: template
name: Pick a Date
type: datetime
optimistic: yes
web_server:
sorting_group_id: sorting_group_3
sorting_weight: -5