Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 13:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1792 from esphome/bump-1.18.0b4

Browse source 
1.18.0b4
This commit is contained in:
Jesse Hills 2021-05-17 14:44:49 +12:00 committed by GitHub
commit ae9b247f47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
esphome/components/rc522/__init__.py
View file

@ -7,7 +7,6 @@ from esphome.core import coroutine
CODEOWNERS = ["@glmnet"] CODEOWNERS = ["@glmnet"]
AUTO_LOAD = ["binary_sensor"] AUTO_LOAD = ["binary_sensor"]
MULTI_CONF = True
CONF_RC522_ID = "rc522_id" CONF_RC522_ID = "rc522_id"

2
esphome/components/rc522_i2c/__init__.py
View file

@ -6,7 +6,7 @@ from esphome.const import CONF_ID
CODEOWNERS = ["@glmnet"] CODEOWNERS = ["@glmnet"]
DEPENDENCIES = ["i2c"] DEPENDENCIES = ["i2c"]
AUTO_LOAD = ["rc522"] AUTO_LOAD = ["rc522"]
MULTI_CONF = True
rc522_i2c_ns = cg.esphome_ns.namespace("rc522_i2c") rc522_i2c_ns = cg.esphome_ns.namespace("rc522_i2c")
RC522I2C = rc522_i2c_ns.class_("RC522I2C", rc522.RC522, i2c.I2CDevice) RC522I2C = rc522_i2c_ns.class_("RC522I2C", rc522.RC522, i2c.I2CDevice)

1
esphome/components/rc522_spi/__init__.py
View file

@ -6,6 +6,7 @@ from esphome.const import CONF_ID
CODEOWNERS = ["@glmnet"] CODEOWNERS = ["@glmnet"]
DEPENDENCIES = ["spi"] DEPENDENCIES = ["spi"]
AUTO_LOAD = ["rc522"] AUTO_LOAD = ["rc522"]
MULTI_CONF = True
rc522_spi_ns = cg.esphome_ns.namespace("rc522_spi") rc522_spi_ns = cg.esphome_ns.namespace("rc522_spi")
RC522Spi = rc522_spi_ns.class_("RC522Spi", rc522.RC522, spi.SPIDevice) RC522Spi = rc522_spi_ns.class_("RC522Spi", rc522.RC522, spi.SPIDevice)

2
esphome/const.py
View file

@ -2,7 +2,7 @@
MAJOR_VERSION = 1 MAJOR_VERSION = 1
MINOR_VERSION = 18 MINOR_VERSION = 18
PATCH_VERSION = "0b3" PATCH_VERSION = "0b4"
__short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}" __short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
__version__ = f"{__short_version__}.{PATCH_VERSION}" __version__ = f"{__short_version__}.{PATCH_VERSION}"

13
tests/test1.yaml
View file

@ -1978,10 +1978,15 @@ rc522_spi:
ESP_LOGD("main", "Found tag %s", x.c_str()); ESP_LOGD("main", "Found tag %s", x.c_str());
rc522_i2c: rc522_i2c:
update_interval: 1s - update_interval: 1s
on_tag: on_tag:
- lambda: |- - lambda: |-
ESP_LOGD("main", "Found tag %s", x.c_str()); ESP_LOGD("main", "Found tag %s", x.c_str());
- update_interval: 1s
on_tag:
- lambda: |-
ESP_LOGD("main", "Found tag %s", x.c_str());
gps: gps:
uart_id: uart0 uart_id: uart0