Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-28 01:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'dev' into optolink

Browse source
This commit is contained in:
j0ta29 2023-03-23 21:45:28 +01:00 committed by GitHub
commit 1b09848cc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
esphome/components/remote_receiver/__init__.py
View file

@ -12,7 +12,7 @@ from esphome.const import (
CONF_TOLERANCE, CONF_TOLERANCE,
CONF_MEMORY_BLOCKS, CONF_MEMORY_BLOCKS,
) )
from esphome.core import CORE from esphome.core import CORE, TimePeriod
AUTO_LOAD = ["remote_base"] AUTO_LOAD = ["remote_base"]
remote_receiver_ns = cg.esphome_ns.namespace("remote_receiver") remote_receiver_ns = cg.esphome_ns.namespace("remote_receiver")
@ -33,9 +33,10 @@ CONFIG_SCHEMA = remote_base.validate_triggers(
cv.SplitDefault( cv.SplitDefault(
CONF_BUFFER_SIZE, esp32="10000b", esp8266="1000b" CONF_BUFFER_SIZE, esp32="10000b", esp8266="1000b"
): cv.validate_bytes, ): cv.validate_bytes,
cv.Optional( cv.Optional(CONF_FILTER, default="50us"): cv.All(
CONF_FILTER, default="50us" cv.positive_time_period_microseconds,
): cv.positive_time_period_microseconds, cv.Range(max=TimePeriod(microseconds=255)),
),
cv.Optional( cv.Optional(
CONF_IDLE, default="10ms" CONF_IDLE, default="10ms"
): cv.positive_time_period_microseconds, ): cv.positive_time_period_microseconds,

2
esphome/components/sx1509/sx1509_gpio_pin.cpp
View file

@ -13,7 +13,7 @@ bool SX1509GPIOPin::digital_read() { return this->parent_->digital_read(this->pi
void SX1509GPIOPin::digital_write(bool value) { this->parent_->digital_write(this->pin_, value != this->inverted_); } void SX1509GPIOPin::digital_write(bool value) { this->parent_->digital_write(this->pin_, value != this->inverted_); }
std::string SX1509GPIOPin::dump_summary() const { std::string SX1509GPIOPin::dump_summary() const {
char buffer[32]; char buffer[32];
snprintf(buffer, sizeof(buffer), "%u via MCP23016", pin_); snprintf(buffer, sizeof(buffer), "%u via sx1509", pin_);
return buffer; return buffer;
} }

2
requirements.txt
View file

@ -11,7 +11,7 @@ esptool==4.5.1
click==8.1.3 click==8.1.3
esphome-dashboard==20230214.0 esphome-dashboard==20230214.0
aioesphomeapi==13.5.1 aioesphomeapi==13.5.1
zeroconf==0.47.3 zeroconf==0.47.4
# esp-idf requires this, but doesn't bundle it by default # esp-idf requires this, but doesn't bundle it by default
# https://github.com/espressif/esp-idf/blob/220590d599e134d7a5e7f1e683cc4550349ffbf8/requirements.txt#L24 # https://github.com/espressif/esp-idf/blob/220590d599e134d7a5e7f1e683cc4550349ffbf8/requirements.txt#L24

2
requirements_test.txt
View file

@ -8,6 +8,6 @@ pre-commit
pytest==7.2.2 pytest==7.2.2
pytest-cov==4.0.0 pytest-cov==4.0.0
pytest-mock==3.10.0 pytest-mock==3.10.0
pytest-asyncio==0.20.3 pytest-asyncio==0.21.0
asyncmock==0.4.2 asyncmock==0.4.2
hypothesis==5.49.0 hypothesis==5.49.0