Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-25 16:38:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'master' into dev

Browse source
This commit is contained in:
Jesse Hills 2021-05-19 14:02:04 +12:00
commit 4ffa68b773
No known key found for this signature in database
GPG key ID: BEAAE804EFD8E83A
4 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
esphome/components/template/cover/__init__.py
View file

@ -93,6 +93,7 @@ def to_code(config):
cg.add(var.set_optimistic(config[CONF_OPTIMISTIC])) cg.add(var.set_optimistic(config[CONF_OPTIMISTIC]))
cg.add(var.set_assumed_state(config[CONF_ASSUMED_STATE])) cg.add(var.set_assumed_state(config[CONF_ASSUMED_STATE]))
cg.add(var.set_restore_mode(config[CONF_RESTORE_MODE])) cg.add(var.set_restore_mode(config[CONF_RESTORE_MODE]))
cg.add(var.set_has_position(config[CONF_HAS_POSITION]))
@automation.register_action( @automation.register_action(

0
esphome/py_compat.py
View file

2
script/bump-version.py
View file

@ -59,7 +59,7 @@ def write_version(version: Version):
sub( sub(
"esphome/const.py", "esphome/const.py",
r"^PATCH_VERSION = .*$", r"^PATCH_VERSION = .*$",
f"PATCH_VERSION = '{version.full_patch}'", f'PATCH_VERSION = "{version.full_patch}"',
) )

1
tests/test1.yaml
View file

@ -261,6 +261,7 @@ mcp23s17:
cs_pin: GPIO12 cs_pin: GPIO12
deviceaddress: 1 deviceaddress: 1
sensor: sensor:
- platform: ble_client - platform: ble_client
ble_client_id: ble_foo ble_client_id: ble_foo