mirror of
https://github.com/esphome/esphome.git
synced 2024-11-23 23:48:11 +01:00
Merge branch 'dev' into hbridge-switch
This commit is contained in:
commit
71f9d0ccb6
91 changed files with 1793 additions and 1179 deletions
2
.github/actions/restore-python/action.yml
vendored
2
.github/actions/restore-python/action.yml
vendored
|
@ -22,7 +22,7 @@ runs:
|
||||||
python-version: ${{ inputs.python-version }}
|
python-version: ${{ inputs.python-version }}
|
||||||
- name: Restore Python virtual environment
|
- name: Restore Python virtual environment
|
||||||
id: cache-venv
|
id: cache-venv
|
||||||
uses: actions/cache/restore@v4.1.0
|
uses: actions/cache/restore@v4.1.1
|
||||||
with:
|
with:
|
||||||
path: venv
|
path: venv
|
||||||
# yamllint disable-line rule:line-length
|
# yamllint disable-line rule:line-length
|
||||||
|
|
18
.github/workflows/ci.yml
vendored
18
.github/workflows/ci.yml
vendored
|
@ -46,7 +46,7 @@ jobs:
|
||||||
python-version: ${{ env.DEFAULT_PYTHON }}
|
python-version: ${{ env.DEFAULT_PYTHON }}
|
||||||
- name: Restore Python virtual environment
|
- name: Restore Python virtual environment
|
||||||
id: cache-venv
|
id: cache-venv
|
||||||
uses: actions/cache@v4.1.0
|
uses: actions/cache@v4.1.1
|
||||||
with:
|
with:
|
||||||
path: venv
|
path: venv
|
||||||
# yamllint disable-line rule:line-length
|
# yamllint disable-line rule:line-length
|
||||||
|
@ -302,20 +302,22 @@ jobs:
|
||||||
|
|
||||||
- name: Cache platformio
|
- name: Cache platformio
|
||||||
if: github.ref == 'refs/heads/dev'
|
if: github.ref == 'refs/heads/dev'
|
||||||
uses: actions/cache@v4.1.0
|
uses: actions/cache@v4.1.1
|
||||||
with:
|
with:
|
||||||
path: ~/.platformio
|
path: ~/.platformio
|
||||||
key: platformio-${{ matrix.pio_cache_key }}
|
key: platformio-${{ matrix.pio_cache_key }}
|
||||||
|
|
||||||
- name: Cache platformio
|
- name: Cache platformio
|
||||||
if: github.ref != 'refs/heads/dev'
|
if: github.ref != 'refs/heads/dev'
|
||||||
uses: actions/cache/restore@v4.1.0
|
uses: actions/cache/restore@v4.1.1
|
||||||
with:
|
with:
|
||||||
path: ~/.platformio
|
path: ~/.platformio
|
||||||
key: platformio-${{ matrix.pio_cache_key }}
|
key: platformio-${{ matrix.pio_cache_key }}
|
||||||
|
|
||||||
- name: Install clang-tidy
|
- name: Install clang-tidy
|
||||||
run: sudo apt-get install clang-tidy-14
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install clang-tidy-14
|
||||||
|
|
||||||
- name: Register problem matchers
|
- name: Register problem matchers
|
||||||
run: |
|
run: |
|
||||||
|
@ -397,7 +399,9 @@ jobs:
|
||||||
file: ${{ fromJson(needs.list-components.outputs.components) }}
|
file: ${{ fromJson(needs.list-components.outputs.components) }}
|
||||||
steps:
|
steps:
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: sudo apt-get install libsdl2-dev
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install libsdl2-dev
|
||||||
|
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
|
@ -451,7 +455,9 @@ jobs:
|
||||||
run: echo ${{ matrix.components }}
|
run: echo ${{ matrix.components }}
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: sudo apt-get install libsdl2-dev
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install libsdl2-dev
|
||||||
|
|
||||||
- name: Check out code from GitHub
|
- name: Check out code from GitHub
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
|
@ -141,7 +141,7 @@ jobs:
|
||||||
echo name=$(cat /tmp/platform) >> $GITHUB_OUTPUT
|
echo name=$(cat /tmp/platform) >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Upload digests
|
- name: Upload digests
|
||||||
uses: actions/upload-artifact@v4.4.1
|
uses: actions/upload-artifact@v4.4.3
|
||||||
with:
|
with:
|
||||||
name: digests-${{ steps.sanitize.outputs.name }}
|
name: digests-${{ steps.sanitize.outputs.name }}
|
||||||
path: /tmp/digests
|
path: /tmp/digests
|
||||||
|
|
|
@ -238,6 +238,7 @@ esphome/components/ltr_als_ps/* @latonita
|
||||||
esphome/components/lvgl/* @clydebarrow
|
esphome/components/lvgl/* @clydebarrow
|
||||||
esphome/components/m5stack_8angle/* @rnauber
|
esphome/components/m5stack_8angle/* @rnauber
|
||||||
esphome/components/matrix_keypad/* @ssieb
|
esphome/components/matrix_keypad/* @ssieb
|
||||||
|
esphome/components/max17043/* @blacknell
|
||||||
esphome/components/max31865/* @DAVe3283
|
esphome/components/max31865/* @DAVe3283
|
||||||
esphome/components/max44009/* @berfenger
|
esphome/components/max44009/* @berfenger
|
||||||
esphome/components/max6956/* @looping40
|
esphome/components/max6956/* @looping40
|
||||||
|
@ -325,7 +326,7 @@ esphome/components/pvvx_mithermometer/* @pasiz
|
||||||
esphome/components/pylontech/* @functionpointer
|
esphome/components/pylontech/* @functionpointer
|
||||||
esphome/components/qmp6988/* @andrewpc
|
esphome/components/qmp6988/* @andrewpc
|
||||||
esphome/components/qr_code/* @wjtje
|
esphome/components/qr_code/* @wjtje
|
||||||
esphome/components/qspi_amoled/* @clydebarrow
|
esphome/components/qspi_dbi/* @clydebarrow
|
||||||
esphome/components/qwiic_pir/* @kahrendt
|
esphome/components/qwiic_pir/* @kahrendt
|
||||||
esphome/components/radon_eye_ble/* @jeffeb3
|
esphome/components/radon_eye_ble/* @jeffeb3
|
||||||
esphome/components/radon_eye_rd200/* @jeffeb3
|
esphome/components/radon_eye_rd200/* @jeffeb3
|
||||||
|
@ -404,6 +405,7 @@ esphome/components/sun/* @OttoWinter
|
||||||
esphome/components/sun_gtil2/* @Mat931
|
esphome/components/sun_gtil2/* @Mat931
|
||||||
esphome/components/switch/* @esphome/core
|
esphome/components/switch/* @esphome/core
|
||||||
esphome/components/t6615/* @tylermenezes
|
esphome/components/t6615/* @tylermenezes
|
||||||
|
esphome/components/tc74/* @sethgirvan
|
||||||
esphome/components/tca9548a/* @andreashergert1984
|
esphome/components/tca9548a/* @andreashergert1984
|
||||||
esphome/components/tca9555/* @mobrembski
|
esphome/components/tca9555/* @mobrembski
|
||||||
esphome/components/tcl112/* @glmnet
|
esphome/components/tcl112/* @glmnet
|
||||||
|
|
|
@ -86,7 +86,7 @@ RUN \
|
||||||
pip3 install \
|
pip3 install \
|
||||||
--break-system-packages --no-cache-dir \
|
--break-system-packages --no-cache-dir \
|
||||||
# Keep platformio version in sync with requirements.txt
|
# Keep platformio version in sync with requirements.txt
|
||||||
platformio==6.1.15 \
|
platformio==6.1.16 \
|
||||||
# Change some platformio settings
|
# Change some platformio settings
|
||||||
&& platformio settings set enable_telemetry No \
|
&& platformio settings set enable_telemetry No \
|
||||||
&& platformio settings set check_platformio_interval 1000000 \
|
&& platformio settings set check_platformio_interval 1000000 \
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
|
CONF_ALL,
|
||||||
|
CONF_ANY,
|
||||||
CONF_AUTOMATION_ID,
|
CONF_AUTOMATION_ID,
|
||||||
CONF_CONDITION,
|
CONF_CONDITION,
|
||||||
CONF_COUNT,
|
CONF_COUNT,
|
||||||
|
@ -73,6 +75,13 @@ def validate_potentially_and_condition(value):
|
||||||
return validate_condition(value)
|
return validate_condition(value)
|
||||||
|
|
||||||
|
|
||||||
|
def validate_potentially_or_condition(value):
|
||||||
|
if isinstance(value, list):
|
||||||
|
with cv.remove_prepend_path(["or"]):
|
||||||
|
return validate_condition({"or": value})
|
||||||
|
return validate_condition(value)
|
||||||
|
|
||||||
|
|
||||||
DelayAction = cg.esphome_ns.class_("DelayAction", Action, cg.Component)
|
DelayAction = cg.esphome_ns.class_("DelayAction", Action, cg.Component)
|
||||||
LambdaAction = cg.esphome_ns.class_("LambdaAction", Action)
|
LambdaAction = cg.esphome_ns.class_("LambdaAction", Action)
|
||||||
IfAction = cg.esphome_ns.class_("IfAction", Action)
|
IfAction = cg.esphome_ns.class_("IfAction", Action)
|
||||||
|
@ -166,6 +175,18 @@ async def or_condition_to_code(config, condition_id, template_arg, args):
|
||||||
return cg.new_Pvariable(condition_id, template_arg, conditions)
|
return cg.new_Pvariable(condition_id, template_arg, conditions)
|
||||||
|
|
||||||
|
|
||||||
|
@register_condition("all", AndCondition, validate_condition_list)
|
||||||
|
async def all_condition_to_code(config, condition_id, template_arg, args):
|
||||||
|
conditions = await build_condition_list(config, template_arg, args)
|
||||||
|
return cg.new_Pvariable(condition_id, template_arg, conditions)
|
||||||
|
|
||||||
|
|
||||||
|
@register_condition("any", OrCondition, validate_condition_list)
|
||||||
|
async def any_condition_to_code(config, condition_id, template_arg, args):
|
||||||
|
conditions = await build_condition_list(config, template_arg, args)
|
||||||
|
return cg.new_Pvariable(condition_id, template_arg, conditions)
|
||||||
|
|
||||||
|
|
||||||
@register_condition("not", NotCondition, validate_potentially_and_condition)
|
@register_condition("not", NotCondition, validate_potentially_and_condition)
|
||||||
async def not_condition_to_code(config, condition_id, template_arg, args):
|
async def not_condition_to_code(config, condition_id, template_arg, args):
|
||||||
condition = await build_condition(config, template_arg, args)
|
condition = await build_condition(config, template_arg, args)
|
||||||
|
@ -223,15 +244,21 @@ async def delay_action_to_code(config, action_id, template_arg, args):
|
||||||
IfAction,
|
IfAction,
|
||||||
cv.All(
|
cv.All(
|
||||||
{
|
{
|
||||||
cv.Required(CONF_CONDITION): validate_potentially_and_condition,
|
cv.Exclusive(
|
||||||
|
CONF_CONDITION, CONF_CONDITION
|
||||||
|
): validate_potentially_and_condition,
|
||||||
|
cv.Exclusive(CONF_ANY, CONF_CONDITION): validate_potentially_or_condition,
|
||||||
|
cv.Exclusive(CONF_ALL, CONF_CONDITION): validate_potentially_and_condition,
|
||||||
cv.Optional(CONF_THEN): validate_action_list,
|
cv.Optional(CONF_THEN): validate_action_list,
|
||||||
cv.Optional(CONF_ELSE): validate_action_list,
|
cv.Optional(CONF_ELSE): validate_action_list,
|
||||||
},
|
},
|
||||||
cv.has_at_least_one_key(CONF_THEN, CONF_ELSE),
|
cv.has_at_least_one_key(CONF_THEN, CONF_ELSE),
|
||||||
|
cv.has_at_least_one_key(CONF_CONDITION, CONF_ANY, CONF_ALL),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
async def if_action_to_code(config, action_id, template_arg, args):
|
async def if_action_to_code(config, action_id, template_arg, args):
|
||||||
conditions = await build_condition(config[CONF_CONDITION], template_arg, args)
|
cond_conf = next(el for el in config if el in (CONF_ANY, CONF_ALL, CONF_CONDITION))
|
||||||
|
conditions = await build_condition(config[cond_conf], template_arg, args)
|
||||||
var = cg.new_Pvariable(action_id, template_arg, conditions)
|
var = cg.new_Pvariable(action_id, template_arg, conditions)
|
||||||
if CONF_THEN in config:
|
if CONF_THEN in config:
|
||||||
actions = await build_action_list(config[CONF_THEN], template_arg, args)
|
actions = await build_action_list(config[CONF_THEN], template_arg, args)
|
||||||
|
|
|
@ -244,7 +244,7 @@ void CSE7766Component::dump_config() {
|
||||||
LOG_SENSOR(" ", "Apparent Power", this->apparent_power_sensor_);
|
LOG_SENSOR(" ", "Apparent Power", this->apparent_power_sensor_);
|
||||||
LOG_SENSOR(" ", "Reactive Power", this->reactive_power_sensor_);
|
LOG_SENSOR(" ", "Reactive Power", this->reactive_power_sensor_);
|
||||||
LOG_SENSOR(" ", "Power Factor", this->power_factor_sensor_);
|
LOG_SENSOR(" ", "Power Factor", this->power_factor_sensor_);
|
||||||
this->check_uart_settings(4800);
|
this->check_uart_settings(4800, 1, uart::UART_CONFIG_PARITY_EVEN);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace cse7766
|
} // namespace cse7766
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
import esphome.codegen as cg
|
|
||||||
import esphome.config_validation as cv
|
|
||||||
|
|
||||||
from esphome import pins
|
from esphome import pins
|
||||||
|
import esphome.codegen as cg
|
||||||
from esphome.components import i2c, touchscreen
|
from esphome.components import i2c, touchscreen
|
||||||
from esphome.const import CONF_INTERRUPT_PIN, CONF_ID, CONF_RESET_PIN
|
import esphome.config_validation as cv
|
||||||
from .. import cst816_ns
|
from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
|
||||||
|
|
||||||
|
from .. import cst816_ns
|
||||||
|
|
||||||
CST816Touchscreen = cst816_ns.class_(
|
CST816Touchscreen = cst816_ns.class_(
|
||||||
"CST816Touchscreen",
|
"CST816Touchscreen",
|
||||||
|
@ -14,11 +13,14 @@ CST816Touchscreen = cst816_ns.class_(
|
||||||
)
|
)
|
||||||
|
|
||||||
CST816ButtonListener = cst816_ns.class_("CST816ButtonListener")
|
CST816ButtonListener = cst816_ns.class_("CST816ButtonListener")
|
||||||
|
|
||||||
|
CONF_SKIP_PROBE = "skip_probe"
|
||||||
CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
|
CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
cv.GenerateID(): cv.declare_id(CST816Touchscreen),
|
cv.GenerateID(): cv.declare_id(CST816Touchscreen),
|
||||||
cv.Optional(CONF_INTERRUPT_PIN): pins.internal_gpio_input_pin_schema,
|
cv.Optional(CONF_INTERRUPT_PIN): pins.internal_gpio_input_pin_schema,
|
||||||
cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
|
cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
|
||||||
|
cv.Optional(CONF_SKIP_PROBE, default=False): cv.boolean,
|
||||||
}
|
}
|
||||||
).extend(i2c.i2c_device_schema(0x15))
|
).extend(i2c.i2c_device_schema(0x15))
|
||||||
|
|
||||||
|
@ -28,6 +30,7 @@ async def to_code(config):
|
||||||
await touchscreen.register_touchscreen(var, config)
|
await touchscreen.register_touchscreen(var, config)
|
||||||
await i2c.register_i2c_device(var, config)
|
await i2c.register_i2c_device(var, config)
|
||||||
|
|
||||||
|
cg.add(var.set_skip_probe(config[CONF_SKIP_PROBE]))
|
||||||
if interrupt_pin := config.get(CONF_INTERRUPT_PIN):
|
if interrupt_pin := config.get(CONF_INTERRUPT_PIN):
|
||||||
cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
|
cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
|
||||||
if reset_pin := config.get(CONF_RESET_PIN):
|
if reset_pin := config.get(CONF_RESET_PIN):
|
||||||
|
|
|
@ -8,32 +8,33 @@ void CST816Touchscreen::continue_setup_() {
|
||||||
this->interrupt_pin_->setup();
|
this->interrupt_pin_->setup();
|
||||||
this->attach_interrupt_(this->interrupt_pin_, gpio::INTERRUPT_FALLING_EDGE);
|
this->attach_interrupt_(this->interrupt_pin_, gpio::INTERRUPT_FALLING_EDGE);
|
||||||
}
|
}
|
||||||
if (!this->read_byte(REG_CHIP_ID, &this->chip_id_)) {
|
if (this->read_byte(REG_CHIP_ID, &this->chip_id_)) {
|
||||||
|
switch (this->chip_id_) {
|
||||||
|
case CST820_CHIP_ID:
|
||||||
|
case CST826_CHIP_ID:
|
||||||
|
case CST716_CHIP_ID:
|
||||||
|
case CST816S_CHIP_ID:
|
||||||
|
case CST816D_CHIP_ID:
|
||||||
|
case CST816T_CHIP_ID:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
this->mark_failed();
|
||||||
|
this->status_set_error(str_sprintf("Unknown chip ID 0x%02X", this->chip_id_).c_str());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this->write_byte(REG_IRQ_CTL, IRQ_EN_MOTION);
|
||||||
|
} else if (!this->skip_probe_) {
|
||||||
|
this->status_set_error("Failed to read chip id");
|
||||||
this->mark_failed();
|
this->mark_failed();
|
||||||
esph_log_e(TAG, "Failed to read chip id");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
switch (this->chip_id_) {
|
|
||||||
case CST820_CHIP_ID:
|
|
||||||
case CST826_CHIP_ID:
|
|
||||||
case CST716_CHIP_ID:
|
|
||||||
case CST816S_CHIP_ID:
|
|
||||||
case CST816D_CHIP_ID:
|
|
||||||
case CST816T_CHIP_ID:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
this->mark_failed();
|
|
||||||
esph_log_e(TAG, "Unknown chip ID 0x%02X", this->chip_id_);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this->write_byte(REG_IRQ_CTL, IRQ_EN_MOTION);
|
|
||||||
if (this->x_raw_max_ == this->x_raw_min_) {
|
if (this->x_raw_max_ == this->x_raw_min_) {
|
||||||
this->x_raw_max_ = this->display_->get_native_width();
|
this->x_raw_max_ = this->display_->get_native_width();
|
||||||
}
|
}
|
||||||
if (this->y_raw_max_ == this->y_raw_min_) {
|
if (this->y_raw_max_ == this->y_raw_min_) {
|
||||||
this->y_raw_max_ = this->display_->get_native_height();
|
this->y_raw_max_ = this->display_->get_native_height();
|
||||||
}
|
}
|
||||||
esph_log_config(TAG, "CST816 Touchscreen setup complete");
|
ESP_LOGCONFIG(TAG, "CST816 Touchscreen setup complete");
|
||||||
}
|
}
|
||||||
|
|
||||||
void CST816Touchscreen::update_button_state_(bool state) {
|
void CST816Touchscreen::update_button_state_(bool state) {
|
||||||
|
@ -45,7 +46,7 @@ void CST816Touchscreen::update_button_state_(bool state) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void CST816Touchscreen::setup() {
|
void CST816Touchscreen::setup() {
|
||||||
esph_log_config(TAG, "Setting up CST816 Touchscreen...");
|
ESP_LOGCONFIG(TAG, "Setting up CST816 Touchscreen...");
|
||||||
if (this->reset_pin_ != nullptr) {
|
if (this->reset_pin_ != nullptr) {
|
||||||
this->reset_pin_->setup();
|
this->reset_pin_->setup();
|
||||||
this->reset_pin_->digital_write(true);
|
this->reset_pin_->digital_write(true);
|
||||||
|
@ -73,7 +74,7 @@ void CST816Touchscreen::update_touches() {
|
||||||
|
|
||||||
uint16_t x = encode_uint16(data[REG_XPOS_HIGH] & 0xF, data[REG_XPOS_LOW]);
|
uint16_t x = encode_uint16(data[REG_XPOS_HIGH] & 0xF, data[REG_XPOS_LOW]);
|
||||||
uint16_t y = encode_uint16(data[REG_YPOS_HIGH] & 0xF, data[REG_YPOS_LOW]);
|
uint16_t y = encode_uint16(data[REG_YPOS_HIGH] & 0xF, data[REG_YPOS_LOW]);
|
||||||
esph_log_v(TAG, "Read touch %d/%d", x, y);
|
ESP_LOGV(TAG, "Read touch %d/%d", x, y);
|
||||||
if (x >= this->x_raw_max_) {
|
if (x >= this->x_raw_max_) {
|
||||||
this->update_button_state_(true);
|
this->update_button_state_(true);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -45,6 +45,7 @@ class CST816Touchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice
|
||||||
|
|
||||||
void set_interrupt_pin(InternalGPIOPin *pin) { this->interrupt_pin_ = pin; }
|
void set_interrupt_pin(InternalGPIOPin *pin) { this->interrupt_pin_ = pin; }
|
||||||
void set_reset_pin(GPIOPin *pin) { this->reset_pin_ = pin; }
|
void set_reset_pin(GPIOPin *pin) { this->reset_pin_ = pin; }
|
||||||
|
void set_skip_probe(bool skip_probe) { this->skip_probe_ = skip_probe; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void continue_setup_();
|
void continue_setup_();
|
||||||
|
@ -53,6 +54,7 @@ class CST816Touchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice
|
||||||
InternalGPIOPin *interrupt_pin_{};
|
InternalGPIOPin *interrupt_pin_{};
|
||||||
GPIOPin *reset_pin_{};
|
GPIOPin *reset_pin_{};
|
||||||
uint8_t chip_id_{};
|
uint8_t chip_id_{};
|
||||||
|
bool skip_probe_{}; // if set, do not expect to be able to probe the controller on the i2c bus.
|
||||||
std::vector<CST816ButtonListener *> button_listeners_;
|
std::vector<CST816ButtonListener *> button_listeners_;
|
||||||
bool button_touched_{};
|
bool button_touched_{};
|
||||||
};
|
};
|
||||||
|
|
|
@ -36,7 +36,8 @@ std::string DebugComponent::get_reset_reason_() {
|
||||||
break;
|
break;
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32)
|
#if defined(USE_ESP32_VARIANT_ESP32)
|
||||||
case SW_RESET:
|
case SW_RESET:
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || \
|
||||||
|
defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32C6)
|
||||||
case RTC_SW_SYS_RESET:
|
case RTC_SW_SYS_RESET:
|
||||||
#endif
|
#endif
|
||||||
reset_reason = "Software Reset Digital Core";
|
reset_reason = "Software Reset Digital Core";
|
||||||
|
@ -72,14 +73,16 @@ std::string DebugComponent::get_reset_reason_() {
|
||||||
case TGWDT_CPU_RESET:
|
case TGWDT_CPU_RESET:
|
||||||
reset_reason = "Timer Group Reset CPU";
|
reset_reason = "Timer Group Reset CPU";
|
||||||
break;
|
break;
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || \
|
||||||
|
defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32C6)
|
||||||
case TG0WDT_CPU_RESET:
|
case TG0WDT_CPU_RESET:
|
||||||
reset_reason = "Timer Group 0 Reset CPU";
|
reset_reason = "Timer Group 0 Reset CPU";
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32)
|
#if defined(USE_ESP32_VARIANT_ESP32)
|
||||||
case SW_CPU_RESET:
|
case SW_CPU_RESET:
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || \
|
||||||
|
defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32C6)
|
||||||
case RTC_SW_CPU_RESET:
|
case RTC_SW_CPU_RESET:
|
||||||
#endif
|
#endif
|
||||||
reset_reason = "Software Reset CPU";
|
reset_reason = "Software Reset CPU";
|
||||||
|
@ -98,27 +101,32 @@ std::string DebugComponent::get_reset_reason_() {
|
||||||
case RTCWDT_RTC_RESET:
|
case RTCWDT_RTC_RESET:
|
||||||
reset_reason = "RTC Watch Dog Reset Digital Core And RTC Module";
|
reset_reason = "RTC Watch Dog Reset Digital Core And RTC Module";
|
||||||
break;
|
break;
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || \
|
||||||
|
defined(USE_ESP32_VARIANT_ESP32C6)
|
||||||
case TG1WDT_CPU_RESET:
|
case TG1WDT_CPU_RESET:
|
||||||
reset_reason = "Timer Group 1 Reset CPU";
|
reset_reason = "Timer Group 1 Reset CPU";
|
||||||
break;
|
break;
|
||||||
case SUPER_WDT_RESET:
|
case SUPER_WDT_RESET:
|
||||||
reset_reason = "Super Watchdog Reset Digital Core And RTC Module";
|
reset_reason = "Super Watchdog Reset Digital Core And RTC Module";
|
||||||
break;
|
break;
|
||||||
case GLITCH_RTC_RESET:
|
|
||||||
reset_reason = "Glitch Reset Digital Core And RTC Module";
|
|
||||||
break;
|
|
||||||
case EFUSE_RESET:
|
case EFUSE_RESET:
|
||||||
reset_reason = "eFuse Reset Digital Core";
|
reset_reason = "eFuse Reset Digital Core";
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S3)
|
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
|
case GLITCH_RTC_RESET:
|
||||||
|
reset_reason = "Glitch Reset Digital Core And RTC Module";
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32C6)
|
||||||
case USB_UART_CHIP_RESET:
|
case USB_UART_CHIP_RESET:
|
||||||
reset_reason = "USB UART Reset Digital Core";
|
reset_reason = "USB UART Reset Digital Core";
|
||||||
break;
|
break;
|
||||||
case USB_JTAG_CHIP_RESET:
|
case USB_JTAG_CHIP_RESET:
|
||||||
reset_reason = "USB JTAG Reset Digital Core";
|
reset_reason = "USB JTAG Reset Digital Core";
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
case POWER_GLITCH_RESET:
|
case POWER_GLITCH_RESET:
|
||||||
reset_reason = "Power Glitch Reset Digital Core And RTC Module";
|
reset_reason = "Power Glitch Reset Digital Core And RTC Module";
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -156,6 +156,148 @@ void Display::filled_circle(int center_x, int center_y, int radius, Color color)
|
||||||
}
|
}
|
||||||
} while (dx <= 0);
|
} while (dx <= 0);
|
||||||
}
|
}
|
||||||
|
void Display::filled_ring(int center_x, int center_y, int radius1, int radius2, Color color) {
|
||||||
|
int rmax = radius1 > radius2 ? radius1 : radius2;
|
||||||
|
int rmin = radius1 < radius2 ? radius1 : radius2;
|
||||||
|
int dxmax = -int32_t(rmax), dxmin = -int32_t(rmin);
|
||||||
|
int dymax = 0, dymin = 0;
|
||||||
|
int errmax = 2 - 2 * rmax, errmin = 2 - 2 * rmin;
|
||||||
|
int e2max, e2min;
|
||||||
|
do {
|
||||||
|
// 8 dots for borders
|
||||||
|
this->draw_pixel_at(center_x - dxmax, center_y + dymax, color);
|
||||||
|
this->draw_pixel_at(center_x + dxmax, center_y + dymax, color);
|
||||||
|
this->draw_pixel_at(center_x - dxmin, center_y + dymin, color);
|
||||||
|
this->draw_pixel_at(center_x + dxmin, center_y + dymin, color);
|
||||||
|
this->draw_pixel_at(center_x + dxmax, center_y - dymax, color);
|
||||||
|
this->draw_pixel_at(center_x - dxmax, center_y - dymax, color);
|
||||||
|
this->draw_pixel_at(center_x + dxmin, center_y - dymin, color);
|
||||||
|
this->draw_pixel_at(center_x - dxmin, center_y - dymin, color);
|
||||||
|
if (dymin < rmin) {
|
||||||
|
// two parts - four lines
|
||||||
|
int hline_width = -(dxmax - dxmin) + 1;
|
||||||
|
this->horizontal_line(center_x + dxmax, center_y + dymax, hline_width, color);
|
||||||
|
this->horizontal_line(center_x - dxmin, center_y + dymax, hline_width, color);
|
||||||
|
this->horizontal_line(center_x + dxmax, center_y - dymax, hline_width, color);
|
||||||
|
this->horizontal_line(center_x - dxmin, center_y - dymax, hline_width, color);
|
||||||
|
} else {
|
||||||
|
// one part - top and bottom
|
||||||
|
int hline_width = 2 * (-dxmax) + 1;
|
||||||
|
this->horizontal_line(center_x + dxmax, center_y + dymax, hline_width, color);
|
||||||
|
this->horizontal_line(center_x + dxmax, center_y - dymax, hline_width, color);
|
||||||
|
}
|
||||||
|
e2max = errmax;
|
||||||
|
// tune external
|
||||||
|
if (e2max < dymax) {
|
||||||
|
errmax += ++dymax * 2 + 1;
|
||||||
|
if (-dxmax == dymax && e2max <= dxmax) {
|
||||||
|
e2max = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (e2max > dxmax) {
|
||||||
|
errmax += ++dxmax * 2 + 1;
|
||||||
|
}
|
||||||
|
// tune internal
|
||||||
|
while (dymin < dymax && dymin < rmin) {
|
||||||
|
e2min = errmin;
|
||||||
|
if (e2min < dymin) {
|
||||||
|
errmin += ++dymin * 2 + 1;
|
||||||
|
if (-dxmin == dymin && e2min <= dxmin) {
|
||||||
|
e2min = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (e2min > dxmin) {
|
||||||
|
errmin += ++dxmin * 2 + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} while (dxmax <= 0);
|
||||||
|
}
|
||||||
|
void Display::filled_gauge(int center_x, int center_y, int radius1, int radius2, int progress, Color color) {
|
||||||
|
int rmax = radius1 > radius2 ? radius1 : radius2;
|
||||||
|
int rmin = radius1 < radius2 ? radius1 : radius2;
|
||||||
|
int dxmax = -int32_t(rmax), dxmin = -int32_t(rmin), upd_dxmax, upd_dxmin;
|
||||||
|
int dymax = 0, dymin = 0;
|
||||||
|
int errmax = 2 - 2 * rmax, errmin = 2 - 2 * rmin;
|
||||||
|
int e2max, e2min;
|
||||||
|
progress = std::max(0, std::min(progress, 100)); // 0..100
|
||||||
|
int draw_progress = progress > 50 ? (100 - progress) : progress;
|
||||||
|
float tan_a = (progress == 50) ? 65535 : tan(float(draw_progress) * M_PI / 100); // slope
|
||||||
|
|
||||||
|
do {
|
||||||
|
// outer dots
|
||||||
|
this->draw_pixel_at(center_x + dxmax, center_y - dymax, color);
|
||||||
|
this->draw_pixel_at(center_x - dxmax, center_y - dymax, color);
|
||||||
|
if (dymin < rmin) { // side parts
|
||||||
|
int lhline_width = -(dxmax - dxmin) + 1;
|
||||||
|
if (progress >= 50) {
|
||||||
|
if (float(dymax) < float(-dxmax) * tan_a) {
|
||||||
|
upd_dxmax = ceil(float(dymax) / tan_a);
|
||||||
|
} else {
|
||||||
|
upd_dxmax = -dxmax;
|
||||||
|
}
|
||||||
|
this->horizontal_line(center_x + dxmax, center_y - dymax, lhline_width, color); // left
|
||||||
|
if (!dymax)
|
||||||
|
this->horizontal_line(center_x - dxmin, center_y, lhline_width, color); // right horizontal border
|
||||||
|
if (upd_dxmax > -dxmin) { // right
|
||||||
|
int rhline_width = (upd_dxmax + dxmin) + 1;
|
||||||
|
this->horizontal_line(center_x - dxmin, center_y - dymax,
|
||||||
|
rhline_width > lhline_width ? lhline_width : rhline_width, color);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (float(dymin) > float(-dxmin) * tan_a) {
|
||||||
|
upd_dxmin = ceil(float(dymin) / tan_a);
|
||||||
|
} else {
|
||||||
|
upd_dxmin = -dxmin;
|
||||||
|
}
|
||||||
|
lhline_width = -(dxmax + upd_dxmin) + 1;
|
||||||
|
if (!dymax)
|
||||||
|
this->horizontal_line(center_x - dxmin, center_y, lhline_width, color); // right horizontal border
|
||||||
|
if (lhline_width > 0)
|
||||||
|
this->horizontal_line(center_x + dxmax, center_y - dymax, lhline_width, color);
|
||||||
|
}
|
||||||
|
} else { // top part
|
||||||
|
int hline_width = 2 * (-dxmax) + 1;
|
||||||
|
if (progress >= 50) {
|
||||||
|
if (dymax < float(-dxmax) * tan_a) {
|
||||||
|
upd_dxmax = ceil(float(dymax) / tan_a);
|
||||||
|
hline_width = -dxmax + upd_dxmax + 1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (dymax < float(-dxmax) * tan_a) {
|
||||||
|
upd_dxmax = ceil(float(dymax) / tan_a);
|
||||||
|
hline_width = -dxmax - upd_dxmax + 1;
|
||||||
|
} else
|
||||||
|
hline_width = 0;
|
||||||
|
}
|
||||||
|
if (hline_width > 0)
|
||||||
|
this->horizontal_line(center_x + dxmax, center_y - dymax, hline_width, color);
|
||||||
|
}
|
||||||
|
e2max = errmax;
|
||||||
|
if (e2max < dymax) {
|
||||||
|
errmax += ++dymax * 2 + 1;
|
||||||
|
if (-dxmax == dymax && e2max <= dxmax) {
|
||||||
|
e2max = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (e2max > dxmax) {
|
||||||
|
errmax += ++dxmax * 2 + 1;
|
||||||
|
}
|
||||||
|
while (dymin <= dymax && dymin <= rmin && dxmin <= 0) {
|
||||||
|
this->draw_pixel_at(center_x + dxmin, center_y - dymin, color);
|
||||||
|
this->draw_pixel_at(center_x - dxmin, center_y - dymin, color);
|
||||||
|
e2min = errmin;
|
||||||
|
if (e2min < dymin) {
|
||||||
|
errmin += ++dymin * 2 + 1;
|
||||||
|
if (-dxmin == dymin && e2min <= dxmin) {
|
||||||
|
e2min = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (e2min > dxmin) {
|
||||||
|
errmin += ++dxmin * 2 + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} while (dxmax <= 0);
|
||||||
|
}
|
||||||
void HOT Display::triangle(int x1, int y1, int x2, int y2, int x3, int y3, Color color) {
|
void HOT Display::triangle(int x1, int y1, int x2, int y2, int x3, int y3, Color color) {
|
||||||
this->line(x1, y1, x2, y2, color);
|
this->line(x1, y1, x2, y2, color);
|
||||||
this->line(x1, y1, x3, y3, color);
|
this->line(x1, y1, x3, y3, color);
|
||||||
|
|
|
@ -285,6 +285,13 @@ class Display : public PollingComponent {
|
||||||
/// Fill a circle centered around [center_x,center_y] with the radius radius with the given color.
|
/// Fill a circle centered around [center_x,center_y] with the radius radius with the given color.
|
||||||
void filled_circle(int center_x, int center_y, int radius, Color color = COLOR_ON);
|
void filled_circle(int center_x, int center_y, int radius, Color color = COLOR_ON);
|
||||||
|
|
||||||
|
/// Fill a ring centered around [center_x,center_y] between two circles with the radius1 and radius2 with the given
|
||||||
|
/// color.
|
||||||
|
void filled_ring(int center_x, int center_y, int radius1, int radius2, Color color = COLOR_ON);
|
||||||
|
/// Fill a half-ring "gauge" centered around [center_x,center_y] between two circles with the radius1 and radius2
|
||||||
|
/// with he given color and filled up to 'progress' percent
|
||||||
|
void filled_gauge(int center_x, int center_y, int radius1, int radius2, int progress, Color color = COLOR_ON);
|
||||||
|
|
||||||
/// Draw the outline of a triangle contained between the points [x1,y1], [x2,y2] and [x3,y3] with the given color.
|
/// Draw the outline of a triangle contained between the points [x1,y1], [x2,y2] and [x3,y3] with the given color.
|
||||||
void triangle(int x1, int y1, int x2, int y2, int x3, int y3, Color color = COLOR_ON);
|
void triangle(int x1, int y1, int x2, int y2, int x3, int y3, Color color = COLOR_ON);
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ void ESP32RMTLEDStripLightOutput::setup() {
|
||||||
|
|
||||||
size_t buffer_size = this->get_buffer_size_();
|
size_t buffer_size = this->get_buffer_size_();
|
||||||
|
|
||||||
ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
|
RAMAllocator<uint8_t> allocator(this->use_psram_ ? 0 : RAMAllocator<uint8_t>::ALLOC_INTERNAL);
|
||||||
this->buf_ = allocator.allocate(buffer_size);
|
this->buf_ = allocator.allocate(buffer_size);
|
||||||
if (this->buf_ == nullptr) {
|
if (this->buf_ == nullptr) {
|
||||||
ESP_LOGE(TAG, "Cannot allocate LED buffer!");
|
ESP_LOGE(TAG, "Cannot allocate LED buffer!");
|
||||||
|
@ -37,7 +37,7 @@ void ESP32RMTLEDStripLightOutput::setup() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ExternalRAMAllocator<rmt_item32_t> rmt_allocator(ExternalRAMAllocator<rmt_item32_t>::ALLOW_FAILURE);
|
RAMAllocator<rmt_item32_t> rmt_allocator(this->use_psram_ ? 0 : RAMAllocator<rmt_item32_t>::ALLOC_INTERNAL);
|
||||||
this->rmt_buf_ = rmt_allocator.allocate(buffer_size * 8 +
|
this->rmt_buf_ = rmt_allocator.allocate(buffer_size * 8 +
|
||||||
1); // 8 bits per byte, 1 rmt_item32_t per bit + 1 rmt_item32_t for reset
|
1); // 8 bits per byte, 1 rmt_item32_t per bit + 1 rmt_item32_t for reset
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,7 @@ class ESP32RMTLEDStripLightOutput : public light::AddressableLight {
|
||||||
void set_num_leds(uint16_t num_leds) { this->num_leds_ = num_leds; }
|
void set_num_leds(uint16_t num_leds) { this->num_leds_ = num_leds; }
|
||||||
void set_is_rgbw(bool is_rgbw) { this->is_rgbw_ = is_rgbw; }
|
void set_is_rgbw(bool is_rgbw) { this->is_rgbw_ = is_rgbw; }
|
||||||
void set_is_wrgb(bool is_wrgb) { this->is_wrgb_ = is_wrgb; }
|
void set_is_wrgb(bool is_wrgb) { this->is_wrgb_ = is_wrgb; }
|
||||||
|
void set_use_psram(bool use_psram) { this->use_psram_ = use_psram; }
|
||||||
|
|
||||||
/// Set a maximum refresh rate in µs as some lights do not like being updated too often.
|
/// Set a maximum refresh rate in µs as some lights do not like being updated too often.
|
||||||
void set_max_refresh_rate(uint32_t interval_us) { this->max_refresh_rate_ = interval_us; }
|
void set_max_refresh_rate(uint32_t interval_us) { this->max_refresh_rate_ = interval_us; }
|
||||||
|
@ -75,6 +76,7 @@ class ESP32RMTLEDStripLightOutput : public light::AddressableLight {
|
||||||
uint16_t num_leds_;
|
uint16_t num_leds_;
|
||||||
bool is_rgbw_;
|
bool is_rgbw_;
|
||||||
bool is_wrgb_;
|
bool is_wrgb_;
|
||||||
|
bool use_psram_;
|
||||||
|
|
||||||
rmt_item32_t bit0_, bit1_, reset_;
|
rmt_item32_t bit0_, bit1_, reset_;
|
||||||
RGBOrder rgb_order_;
|
RGBOrder rgb_order_;
|
||||||
|
|
|
@ -55,7 +55,7 @@ CHIPSETS = {
|
||||||
"SM16703": LEDStripTimings(300, 900, 900, 300, 0, 0),
|
"SM16703": LEDStripTimings(300, 900, 900, 300, 0, 0),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CONF_USE_PSRAM = "use_psram"
|
||||||
CONF_IS_WRGB = "is_wrgb"
|
CONF_IS_WRGB = "is_wrgb"
|
||||||
CONF_BIT0_HIGH = "bit0_high"
|
CONF_BIT0_HIGH = "bit0_high"
|
||||||
CONF_BIT0_LOW = "bit0_low"
|
CONF_BIT0_LOW = "bit0_low"
|
||||||
|
@ -77,6 +77,7 @@ CONFIG_SCHEMA = cv.All(
|
||||||
cv.Optional(CONF_CHIPSET): cv.one_of(*CHIPSETS, upper=True),
|
cv.Optional(CONF_CHIPSET): cv.one_of(*CHIPSETS, upper=True),
|
||||||
cv.Optional(CONF_IS_RGBW, default=False): cv.boolean,
|
cv.Optional(CONF_IS_RGBW, default=False): cv.boolean,
|
||||||
cv.Optional(CONF_IS_WRGB, default=False): cv.boolean,
|
cv.Optional(CONF_IS_WRGB, default=False): cv.boolean,
|
||||||
|
cv.Optional(CONF_USE_PSRAM, default=True): cv.boolean,
|
||||||
cv.Inclusive(
|
cv.Inclusive(
|
||||||
CONF_BIT0_HIGH,
|
CONF_BIT0_HIGH,
|
||||||
"custom",
|
"custom",
|
||||||
|
@ -145,6 +146,7 @@ async def to_code(config):
|
||||||
cg.add(var.set_rgb_order(config[CONF_RGB_ORDER]))
|
cg.add(var.set_rgb_order(config[CONF_RGB_ORDER]))
|
||||||
cg.add(var.set_is_rgbw(config[CONF_IS_RGBW]))
|
cg.add(var.set_is_rgbw(config[CONF_IS_RGBW]))
|
||||||
cg.add(var.set_is_wrgb(config[CONF_IS_WRGB]))
|
cg.add(var.set_is_wrgb(config[CONF_IS_WRGB]))
|
||||||
|
cg.add(var.set_use_psram(config[CONF_USE_PSRAM]))
|
||||||
|
|
||||||
cg.add(
|
cg.add(
|
||||||
var.set_rmt_channel(
|
var.set_rmt_channel(
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
from esphome import automation
|
from esphome import automation
|
||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
from esphome.components import mqtt
|
from esphome.components import mqtt, web_server
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
CONF_DEVICE_CLASS,
|
CONF_DEVICE_CLASS,
|
||||||
|
@ -11,6 +11,7 @@ from esphome.const import (
|
||||||
CONF_MQTT_ID,
|
CONF_MQTT_ID,
|
||||||
CONF_ON_EVENT,
|
CONF_ON_EVENT,
|
||||||
CONF_TRIGGER_ID,
|
CONF_TRIGGER_ID,
|
||||||
|
CONF_WEB_SERVER,
|
||||||
DEVICE_CLASS_BUTTON,
|
DEVICE_CLASS_BUTTON,
|
||||||
DEVICE_CLASS_DOORBELL,
|
DEVICE_CLASS_DOORBELL,
|
||||||
DEVICE_CLASS_EMPTY,
|
DEVICE_CLASS_EMPTY,
|
||||||
|
@ -40,17 +41,21 @@ EventTrigger = event_ns.class_("EventTrigger", automation.Trigger.template())
|
||||||
|
|
||||||
validate_device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
|
validate_device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
|
||||||
|
|
||||||
EVENT_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMPONENT_SCHEMA).extend(
|
EVENT_SCHEMA = (
|
||||||
{
|
cv.ENTITY_BASE_SCHEMA.extend(web_server.WEBSERVER_SORTING_SCHEMA)
|
||||||
cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTEventComponent),
|
.extend(cv.MQTT_COMPONENT_SCHEMA)
|
||||||
cv.GenerateID(): cv.declare_id(Event),
|
.extend(
|
||||||
cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
|
{
|
||||||
cv.Optional(CONF_ON_EVENT): automation.validate_automation(
|
cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTEventComponent),
|
||||||
{
|
cv.GenerateID(): cv.declare_id(Event),
|
||||||
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(EventTrigger),
|
cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
|
||||||
}
|
cv.Optional(CONF_ON_EVENT): automation.validate_automation(
|
||||||
),
|
{
|
||||||
}
|
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(EventTrigger),
|
||||||
|
}
|
||||||
|
),
|
||||||
|
}
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
_UNDEF = object()
|
_UNDEF = object()
|
||||||
|
@ -97,6 +102,9 @@ async def setup_event_core_(var, config, *, event_types: list[str]):
|
||||||
mqtt_ = cg.new_Pvariable(mqtt_id, var)
|
mqtt_ = cg.new_Pvariable(mqtt_id, var)
|
||||||
await mqtt.register_mqtt_component(mqtt_, config)
|
await mqtt.register_mqtt_component(mqtt_, config)
|
||||||
|
|
||||||
|
if web_server_config := config.get(CONF_WEB_SERVER):
|
||||||
|
await web_server.add_entity_config(var, web_server_config)
|
||||||
|
|
||||||
|
|
||||||
async def register_event(var, config, *, event_types: list[str]):
|
async def register_event(var, config, *, event_types: list[str]):
|
||||||
if not CORE.has_id(config[CONF_ID]):
|
if not CORE.has_id(config[CONF_ID]):
|
||||||
|
|
|
@ -98,13 +98,13 @@ def validate_pillow_installed(value):
|
||||||
except ImportError as err:
|
except ImportError as err:
|
||||||
raise cv.Invalid(
|
raise cv.Invalid(
|
||||||
"Please install the pillow python package to use this feature. "
|
"Please install the pillow python package to use this feature. "
|
||||||
'(pip install "pillow==10.2.0")'
|
'(pip install "pillow==10.4.0")'
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
if version.parse(PIL.__version__) != version.parse("10.2.0"):
|
if version.parse(PIL.__version__) != version.parse("10.4.0"):
|
||||||
raise cv.Invalid(
|
raise cv.Invalid(
|
||||||
"Please update your pillow installation to 10.2.0. "
|
"Please update your pillow installation to 10.4.0. "
|
||||||
'(pip install "pillow==10.2.0")'
|
'(pip install "pillow==10.4.0")'
|
||||||
)
|
)
|
||||||
|
|
||||||
return value
|
return value
|
||||||
|
|
|
@ -10,6 +10,7 @@ from esphome.const import (
|
||||||
CONF_DIMENSIONS,
|
CONF_DIMENSIONS,
|
||||||
CONF_HEIGHT,
|
CONF_HEIGHT,
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
|
CONF_INIT_SEQUENCE,
|
||||||
CONF_INVERT_COLORS,
|
CONF_INVERT_COLORS,
|
||||||
CONF_LAMBDA,
|
CONF_LAMBDA,
|
||||||
CONF_MIRROR_X,
|
CONF_MIRROR_X,
|
||||||
|
@ -89,7 +90,6 @@ CONF_LED_PIN = "led_pin"
|
||||||
CONF_COLOR_PALETTE_IMAGES = "color_palette_images"
|
CONF_COLOR_PALETTE_IMAGES = "color_palette_images"
|
||||||
CONF_INVERT_DISPLAY = "invert_display"
|
CONF_INVERT_DISPLAY = "invert_display"
|
||||||
CONF_PIXEL_MODE = "pixel_mode"
|
CONF_PIXEL_MODE = "pixel_mode"
|
||||||
CONF_INIT_SEQUENCE = "init_sequence"
|
|
||||||
|
|
||||||
|
|
||||||
def cmd(c, *args):
|
def cmd(c, *args):
|
||||||
|
|
|
@ -7,7 +7,8 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
uint8_t temprature_sens_read();
|
uint8_t temprature_sens_read();
|
||||||
}
|
}
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || \
|
||||||
|
defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
#include "driver/temp_sensor.h"
|
#include "driver/temp_sensor.h"
|
||||||
#endif // USE_ESP32_VARIANT
|
#endif // USE_ESP32_VARIANT
|
||||||
#endif // USE_ESP32
|
#endif // USE_ESP32
|
||||||
|
@ -34,7 +35,8 @@ void InternalTemperatureSensor::update() {
|
||||||
ESP_LOGV(TAG, "Raw temperature value: %d", raw);
|
ESP_LOGV(TAG, "Raw temperature value: %d", raw);
|
||||||
temperature = (raw - 32) / 1.8f;
|
temperature = (raw - 32) / 1.8f;
|
||||||
success = (raw != 128);
|
success = (raw != 128);
|
||||||
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || \
|
||||||
|
defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
|
||||||
temp_sensor_config_t tsens = TSENS_CONFIG_DEFAULT();
|
temp_sensor_config_t tsens = TSENS_CONFIG_DEFAULT();
|
||||||
temp_sensor_set_config(tsens);
|
temp_sensor_set_config(tsens);
|
||||||
temp_sensor_start();
|
temp_sensor_start();
|
||||||
|
|
|
@ -3,27 +3,39 @@ import esphome.codegen as cg
|
||||||
from esphome.components import mqtt, power_supply, web_server
|
from esphome.components import mqtt, power_supply, web_server
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
|
CONF_BLUE,
|
||||||
|
CONF_BRIGHTNESS,
|
||||||
|
CONF_COLD_WHITE,
|
||||||
CONF_COLD_WHITE_COLOR_TEMPERATURE,
|
CONF_COLD_WHITE_COLOR_TEMPERATURE,
|
||||||
|
CONF_COLOR_BRIGHTNESS,
|
||||||
CONF_COLOR_CORRECT,
|
CONF_COLOR_CORRECT,
|
||||||
|
CONF_COLOR_MODE,
|
||||||
|
CONF_COLOR_TEMPERATURE,
|
||||||
CONF_DEFAULT_TRANSITION_LENGTH,
|
CONF_DEFAULT_TRANSITION_LENGTH,
|
||||||
CONF_EFFECTS,
|
CONF_EFFECTS,
|
||||||
CONF_FLASH_TRANSITION_LENGTH,
|
CONF_FLASH_TRANSITION_LENGTH,
|
||||||
CONF_GAMMA_CORRECT,
|
CONF_GAMMA_CORRECT,
|
||||||
|
CONF_GREEN,
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
|
CONF_INITIAL_STATE,
|
||||||
CONF_MQTT_ID,
|
CONF_MQTT_ID,
|
||||||
CONF_ON_STATE,
|
CONF_ON_STATE,
|
||||||
CONF_ON_TURN_OFF,
|
CONF_ON_TURN_OFF,
|
||||||
CONF_ON_TURN_ON,
|
CONF_ON_TURN_ON,
|
||||||
CONF_POWER_SUPPLY,
|
CONF_POWER_SUPPLY,
|
||||||
|
CONF_RED,
|
||||||
CONF_RESTORE_MODE,
|
CONF_RESTORE_MODE,
|
||||||
|
CONF_STATE,
|
||||||
CONF_TRIGGER_ID,
|
CONF_TRIGGER_ID,
|
||||||
|
CONF_WARM_WHITE,
|
||||||
CONF_WARM_WHITE_COLOR_TEMPERATURE,
|
CONF_WARM_WHITE_COLOR_TEMPERATURE,
|
||||||
CONF_WEB_SERVER,
|
CONF_WEB_SERVER,
|
||||||
|
CONF_WHITE,
|
||||||
)
|
)
|
||||||
from esphome.core import coroutine_with_priority
|
from esphome.core import coroutine_with_priority
|
||||||
from esphome.cpp_helpers import setup_entity
|
from esphome.cpp_helpers import setup_entity
|
||||||
|
|
||||||
from .automation import light_control_to_code # noqa
|
from .automation import LIGHT_STATE_SCHEMA
|
||||||
from .effects import (
|
from .effects import (
|
||||||
ADDRESSABLE_EFFECTS,
|
ADDRESSABLE_EFFECTS,
|
||||||
BINARY_EFFECTS,
|
BINARY_EFFECTS,
|
||||||
|
@ -35,8 +47,10 @@ from .effects import (
|
||||||
from .types import ( # noqa
|
from .types import ( # noqa
|
||||||
AddressableLight,
|
AddressableLight,
|
||||||
AddressableLightState,
|
AddressableLightState,
|
||||||
|
ColorMode,
|
||||||
LightOutput,
|
LightOutput,
|
||||||
LightState,
|
LightState,
|
||||||
|
LightStateRTCState,
|
||||||
LightStateTrigger,
|
LightStateTrigger,
|
||||||
LightTurnOffTrigger,
|
LightTurnOffTrigger,
|
||||||
LightTurnOnTrigger,
|
LightTurnOnTrigger,
|
||||||
|
@ -85,6 +99,7 @@ LIGHT_SCHEMA = (
|
||||||
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(LightStateTrigger),
|
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(LightStateTrigger),
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
|
cv.Optional(CONF_INITIAL_STATE): LIGHT_STATE_SCHEMA,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -145,6 +160,22 @@ async def setup_light_core_(light_var, output_var, config):
|
||||||
|
|
||||||
cg.add(light_var.set_restore_mode(config[CONF_RESTORE_MODE]))
|
cg.add(light_var.set_restore_mode(config[CONF_RESTORE_MODE]))
|
||||||
|
|
||||||
|
if (initial_state_config := config.get(CONF_INITIAL_STATE)) is not None:
|
||||||
|
initial_state = LightStateRTCState(
|
||||||
|
initial_state_config.get(CONF_COLOR_MODE, ColorMode.UNKNOWN),
|
||||||
|
initial_state_config.get(CONF_STATE, False),
|
||||||
|
initial_state_config.get(CONF_BRIGHTNESS, 1.0),
|
||||||
|
initial_state_config.get(CONF_COLOR_BRIGHTNESS, 1.0),
|
||||||
|
initial_state_config.get(CONF_RED, 1.0),
|
||||||
|
initial_state_config.get(CONF_GREEN, 1.0),
|
||||||
|
initial_state_config.get(CONF_BLUE, 1.0),
|
||||||
|
initial_state_config.get(CONF_WHITE, 1.0),
|
||||||
|
initial_state_config.get(CONF_COLOR_TEMPERATURE, 1.0),
|
||||||
|
initial_state_config.get(CONF_COLD_WHITE, 1.0),
|
||||||
|
initial_state_config.get(CONF_WARM_WHITE, 1.0),
|
||||||
|
)
|
||||||
|
cg.add(light_var.set_initial_state(initial_state))
|
||||||
|
|
||||||
if (
|
if (
|
||||||
default_transition_length := config.get(CONF_DEFAULT_TRANSITION_LENGTH)
|
default_transition_length := config.get(CONF_DEFAULT_TRANSITION_LENGTH)
|
||||||
) is not None:
|
) is not None:
|
||||||
|
|
|
@ -1,41 +1,42 @@
|
||||||
|
from esphome import automation
|
||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome import automation
|
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
CONF_ID,
|
|
||||||
CONF_COLOR_MODE,
|
|
||||||
CONF_TRANSITION_LENGTH,
|
|
||||||
CONF_STATE,
|
|
||||||
CONF_FLASH_LENGTH,
|
|
||||||
CONF_EFFECT,
|
|
||||||
CONF_BRIGHTNESS,
|
|
||||||
CONF_COLOR_BRIGHTNESS,
|
|
||||||
CONF_RED,
|
|
||||||
CONF_GREEN,
|
|
||||||
CONF_BLUE,
|
CONF_BLUE,
|
||||||
CONF_WHITE,
|
CONF_BRIGHTNESS,
|
||||||
CONF_COLOR_TEMPERATURE,
|
CONF_BRIGHTNESS_LIMITS,
|
||||||
CONF_COLD_WHITE,
|
CONF_COLD_WHITE,
|
||||||
CONF_WARM_WHITE,
|
CONF_COLOR_BRIGHTNESS,
|
||||||
|
CONF_COLOR_MODE,
|
||||||
|
CONF_COLOR_TEMPERATURE,
|
||||||
|
CONF_EFFECT,
|
||||||
|
CONF_FLASH_LENGTH,
|
||||||
|
CONF_GREEN,
|
||||||
|
CONF_ID,
|
||||||
|
CONF_LIMIT_MODE,
|
||||||
|
CONF_MAX_BRIGHTNESS,
|
||||||
|
CONF_MIN_BRIGHTNESS,
|
||||||
CONF_RANGE_FROM,
|
CONF_RANGE_FROM,
|
||||||
CONF_RANGE_TO,
|
CONF_RANGE_TO,
|
||||||
CONF_BRIGHTNESS_LIMITS,
|
CONF_RED,
|
||||||
CONF_LIMIT_MODE,
|
CONF_STATE,
|
||||||
CONF_MIN_BRIGHTNESS,
|
CONF_TRANSITION_LENGTH,
|
||||||
CONF_MAX_BRIGHTNESS,
|
CONF_WARM_WHITE,
|
||||||
|
CONF_WHITE,
|
||||||
)
|
)
|
||||||
|
|
||||||
from .types import (
|
from .types import (
|
||||||
ColorMode,
|
|
||||||
COLOR_MODES,
|
COLOR_MODES,
|
||||||
LIMIT_MODES,
|
LIMIT_MODES,
|
||||||
DimRelativeAction,
|
|
||||||
ToggleAction,
|
|
||||||
LightState,
|
|
||||||
LightControlAction,
|
|
||||||
AddressableLightState,
|
AddressableLightState,
|
||||||
AddressableSet,
|
AddressableSet,
|
||||||
LightIsOnCondition,
|
ColorMode,
|
||||||
|
DimRelativeAction,
|
||||||
|
LightControlAction,
|
||||||
LightIsOffCondition,
|
LightIsOffCondition,
|
||||||
|
LightIsOnCondition,
|
||||||
|
LightState,
|
||||||
|
ToggleAction,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -62,18 +63,10 @@ async def light_toggle_to_code(config, action_id, template_arg, args):
|
||||||
return var
|
return var
|
||||||
|
|
||||||
|
|
||||||
LIGHT_CONTROL_ACTION_SCHEMA = cv.Schema(
|
LIGHT_STATE_SCHEMA = cv.Schema(
|
||||||
{
|
{
|
||||||
cv.Required(CONF_ID): cv.use_id(LightState),
|
|
||||||
cv.Optional(CONF_COLOR_MODE): cv.enum(COLOR_MODES, upper=True, space="_"),
|
cv.Optional(CONF_COLOR_MODE): cv.enum(COLOR_MODES, upper=True, space="_"),
|
||||||
cv.Optional(CONF_STATE): cv.templatable(cv.boolean),
|
cv.Optional(CONF_STATE): cv.templatable(cv.boolean),
|
||||||
cv.Exclusive(CONF_TRANSITION_LENGTH, "transformer"): cv.templatable(
|
|
||||||
cv.positive_time_period_milliseconds
|
|
||||||
),
|
|
||||||
cv.Exclusive(CONF_FLASH_LENGTH, "transformer"): cv.templatable(
|
|
||||||
cv.positive_time_period_milliseconds
|
|
||||||
),
|
|
||||||
cv.Exclusive(CONF_EFFECT, "transformer"): cv.templatable(cv.string),
|
|
||||||
cv.Optional(CONF_BRIGHTNESS): cv.templatable(cv.percentage),
|
cv.Optional(CONF_BRIGHTNESS): cv.templatable(cv.percentage),
|
||||||
cv.Optional(CONF_COLOR_BRIGHTNESS): cv.templatable(cv.percentage),
|
cv.Optional(CONF_COLOR_BRIGHTNESS): cv.templatable(cv.percentage),
|
||||||
cv.Optional(CONF_RED): cv.templatable(cv.percentage),
|
cv.Optional(CONF_RED): cv.templatable(cv.percentage),
|
||||||
|
@ -85,6 +78,20 @@ LIGHT_CONTROL_ACTION_SCHEMA = cv.Schema(
|
||||||
cv.Optional(CONF_WARM_WHITE): cv.templatable(cv.percentage),
|
cv.Optional(CONF_WARM_WHITE): cv.templatable(cv.percentage),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
LIGHT_CONTROL_ACTION_SCHEMA = LIGHT_STATE_SCHEMA.extend(
|
||||||
|
{
|
||||||
|
cv.Required(CONF_ID): cv.use_id(LightState),
|
||||||
|
cv.Exclusive(CONF_TRANSITION_LENGTH, "transformer"): cv.templatable(
|
||||||
|
cv.positive_time_period_milliseconds
|
||||||
|
),
|
||||||
|
cv.Exclusive(CONF_FLASH_LENGTH, "transformer"): cv.templatable(
|
||||||
|
cv.positive_time_period_milliseconds
|
||||||
|
),
|
||||||
|
cv.Exclusive(CONF_EFFECT, "transformer"): cv.templatable(cv.string),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
LIGHT_TURN_OFF_ACTION_SCHEMA = automation.maybe_simple_id(
|
LIGHT_TURN_OFF_ACTION_SCHEMA = automation.maybe_simple_id(
|
||||||
{
|
{
|
||||||
cv.Required(CONF_ID): cv.use_id(LightState),
|
cv.Required(CONF_ID): cv.use_id(LightState),
|
||||||
|
|
|
@ -1,59 +1,59 @@
|
||||||
from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
|
from esphome import automation
|
||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome import automation
|
|
||||||
|
|
||||||
from esphome.const import (
|
from esphome.const import (
|
||||||
CONF_NAME,
|
|
||||||
CONF_LAMBDA,
|
|
||||||
CONF_UPDATE_INTERVAL,
|
|
||||||
CONF_TRANSITION_LENGTH,
|
|
||||||
CONF_COLORS,
|
|
||||||
CONF_STATE,
|
|
||||||
CONF_DURATION,
|
|
||||||
CONF_BRIGHTNESS,
|
|
||||||
CONF_COLOR_MODE,
|
|
||||||
CONF_COLOR_BRIGHTNESS,
|
|
||||||
CONF_RED,
|
|
||||||
CONF_GREEN,
|
|
||||||
CONF_BLUE,
|
|
||||||
CONF_WHITE,
|
|
||||||
CONF_COLOR_TEMPERATURE,
|
|
||||||
CONF_COLD_WHITE,
|
|
||||||
CONF_WARM_WHITE,
|
|
||||||
CONF_ALPHA,
|
CONF_ALPHA,
|
||||||
|
CONF_BLUE,
|
||||||
|
CONF_BRIGHTNESS,
|
||||||
|
CONF_COLD_WHITE,
|
||||||
|
CONF_COLOR_BRIGHTNESS,
|
||||||
|
CONF_COLOR_MODE,
|
||||||
|
CONF_COLOR_TEMPERATURE,
|
||||||
|
CONF_COLORS,
|
||||||
|
CONF_DURATION,
|
||||||
|
CONF_GREEN,
|
||||||
CONF_INTENSITY,
|
CONF_INTENSITY,
|
||||||
CONF_SPEED,
|
CONF_LAMBDA,
|
||||||
CONF_WIDTH,
|
|
||||||
CONF_NUM_LEDS,
|
|
||||||
CONF_RANDOM,
|
|
||||||
CONF_SEQUENCE,
|
|
||||||
CONF_MAX_BRIGHTNESS,
|
CONF_MAX_BRIGHTNESS,
|
||||||
CONF_MIN_BRIGHTNESS,
|
CONF_MIN_BRIGHTNESS,
|
||||||
|
CONF_NAME,
|
||||||
|
CONF_NUM_LEDS,
|
||||||
|
CONF_RANDOM,
|
||||||
|
CONF_RED,
|
||||||
|
CONF_SEQUENCE,
|
||||||
|
CONF_SPEED,
|
||||||
|
CONF_STATE,
|
||||||
|
CONF_TRANSITION_LENGTH,
|
||||||
|
CONF_UPDATE_INTERVAL,
|
||||||
|
CONF_WARM_WHITE,
|
||||||
|
CONF_WHITE,
|
||||||
|
CONF_WIDTH,
|
||||||
)
|
)
|
||||||
|
from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
|
||||||
from esphome.util import Registry
|
from esphome.util import Registry
|
||||||
|
|
||||||
from .types import (
|
from .types import (
|
||||||
ColorMode,
|
|
||||||
COLOR_MODES,
|
COLOR_MODES,
|
||||||
|
AddressableColorWipeEffect,
|
||||||
|
AddressableColorWipeEffectColor,
|
||||||
|
AddressableFireworksEffect,
|
||||||
|
AddressableFlickerEffect,
|
||||||
|
AddressableLambdaLightEffect,
|
||||||
|
AddressableLightRef,
|
||||||
|
AddressableRainbowLightEffect,
|
||||||
|
AddressableRandomTwinkleEffect,
|
||||||
|
AddressableScanEffect,
|
||||||
|
AddressableTwinkleEffect,
|
||||||
|
AutomationLightEffect,
|
||||||
|
Color,
|
||||||
|
ColorMode,
|
||||||
|
FlickerLightEffect,
|
||||||
LambdaLightEffect,
|
LambdaLightEffect,
|
||||||
|
LightColorValues,
|
||||||
PulseLightEffect,
|
PulseLightEffect,
|
||||||
RandomLightEffect,
|
RandomLightEffect,
|
||||||
StrobeLightEffect,
|
StrobeLightEffect,
|
||||||
StrobeLightEffectColor,
|
StrobeLightEffectColor,
|
||||||
LightColorValues,
|
|
||||||
AddressableLightRef,
|
|
||||||
AddressableLambdaLightEffect,
|
|
||||||
FlickerLightEffect,
|
|
||||||
AddressableRainbowLightEffect,
|
|
||||||
AddressableColorWipeEffect,
|
|
||||||
AddressableColorWipeEffectColor,
|
|
||||||
AddressableScanEffect,
|
|
||||||
AddressableTwinkleEffect,
|
|
||||||
AddressableRandomTwinkleEffect,
|
|
||||||
AddressableFireworksEffect,
|
|
||||||
AddressableFlickerEffect,
|
|
||||||
AutomationLightEffect,
|
|
||||||
Color,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
CONF_ADD_LED_INTERVAL = "add_led_interval"
|
CONF_ADD_LED_INTERVAL = "add_led_interval"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#include "esphome/core/log.h"
|
#include "esphome/core/log.h"
|
||||||
#include "light_state.h"
|
|
||||||
#include "light_output.h"
|
#include "light_output.h"
|
||||||
|
#include "light_state.h"
|
||||||
#include "transformers.h"
|
#include "transformers.h"
|
||||||
|
|
||||||
namespace esphome {
|
namespace esphome {
|
||||||
|
@ -16,21 +17,6 @@ LightCall LightState::turn_off() { return this->make_call().set_state(false); }
|
||||||
LightCall LightState::toggle() { return this->make_call().set_state(!this->remote_values.is_on()); }
|
LightCall LightState::toggle() { return this->make_call().set_state(!this->remote_values.is_on()); }
|
||||||
LightCall LightState::make_call() { return LightCall(this); }
|
LightCall LightState::make_call() { return LightCall(this); }
|
||||||
|
|
||||||
struct LightStateRTCState {
|
|
||||||
ColorMode color_mode{ColorMode::UNKNOWN};
|
|
||||||
bool state{false};
|
|
||||||
float brightness{1.0f};
|
|
||||||
float color_brightness{1.0f};
|
|
||||||
float red{1.0f};
|
|
||||||
float green{1.0f};
|
|
||||||
float blue{1.0f};
|
|
||||||
float white{1.0f};
|
|
||||||
float color_temp{1.0f};
|
|
||||||
float cold_white{1.0f};
|
|
||||||
float warm_white{1.0f};
|
|
||||||
uint32_t effect{0};
|
|
||||||
};
|
|
||||||
|
|
||||||
void LightState::setup() {
|
void LightState::setup() {
|
||||||
ESP_LOGCONFIG(TAG, "Setting up light '%s'...", this->get_name().c_str());
|
ESP_LOGCONFIG(TAG, "Setting up light '%s'...", this->get_name().c_str());
|
||||||
|
|
||||||
|
@ -48,6 +34,9 @@ void LightState::setup() {
|
||||||
|
|
||||||
auto call = this->make_call();
|
auto call = this->make_call();
|
||||||
LightStateRTCState recovered{};
|
LightStateRTCState recovered{};
|
||||||
|
if (this->initial_state_.has_value()) {
|
||||||
|
recovered = *this->initial_state_;
|
||||||
|
}
|
||||||
switch (this->restore_mode_) {
|
switch (this->restore_mode_) {
|
||||||
case LIGHT_RESTORE_DEFAULT_OFF:
|
case LIGHT_RESTORE_DEFAULT_OFF:
|
||||||
case LIGHT_RESTORE_DEFAULT_ON:
|
case LIGHT_RESTORE_DEFAULT_ON:
|
||||||
|
@ -175,6 +164,7 @@ void LightState::set_flash_transition_length(uint32_t flash_transition_length) {
|
||||||
uint32_t LightState::get_flash_transition_length() const { return this->flash_transition_length_; }
|
uint32_t LightState::get_flash_transition_length() const { return this->flash_transition_length_; }
|
||||||
void LightState::set_gamma_correct(float gamma_correct) { this->gamma_correct_ = gamma_correct; }
|
void LightState::set_gamma_correct(float gamma_correct) { this->gamma_correct_ = gamma_correct; }
|
||||||
void LightState::set_restore_mode(LightRestoreMode restore_mode) { this->restore_mode_ = restore_mode; }
|
void LightState::set_restore_mode(LightRestoreMode restore_mode) { this->restore_mode_ = restore_mode; }
|
||||||
|
void LightState::set_initial_state(const LightStateRTCState &initial_state) { this->initial_state_ = initial_state; }
|
||||||
bool LightState::supports_effects() { return !this->effects_.empty(); }
|
bool LightState::supports_effects() { return !this->effects_.empty(); }
|
||||||
const std::vector<LightEffect *> &LightState::get_effects() const { return this->effects_; }
|
const std::vector<LightEffect *> &LightState::get_effects() const { return this->effects_; }
|
||||||
void LightState::add_effects(const std::vector<LightEffect *> &effects) {
|
void LightState::add_effects(const std::vector<LightEffect *> &effects) {
|
||||||
|
|
|
@ -28,6 +28,35 @@ enum LightRestoreMode {
|
||||||
LIGHT_RESTORE_AND_ON,
|
LIGHT_RESTORE_AND_ON,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct LightStateRTCState {
|
||||||
|
LightStateRTCState(ColorMode color_mode, bool state, float brightness, float color_brightness, float red, float green,
|
||||||
|
float blue, float white, float color_temp, float cold_white, float warm_white)
|
||||||
|
: color_mode(color_mode),
|
||||||
|
state(state),
|
||||||
|
brightness(brightness),
|
||||||
|
color_brightness(color_brightness),
|
||||||
|
red(red),
|
||||||
|
green(green),
|
||||||
|
blue(blue),
|
||||||
|
white(white),
|
||||||
|
color_temp(color_temp),
|
||||||
|
cold_white(cold_white),
|
||||||
|
warm_white(warm_white) {}
|
||||||
|
LightStateRTCState() = default;
|
||||||
|
ColorMode color_mode{ColorMode::UNKNOWN};
|
||||||
|
bool state{false};
|
||||||
|
float brightness{1.0f};
|
||||||
|
float color_brightness{1.0f};
|
||||||
|
float red{1.0f};
|
||||||
|
float green{1.0f};
|
||||||
|
float blue{1.0f};
|
||||||
|
float white{1.0f};
|
||||||
|
float color_temp{1.0f};
|
||||||
|
float cold_white{1.0f};
|
||||||
|
float warm_white{1.0f};
|
||||||
|
uint32_t effect{0};
|
||||||
|
};
|
||||||
|
|
||||||
/** This class represents the communication layer between the front-end MQTT layer and the
|
/** This class represents the communication layer between the front-end MQTT layer and the
|
||||||
* hardware output layer.
|
* hardware output layer.
|
||||||
*/
|
*/
|
||||||
|
@ -116,6 +145,9 @@ class LightState : public EntityBase, public Component {
|
||||||
/// Set the restore mode of this light
|
/// Set the restore mode of this light
|
||||||
void set_restore_mode(LightRestoreMode restore_mode);
|
void set_restore_mode(LightRestoreMode restore_mode);
|
||||||
|
|
||||||
|
/// Set the initial state of this light
|
||||||
|
void set_initial_state(const LightStateRTCState &initial_state);
|
||||||
|
|
||||||
/// Return whether the light has any effects that meet the trait requirements.
|
/// Return whether the light has any effects that meet the trait requirements.
|
||||||
bool supports_effects();
|
bool supports_effects();
|
||||||
|
|
||||||
|
@ -212,6 +244,8 @@ class LightState : public EntityBase, public Component {
|
||||||
float gamma_correct_{};
|
float gamma_correct_{};
|
||||||
/// Restore mode of the light.
|
/// Restore mode of the light.
|
||||||
LightRestoreMode restore_mode_;
|
LightRestoreMode restore_mode_;
|
||||||
|
/// Initial state of the light.
|
||||||
|
optional<LightStateRTCState> initial_state_{};
|
||||||
/// List of effects for this light.
|
/// List of effects for this light.
|
||||||
std::vector<LightEffect *> effects_;
|
std::vector<LightEffect *> effects_;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import esphome.codegen as cg
|
|
||||||
from esphome import automation
|
from esphome import automation
|
||||||
|
import esphome.codegen as cg
|
||||||
|
|
||||||
# Base
|
# Base
|
||||||
light_ns = cg.esphome_ns.namespace("light")
|
light_ns = cg.esphome_ns.namespace("light")
|
||||||
|
@ -12,6 +12,8 @@ AddressableLightRef = AddressableLight.operator("ref")
|
||||||
Color = cg.esphome_ns.class_("Color")
|
Color = cg.esphome_ns.class_("Color")
|
||||||
LightColorValues = light_ns.class_("LightColorValues")
|
LightColorValues = light_ns.class_("LightColorValues")
|
||||||
|
|
||||||
|
LightStateRTCState = light_ns.struct("LightStateRTCState")
|
||||||
|
|
||||||
# Color modes
|
# Color modes
|
||||||
ColorMode = light_ns.enum("ColorMode", is_class=True)
|
ColorMode = light_ns.enum("ColorMode", is_class=True)
|
||||||
COLOR_MODES = {
|
COLOR_MODES = {
|
||||||
|
|
|
@ -10,8 +10,12 @@
|
||||||
|
|
||||||
#ifdef USE_LOGGER_USB_SERIAL_JTAG
|
#ifdef USE_LOGGER_USB_SERIAL_JTAG
|
||||||
#include <driver/usb_serial_jtag.h>
|
#include <driver/usb_serial_jtag.h>
|
||||||
|
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0)
|
||||||
#include <esp_vfs_dev.h>
|
#include <esp_vfs_dev.h>
|
||||||
#include <esp_vfs_usb_serial_jtag.h>
|
#include <esp_vfs_usb_serial_jtag.h>
|
||||||
|
#else
|
||||||
|
#include <driver/usb_serial_jtag_vfs.h>
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "freertos/FreeRTOS.h"
|
#include "freertos/FreeRTOS.h"
|
||||||
|
@ -36,10 +40,17 @@ static const char *const TAG = "logger";
|
||||||
static void init_usb_serial_jtag_() {
|
static void init_usb_serial_jtag_() {
|
||||||
setvbuf(stdin, NULL, _IONBF, 0); // Disable buffering on stdin
|
setvbuf(stdin, NULL, _IONBF, 0); // Disable buffering on stdin
|
||||||
|
|
||||||
|
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0)
|
||||||
// Minicom, screen, idf_monitor send CR when ENTER key is pressed
|
// Minicom, screen, idf_monitor send CR when ENTER key is pressed
|
||||||
esp_vfs_dev_usb_serial_jtag_set_rx_line_endings(ESP_LINE_ENDINGS_CR);
|
esp_vfs_dev_usb_serial_jtag_set_rx_line_endings(ESP_LINE_ENDINGS_CR);
|
||||||
// Move the caret to the beginning of the next line on '\n'
|
// Move the caret to the beginning of the next line on '\n'
|
||||||
esp_vfs_dev_usb_serial_jtag_set_tx_line_endings(ESP_LINE_ENDINGS_CRLF);
|
esp_vfs_dev_usb_serial_jtag_set_tx_line_endings(ESP_LINE_ENDINGS_CRLF);
|
||||||
|
#else
|
||||||
|
// Minicom, screen, idf_monitor send CR when ENTER key is pressed
|
||||||
|
usb_serial_jtag_vfs_set_rx_line_endings(ESP_LINE_ENDINGS_CR);
|
||||||
|
// Move the caret to the beginning of the next line on '\n'
|
||||||
|
usb_serial_jtag_vfs_set_tx_line_endings(ESP_LINE_ENDINGS_CRLF);
|
||||||
|
#endif
|
||||||
|
|
||||||
// Enable non-blocking mode on stdin and stdout
|
// Enable non-blocking mode on stdin and stdout
|
||||||
fcntl(fileno(stdout), F_SETFL, 0);
|
fcntl(fileno(stdout), F_SETFL, 0);
|
||||||
|
@ -57,7 +68,11 @@ static void init_usb_serial_jtag_() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Tell vfs to use usb-serial-jtag driver
|
// Tell vfs to use usb-serial-jtag driver
|
||||||
|
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0)
|
||||||
esp_vfs_usb_serial_jtag_use_driver();
|
esp_vfs_usb_serial_jtag_use_driver();
|
||||||
|
#else
|
||||||
|
usb_serial_jtag_vfs_use_driver();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,7 @@ from .types import (
|
||||||
FontEngine,
|
FontEngine,
|
||||||
IdleTrigger,
|
IdleTrigger,
|
||||||
ObjUpdateAction,
|
ObjUpdateAction,
|
||||||
|
PauseTrigger,
|
||||||
lv_font_t,
|
lv_font_t,
|
||||||
lv_group_t,
|
lv_group_t,
|
||||||
lv_style_t,
|
lv_style_t,
|
||||||
|
@ -233,6 +234,8 @@ async def to_code(config):
|
||||||
frac = 8
|
frac = 8
|
||||||
cg.add(lv_component.set_buffer_frac(int(frac)))
|
cg.add(lv_component.set_buffer_frac(int(frac)))
|
||||||
cg.add(lv_component.set_full_refresh(config[df.CONF_FULL_REFRESH]))
|
cg.add(lv_component.set_full_refresh(config[df.CONF_FULL_REFRESH]))
|
||||||
|
cg.add(lv_component.set_draw_rounding(config[df.CONF_DRAW_ROUNDING]))
|
||||||
|
cg.add(lv_component.set_resume_on_input(config[df.CONF_RESUME_ON_INPUT]))
|
||||||
|
|
||||||
for font in helpers.esphome_fonts_used:
|
for font in helpers.esphome_fonts_used:
|
||||||
await cg.get_variable(font)
|
await cg.get_variable(font)
|
||||||
|
@ -272,11 +275,19 @@ async def to_code(config):
|
||||||
async with LvContext(lv_component):
|
async with LvContext(lv_component):
|
||||||
await generate_triggers(lv_component)
|
await generate_triggers(lv_component)
|
||||||
await generate_page_triggers(lv_component, config)
|
await generate_page_triggers(lv_component, config)
|
||||||
|
await initial_focus_to_code(config)
|
||||||
for conf in config.get(CONF_ON_IDLE, ()):
|
for conf in config.get(CONF_ON_IDLE, ()):
|
||||||
templ = await cg.templatable(conf[CONF_TIMEOUT], [], cg.uint32)
|
templ = await cg.templatable(conf[CONF_TIMEOUT], [], cg.uint32)
|
||||||
idle_trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], lv_component, templ)
|
idle_trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], lv_component, templ)
|
||||||
await build_automation(idle_trigger, [], conf)
|
await build_automation(idle_trigger, [], conf)
|
||||||
await initial_focus_to_code(config)
|
for conf in config.get(df.CONF_ON_PAUSE, ()):
|
||||||
|
pause_trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], lv_component, True)
|
||||||
|
await build_automation(pause_trigger, [], conf)
|
||||||
|
for conf in config.get(df.CONF_ON_RESUME, ()):
|
||||||
|
resume_trigger = cg.new_Pvariable(
|
||||||
|
conf[CONF_TRIGGER_ID], lv_component, False
|
||||||
|
)
|
||||||
|
await build_automation(resume_trigger, [], conf)
|
||||||
|
|
||||||
for comp in helpers.lvgl_components_required:
|
for comp in helpers.lvgl_components_required:
|
||||||
CORE.add_define(f"USE_LVGL_{comp.upper()}")
|
CORE.add_define(f"USE_LVGL_{comp.upper()}")
|
||||||
|
@ -314,6 +325,7 @@ CONFIG_SCHEMA = (
|
||||||
cv.Optional(df.CONF_COLOR_DEPTH, default=16): cv.one_of(16),
|
cv.Optional(df.CONF_COLOR_DEPTH, default=16): cv.one_of(16),
|
||||||
cv.Optional(df.CONF_DEFAULT_FONT, default="montserrat_14"): lvalid.lv_font,
|
cv.Optional(df.CONF_DEFAULT_FONT, default="montserrat_14"): lvalid.lv_font,
|
||||||
cv.Optional(df.CONF_FULL_REFRESH, default=False): cv.boolean,
|
cv.Optional(df.CONF_FULL_REFRESH, default=False): cv.boolean,
|
||||||
|
cv.Optional(df.CONF_DRAW_ROUNDING, default=2): cv.positive_int,
|
||||||
cv.Optional(CONF_BUFFER_SIZE, default="100%"): cv.percentage,
|
cv.Optional(CONF_BUFFER_SIZE, default="100%"): cv.percentage,
|
||||||
cv.Optional(df.CONF_LOG_LEVEL, default="WARN"): cv.one_of(
|
cv.Optional(df.CONF_LOG_LEVEL, default="WARN"): cv.one_of(
|
||||||
*df.LOG_LEVELS, upper=True
|
*df.LOG_LEVELS, upper=True
|
||||||
|
@ -341,6 +353,16 @@ CONFIG_SCHEMA = (
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
|
cv.Optional(df.CONF_ON_PAUSE): validate_automation(
|
||||||
|
{
|
||||||
|
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PauseTrigger),
|
||||||
|
}
|
||||||
|
),
|
||||||
|
cv.Optional(df.CONF_ON_RESUME): validate_automation(
|
||||||
|
{
|
||||||
|
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PauseTrigger),
|
||||||
|
}
|
||||||
|
),
|
||||||
cv.Exclusive(df.CONF_WIDGETS, CONF_PAGES): cv.ensure_list(WIDGET_SCHEMA),
|
cv.Exclusive(df.CONF_WIDGETS, CONF_PAGES): cv.ensure_list(WIDGET_SCHEMA),
|
||||||
cv.Exclusive(CONF_PAGES, CONF_PAGES): cv.ensure_list(
|
cv.Exclusive(CONF_PAGES, CONF_PAGES): cv.ensure_list(
|
||||||
container_schema(page_spec)
|
container_schema(page_spec)
|
||||||
|
@ -356,6 +378,7 @@ CONFIG_SCHEMA = (
|
||||||
cv.Optional(df.CONF_TOUCHSCREENS, default=None): touchscreen_schema,
|
cv.Optional(df.CONF_TOUCHSCREENS, default=None): touchscreen_schema,
|
||||||
cv.Optional(df.CONF_ENCODERS, default=None): ENCODERS_CONFIG,
|
cv.Optional(df.CONF_ENCODERS, default=None): ENCODERS_CONFIG,
|
||||||
cv.GenerateID(df.CONF_DEFAULT_GROUP): cv.declare_id(lv_group_t),
|
cv.GenerateID(df.CONF_DEFAULT_GROUP): cv.declare_id(lv_group_t),
|
||||||
|
cv.Optional(df.CONF_RESUME_ON_INPUT, default=True): cv.boolean,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
.extend(DISP_BG_SCHEMA)
|
.extend(DISP_BG_SCHEMA)
|
||||||
|
|
|
@ -408,6 +408,7 @@ CONF_DEFAULT_FONT = "default_font"
|
||||||
CONF_DEFAULT_GROUP = "default_group"
|
CONF_DEFAULT_GROUP = "default_group"
|
||||||
CONF_DIR = "dir"
|
CONF_DIR = "dir"
|
||||||
CONF_DISPLAYS = "displays"
|
CONF_DISPLAYS = "displays"
|
||||||
|
CONF_DRAW_ROUNDING = "draw_rounding"
|
||||||
CONF_EDITING = "editing"
|
CONF_EDITING = "editing"
|
||||||
CONF_ENCODERS = "encoders"
|
CONF_ENCODERS = "encoders"
|
||||||
CONF_END_ANGLE = "end_angle"
|
CONF_END_ANGLE = "end_angle"
|
||||||
|
@ -451,6 +452,8 @@ CONF_OFFSET_X = "offset_x"
|
||||||
CONF_OFFSET_Y = "offset_y"
|
CONF_OFFSET_Y = "offset_y"
|
||||||
CONF_ONE_CHECKED = "one_checked"
|
CONF_ONE_CHECKED = "one_checked"
|
||||||
CONF_ONE_LINE = "one_line"
|
CONF_ONE_LINE = "one_line"
|
||||||
|
CONF_ON_PAUSE = "on_pause"
|
||||||
|
CONF_ON_RESUME = "on_resume"
|
||||||
CONF_ON_SELECT = "on_select"
|
CONF_ON_SELECT = "on_select"
|
||||||
CONF_OPA = "opa"
|
CONF_OPA = "opa"
|
||||||
CONF_NEXT = "next"
|
CONF_NEXT = "next"
|
||||||
|
@ -466,6 +469,7 @@ CONF_POINTS = "points"
|
||||||
CONF_PREVIOUS = "previous"
|
CONF_PREVIOUS = "previous"
|
||||||
CONF_REPEAT_COUNT = "repeat_count"
|
CONF_REPEAT_COUNT = "repeat_count"
|
||||||
CONF_RECOLOR = "recolor"
|
CONF_RECOLOR = "recolor"
|
||||||
|
CONF_RESUME_ON_INPUT = "resume_on_input"
|
||||||
CONF_RIGHT_BUTTON = "right_button"
|
CONF_RIGHT_BUTTON = "right_button"
|
||||||
CONF_ROLLOVER = "rollover"
|
CONF_ROLLOVER = "rollover"
|
||||||
CONF_ROOT_BACK_BTN = "root_back_btn"
|
CONF_ROOT_BACK_BTN = "root_back_btn"
|
||||||
|
|
|
@ -69,30 +69,38 @@ std::string lv_event_code_name_for(uint8_t event_code) {
|
||||||
}
|
}
|
||||||
return str_sprintf("%2d", event_code);
|
return str_sprintf("%2d", event_code);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rounder_cb(lv_disp_drv_t *disp_drv, lv_area_t *area) {
|
static void rounder_cb(lv_disp_drv_t *disp_drv, lv_area_t *area) {
|
||||||
// make sure all coordinates are even
|
// cater for display driver chips with special requirements for bounds of partial
|
||||||
if (area->x1 & 1)
|
// draw areas. Extend the draw area to satisfy:
|
||||||
area->x1--;
|
// * Coordinates must be a multiple of draw_rounding
|
||||||
if (!(area->x2 & 1))
|
auto *comp = static_cast<LvglComponent *>(disp_drv->user_data);
|
||||||
area->x2++;
|
auto draw_rounding = comp->draw_rounding;
|
||||||
if (area->y1 & 1)
|
// round down the start coordinates
|
||||||
area->y1--;
|
area->x1 = area->x1 / draw_rounding * draw_rounding;
|
||||||
if (!(area->y2 & 1))
|
area->y1 = area->y1 / draw_rounding * draw_rounding;
|
||||||
area->y2++;
|
// round up the end coordinates
|
||||||
|
area->x2 = (area->x2 + draw_rounding) / draw_rounding * draw_rounding - 1;
|
||||||
|
area->y2 = (area->y2 + draw_rounding) / draw_rounding * draw_rounding - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
lv_event_code_t lv_api_event; // NOLINT
|
lv_event_code_t lv_api_event; // NOLINT
|
||||||
lv_event_code_t lv_update_event; // NOLINT
|
lv_event_code_t lv_update_event; // NOLINT
|
||||||
void LvglComponent::dump_config() { ESP_LOGCONFIG(TAG, "LVGL:"); }
|
void LvglComponent::dump_config() {
|
||||||
|
ESP_LOGCONFIG(TAG, "LVGL:");
|
||||||
|
ESP_LOGCONFIG(TAG, " Rotation: %d", this->rotation);
|
||||||
|
ESP_LOGCONFIG(TAG, " Draw rounding: %d", (int) this->draw_rounding);
|
||||||
|
}
|
||||||
void LvglComponent::set_paused(bool paused, bool show_snow) {
|
void LvglComponent::set_paused(bool paused, bool show_snow) {
|
||||||
this->paused_ = paused;
|
this->paused_ = paused;
|
||||||
this->show_snow_ = show_snow;
|
this->show_snow_ = show_snow;
|
||||||
this->snow_line_ = 0;
|
|
||||||
if (!paused && lv_scr_act() != nullptr) {
|
if (!paused && lv_scr_act() != nullptr) {
|
||||||
lv_disp_trig_activity(this->disp_); // resets the inactivity time
|
lv_disp_trig_activity(this->disp_); // resets the inactivity time
|
||||||
lv_obj_invalidate(lv_scr_act());
|
lv_obj_invalidate(lv_scr_act());
|
||||||
}
|
}
|
||||||
|
this->pause_callbacks_.call(paused);
|
||||||
}
|
}
|
||||||
|
|
||||||
void LvglComponent::add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event) {
|
void LvglComponent::add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event) {
|
||||||
lv_obj_add_event_cb(obj, callback, event, this);
|
lv_obj_add_event_cb(obj, callback, event, this);
|
||||||
}
|
}
|
||||||
|
@ -133,19 +141,64 @@ void LvglComponent::show_prev_page(lv_scr_load_anim_t anim, uint32_t time) {
|
||||||
} while (this->pages_[this->current_page_]->skip); // skip empty pages()
|
} while (this->pages_[this->current_page_]->skip); // skip empty pages()
|
||||||
this->show_page(this->current_page_, anim, time);
|
this->show_page(this->current_page_, anim, time);
|
||||||
}
|
}
|
||||||
void LvglComponent::draw_buffer_(const lv_area_t *area, const uint8_t *ptr) {
|
void LvglComponent::draw_buffer_(const lv_area_t *area, lv_color_t *ptr) {
|
||||||
|
auto width = lv_area_get_width(area);
|
||||||
|
auto height = lv_area_get_height(area);
|
||||||
|
auto x1 = area->x1;
|
||||||
|
auto y1 = area->y1;
|
||||||
|
lv_color_t *dst = this->rotate_buf_;
|
||||||
|
switch (this->rotation) {
|
||||||
|
case display::DISPLAY_ROTATION_90_DEGREES:
|
||||||
|
for (lv_coord_t x = height - 1; x-- != 0;) {
|
||||||
|
for (lv_coord_t y = 0; y != width; y++) {
|
||||||
|
dst[y * height + x] = *ptr++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
y1 = x1;
|
||||||
|
x1 = this->disp_drv_.ver_res - area->y1 - height;
|
||||||
|
width = height;
|
||||||
|
height = lv_area_get_width(area);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case display::DISPLAY_ROTATION_180_DEGREES:
|
||||||
|
for (lv_coord_t y = height; y-- != 0;) {
|
||||||
|
for (lv_coord_t x = width; x-- != 0;) {
|
||||||
|
dst[y * width + x] = *ptr++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
x1 = this->disp_drv_.hor_res - x1 - width;
|
||||||
|
y1 = this->disp_drv_.ver_res - y1 - height;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case display::DISPLAY_ROTATION_270_DEGREES:
|
||||||
|
for (lv_coord_t x = 0; x != height; x++) {
|
||||||
|
for (lv_coord_t y = width; y-- != 0;) {
|
||||||
|
dst[y * height + x] = *ptr++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
x1 = y1;
|
||||||
|
y1 = this->disp_drv_.hor_res - area->x1 - width;
|
||||||
|
width = height;
|
||||||
|
height = lv_area_get_width(area);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
dst = ptr;
|
||||||
|
break;
|
||||||
|
}
|
||||||
for (auto *display : this->displays_) {
|
for (auto *display : this->displays_) {
|
||||||
display->draw_pixels_at(area->x1, area->y1, lv_area_get_width(area), lv_area_get_height(area), ptr,
|
ESP_LOGV(TAG, "draw buffer x1=%d, y1=%d, width=%d, height=%d", x1, y1, width, height);
|
||||||
display::COLOR_ORDER_RGB, LV_BITNESS, LV_COLOR_16_SWAP);
|
display->draw_pixels_at(x1, y1, width, height, (const uint8_t *) dst, display::COLOR_ORDER_RGB, LV_BITNESS,
|
||||||
|
LV_COLOR_16_SWAP);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void LvglComponent::flush_cb_(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p) {
|
void LvglComponent::flush_cb_(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p) {
|
||||||
if (!this->paused_) {
|
if (!this->paused_) {
|
||||||
auto now = millis();
|
auto now = millis();
|
||||||
this->draw_buffer_(area, (const uint8_t *) color_p);
|
this->draw_buffer_(area, color_p);
|
||||||
ESP_LOGV(TAG, "flush_cb, area=%d/%d, %d/%d took %dms", area->x1, area->y1, lv_area_get_width(area),
|
ESP_LOGVV(TAG, "flush_cb, area=%d/%d, %d/%d took %dms", area->x1, area->y1, lv_area_get_width(area),
|
||||||
lv_area_get_height(area), (int) (millis() - now));
|
lv_area_get_height(area), (int) (millis() - now));
|
||||||
}
|
}
|
||||||
lv_disp_flush_ready(disp_drv);
|
lv_disp_flush_ready(disp_drv);
|
||||||
}
|
}
|
||||||
|
@ -160,6 +213,13 @@ IdleTrigger::IdleTrigger(LvglComponent *parent, TemplatableValue<uint32_t> timeo
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PauseTrigger::PauseTrigger(LvglComponent *parent, TemplatableValue<bool> paused) : paused_(std::move(paused)) {
|
||||||
|
parent->add_on_pause_callback([this](bool pausing) {
|
||||||
|
if (this->paused_.value() == pausing)
|
||||||
|
this->trigger();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef USE_LVGL_TOUCHSCREEN
|
#ifdef USE_LVGL_TOUCHSCREEN
|
||||||
LVTouchListener::LVTouchListener(uint16_t long_press_time, uint16_t long_press_repeat_time) {
|
LVTouchListener::LVTouchListener(uint16_t long_press_time, uint16_t long_press_repeat_time) {
|
||||||
lv_indev_drv_init(&this->drv_);
|
lv_indev_drv_init(&this->drv_);
|
||||||
|
@ -261,23 +321,31 @@ void LvKeyboardType::set_obj(lv_obj_t *lv_obj) {
|
||||||
#endif // USE_LVGL_KEYBOARD
|
#endif // USE_LVGL_KEYBOARD
|
||||||
|
|
||||||
void LvglComponent::write_random_() {
|
void LvglComponent::write_random_() {
|
||||||
// length of 2 lines in 32 bit units
|
int iterations = 6 - lv_disp_get_inactive_time(this->disp_) / 60000;
|
||||||
// we write 2 lines for the benefit of displays that won't write one line at a time.
|
if (iterations <= 0)
|
||||||
size_t line_len = this->disp_drv_.hor_res * LV_COLOR_DEPTH / 8 / 4 * 2;
|
iterations = 1;
|
||||||
for (size_t i = 0; i != line_len; i++) {
|
while (iterations-- != 0) {
|
||||||
((uint32_t *) (this->draw_buf_.buf1))[i] = random_uint32();
|
auto col = random_uint32() % this->disp_drv_.hor_res;
|
||||||
|
col = col / this->draw_rounding * this->draw_rounding;
|
||||||
|
auto row = random_uint32() % this->disp_drv_.ver_res;
|
||||||
|
row = row / this->draw_rounding * this->draw_rounding;
|
||||||
|
auto size = (random_uint32() % 32) / this->draw_rounding * this->draw_rounding - 1;
|
||||||
|
lv_area_t area;
|
||||||
|
area.x1 = col;
|
||||||
|
area.y1 = row;
|
||||||
|
area.x2 = col + size;
|
||||||
|
area.y2 = row + size;
|
||||||
|
if (area.x2 >= this->disp_drv_.hor_res)
|
||||||
|
area.x2 = this->disp_drv_.hor_res - 1;
|
||||||
|
if (area.y2 >= this->disp_drv_.ver_res)
|
||||||
|
area.y2 = this->disp_drv_.ver_res - 1;
|
||||||
|
|
||||||
|
size_t line_len = lv_area_get_width(&area) * lv_area_get_height(&area) / 2;
|
||||||
|
for (size_t i = 0; i != line_len; i++) {
|
||||||
|
((uint32_t *) (this->draw_buf_.buf1))[i] = random_uint32();
|
||||||
|
}
|
||||||
|
this->draw_buffer_(&area, (lv_color_t *) this->draw_buf_.buf1);
|
||||||
}
|
}
|
||||||
lv_area_t area;
|
|
||||||
area.x1 = 0;
|
|
||||||
area.x2 = this->disp_drv_.hor_res - 1;
|
|
||||||
if (this->snow_line_ == this->disp_drv_.ver_res / 2) {
|
|
||||||
area.y1 = static_cast<lv_coord_t>(random_uint32() % (this->disp_drv_.ver_res / 2) * 2);
|
|
||||||
} else {
|
|
||||||
area.y1 = this->snow_line_++ * 2;
|
|
||||||
}
|
|
||||||
// write 2 lines
|
|
||||||
area.y2 = area.y1 + 1;
|
|
||||||
this->draw_buffer_(&area, (const uint8_t *) this->draw_buf_.buf1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void LvglComponent::setup() {
|
void LvglComponent::setup() {
|
||||||
|
@ -291,7 +359,7 @@ void LvglComponent::setup() {
|
||||||
auto *display = this->displays_[0];
|
auto *display = this->displays_[0];
|
||||||
size_t buffer_pixels = display->get_width() * display->get_height() / this->buffer_frac_;
|
size_t buffer_pixels = display->get_width() * display->get_height() / this->buffer_frac_;
|
||||||
auto buf_bytes = buffer_pixels * LV_COLOR_DEPTH / 8;
|
auto buf_bytes = buffer_pixels * LV_COLOR_DEPTH / 8;
|
||||||
auto *buf = lv_custom_mem_alloc(buf_bytes);
|
auto *buf = lv_custom_mem_alloc(buf_bytes); // NOLINT
|
||||||
if (buf == nullptr) {
|
if (buf == nullptr) {
|
||||||
#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_ERROR
|
#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_ERROR
|
||||||
ESP_LOGE(TAG, "Malloc failed to allocate %zu bytes", buf_bytes);
|
ESP_LOGE(TAG, "Malloc failed to allocate %zu bytes", buf_bytes);
|
||||||
|
@ -307,26 +375,30 @@ void LvglComponent::setup() {
|
||||||
this->disp_drv_.full_refresh = this->full_refresh_;
|
this->disp_drv_.full_refresh = this->full_refresh_;
|
||||||
this->disp_drv_.flush_cb = static_flush_cb;
|
this->disp_drv_.flush_cb = static_flush_cb;
|
||||||
this->disp_drv_.rounder_cb = rounder_cb;
|
this->disp_drv_.rounder_cb = rounder_cb;
|
||||||
switch (display->get_rotation()) {
|
this->rotation = display->get_rotation();
|
||||||
case display::DISPLAY_ROTATION_0_DEGREES:
|
if (this->rotation != display::DISPLAY_ROTATION_0_DEGREES) {
|
||||||
break;
|
this->rotate_buf_ = static_cast<lv_color_t *>(lv_custom_mem_alloc(buf_bytes)); // NOLINT
|
||||||
case display::DISPLAY_ROTATION_90_DEGREES:
|
if (this->rotate_buf_ == nullptr) {
|
||||||
this->disp_drv_.sw_rotate = true;
|
#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_ERROR
|
||||||
this->disp_drv_.rotated = LV_DISP_ROT_90;
|
ESP_LOGE(TAG, "Malloc failed to allocate %zu bytes", buf_bytes);
|
||||||
break;
|
#endif
|
||||||
case display::DISPLAY_ROTATION_180_DEGREES:
|
this->mark_failed();
|
||||||
this->disp_drv_.sw_rotate = true;
|
this->status_set_error("Memory allocation failure");
|
||||||
this->disp_drv_.rotated = LV_DISP_ROT_180;
|
return;
|
||||||
break;
|
}
|
||||||
case display::DISPLAY_ROTATION_270_DEGREES:
|
|
||||||
this->disp_drv_.sw_rotate = true;
|
|
||||||
this->disp_drv_.rotated = LV_DISP_ROT_270;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
display->set_rotation(display::DISPLAY_ROTATION_0_DEGREES);
|
display->set_rotation(display::DISPLAY_ROTATION_0_DEGREES);
|
||||||
this->disp_drv_.hor_res = (lv_coord_t) display->get_width();
|
switch (this->rotation) {
|
||||||
this->disp_drv_.ver_res = (lv_coord_t) display->get_height();
|
default:
|
||||||
ESP_LOGV(TAG, "sw_rotate = %d, rotated=%d", this->disp_drv_.sw_rotate, this->disp_drv_.rotated);
|
this->disp_drv_.hor_res = (lv_coord_t) display->get_width();
|
||||||
|
this->disp_drv_.ver_res = (lv_coord_t) display->get_height();
|
||||||
|
break;
|
||||||
|
case display::DISPLAY_ROTATION_90_DEGREES:
|
||||||
|
case display::DISPLAY_ROTATION_270_DEGREES:
|
||||||
|
this->disp_drv_.ver_res = (lv_coord_t) display->get_width();
|
||||||
|
this->disp_drv_.hor_res = (lv_coord_t) display->get_height();
|
||||||
|
break;
|
||||||
|
}
|
||||||
this->disp_ = lv_disp_drv_register(&this->disp_drv_);
|
this->disp_ = lv_disp_drv_register(&this->disp_drv_);
|
||||||
for (const auto &v : this->init_lambdas_)
|
for (const auto &v : this->init_lambdas_)
|
||||||
v(this);
|
v(this);
|
||||||
|
|
|
@ -119,6 +119,7 @@ class LvglComponent : public PollingComponent {
|
||||||
void add_on_idle_callback(std::function<void(uint32_t)> &&callback) {
|
void add_on_idle_callback(std::function<void(uint32_t)> &&callback) {
|
||||||
this->idle_callbacks_.add(std::move(callback));
|
this->idle_callbacks_.add(std::move(callback));
|
||||||
}
|
}
|
||||||
|
void add_on_pause_callback(std::function<void(bool)> &&callback) { this->pause_callbacks_.add(std::move(callback)); }
|
||||||
void add_display(display::Display *display) { this->displays_.push_back(display); }
|
void add_display(display::Display *display) { this->displays_.push_back(display); }
|
||||||
void add_init_lambda(const std::function<void(LvglComponent *)> &lamb) { this->init_lambdas_.push_back(lamb); }
|
void add_init_lambda(const std::function<void(LvglComponent *)> &lamb) { this->init_lambdas_.push_back(lamb); }
|
||||||
void dump_config() override;
|
void dump_config() override;
|
||||||
|
@ -126,12 +127,22 @@ class LvglComponent : public PollingComponent {
|
||||||
bool is_idle(uint32_t idle_ms) { return lv_disp_get_inactive_time(this->disp_) > idle_ms; }
|
bool is_idle(uint32_t idle_ms) { return lv_disp_get_inactive_time(this->disp_) > idle_ms; }
|
||||||
void set_buffer_frac(size_t frac) { this->buffer_frac_ = frac; }
|
void set_buffer_frac(size_t frac) { this->buffer_frac_ = frac; }
|
||||||
lv_disp_t *get_disp() { return this->disp_; }
|
lv_disp_t *get_disp() { return this->disp_; }
|
||||||
|
// Pause or resume the display.
|
||||||
|
// @param paused If true, pause the display. If false, resume the display.
|
||||||
|
// @param show_snow If true, show the snow effect when paused.
|
||||||
void set_paused(bool paused, bool show_snow);
|
void set_paused(bool paused, bool show_snow);
|
||||||
|
bool is_paused() const { return this->paused_; }
|
||||||
|
// If the display is paused and we have resume_on_input_ set to true, resume the display.
|
||||||
|
void maybe_wakeup() {
|
||||||
|
if (this->paused_ && this->resume_on_input_) {
|
||||||
|
this->set_paused(false, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event);
|
void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event);
|
||||||
void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1, lv_event_code_t event2);
|
void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1, lv_event_code_t event2);
|
||||||
void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1, lv_event_code_t event2,
|
void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1, lv_event_code_t event2,
|
||||||
lv_event_code_t event3);
|
lv_event_code_t event3);
|
||||||
bool is_paused() const { return this->paused_; }
|
|
||||||
void add_page(LvPageType *page);
|
void add_page(LvPageType *page);
|
||||||
void show_page(size_t index, lv_scr_load_anim_t anim, uint32_t time);
|
void show_page(size_t index, lv_scr_load_anim_t anim, uint32_t time);
|
||||||
void show_next_page(lv_scr_load_anim_t anim, uint32_t time);
|
void show_next_page(lv_scr_load_anim_t anim, uint32_t time);
|
||||||
|
@ -144,10 +155,17 @@ class LvglComponent : public PollingComponent {
|
||||||
lv_group_focus_obj(mark);
|
lv_group_focus_obj(mark);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// rounding factor to align bounds of update area when drawing
|
||||||
|
size_t draw_rounding{2};
|
||||||
|
void set_draw_rounding(size_t rounding) { this->draw_rounding = rounding; }
|
||||||
|
void set_resume_on_input(bool resume_on_input) { this->resume_on_input_ = resume_on_input; }
|
||||||
|
|
||||||
|
// if set to true, the bounds of the update area will always start at 0,0
|
||||||
|
display::DisplayRotation rotation{display::DISPLAY_ROTATION_0_DEGREES};
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void write_random_();
|
void write_random_();
|
||||||
void draw_buffer_(const lv_area_t *area, const uint8_t *ptr);
|
void draw_buffer_(const lv_area_t *area, lv_color_t *ptr);
|
||||||
void flush_cb_(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p);
|
void flush_cb_(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p);
|
||||||
std::vector<display::Display *> displays_{};
|
std::vector<display::Display *> displays_{};
|
||||||
lv_disp_draw_buf_t draw_buf_{};
|
lv_disp_draw_buf_t draw_buf_{};
|
||||||
|
@ -157,14 +175,16 @@ class LvglComponent : public PollingComponent {
|
||||||
std::vector<LvPageType *> pages_{};
|
std::vector<LvPageType *> pages_{};
|
||||||
size_t current_page_{0};
|
size_t current_page_{0};
|
||||||
bool show_snow_{};
|
bool show_snow_{};
|
||||||
lv_coord_t snow_line_{};
|
|
||||||
bool page_wrap_{true};
|
bool page_wrap_{true};
|
||||||
|
bool resume_on_input_{};
|
||||||
std::map<lv_group_t *, lv_obj_t *> focus_marks_{};
|
std::map<lv_group_t *, lv_obj_t *> focus_marks_{};
|
||||||
|
|
||||||
std::vector<std::function<void(LvglComponent *lv_component)>> init_lambdas_;
|
std::vector<std::function<void(LvglComponent *lv_component)>> init_lambdas_;
|
||||||
CallbackManager<void(uint32_t)> idle_callbacks_{};
|
CallbackManager<void(uint32_t)> idle_callbacks_{};
|
||||||
|
CallbackManager<void(bool)> pause_callbacks_{};
|
||||||
size_t buffer_frac_{1};
|
size_t buffer_frac_{1};
|
||||||
bool full_refresh_{};
|
bool full_refresh_{};
|
||||||
|
lv_color_t *rotate_buf_{};
|
||||||
};
|
};
|
||||||
|
|
||||||
class IdleTrigger : public Trigger<> {
|
class IdleTrigger : public Trigger<> {
|
||||||
|
@ -176,6 +196,14 @@ class IdleTrigger : public Trigger<> {
|
||||||
bool is_idle_{};
|
bool is_idle_{};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class PauseTrigger : public Trigger<> {
|
||||||
|
public:
|
||||||
|
explicit PauseTrigger(LvglComponent *parent, TemplatableValue<bool> paused);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
TemplatableValue<bool> paused_;
|
||||||
|
};
|
||||||
|
|
||||||
template<typename... Ts> class LvglAction : public Action<Ts...>, public Parented<LvglComponent> {
|
template<typename... Ts> class LvglAction : public Action<Ts...>, public Parented<LvglComponent> {
|
||||||
public:
|
public:
|
||||||
explicit LvglAction(std::function<void(LvglComponent *)> &&lamb) : action_(std::move(lamb)) {}
|
explicit LvglAction(std::function<void(LvglComponent *)> &&lamb) : action_(std::move(lamb)) {}
|
||||||
|
@ -200,7 +228,10 @@ class LVTouchListener : public touchscreen::TouchListener, public Parented<LvglC
|
||||||
public:
|
public:
|
||||||
LVTouchListener(uint16_t long_press_time, uint16_t long_press_repeat_time);
|
LVTouchListener(uint16_t long_press_time, uint16_t long_press_repeat_time);
|
||||||
void update(const touchscreen::TouchPoints_t &tpoints) override;
|
void update(const touchscreen::TouchPoints_t &tpoints) override;
|
||||||
void release() override { touch_pressed_ = false; }
|
void release() override {
|
||||||
|
touch_pressed_ = false;
|
||||||
|
this->parent_->maybe_wakeup();
|
||||||
|
}
|
||||||
lv_indev_drv_t *get_drv() { return &this->drv_; }
|
lv_indev_drv_t *get_drv() { return &this->drv_; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -236,12 +267,18 @@ class LVEncoderListener : public Parented<LvglComponent> {
|
||||||
if (!this->parent_->is_paused()) {
|
if (!this->parent_->is_paused()) {
|
||||||
this->pressed_ = pressed;
|
this->pressed_ = pressed;
|
||||||
this->key_ = key;
|
this->key_ = key;
|
||||||
|
} else if (!pressed) {
|
||||||
|
// maybe wakeup on release if paused
|
||||||
|
this->parent_->maybe_wakeup();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_count(int32_t count) {
|
void set_count(int32_t count) {
|
||||||
if (!this->parent_->is_paused())
|
if (!this->parent_->is_paused()) {
|
||||||
this->count_ = count;
|
this->count_ = count;
|
||||||
|
} else {
|
||||||
|
this->parent_->maybe_wakeup();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
lv_indev_drv_t *get_drv() { return &this->drv_; }
|
lv_indev_drv_t *get_drv() { return &this->drv_; }
|
||||||
|
|
|
@ -34,13 +34,13 @@ async def to_code(config):
|
||||||
widget = widget[0]
|
widget = widget[0]
|
||||||
await wait_for_widgets()
|
await wait_for_widgets()
|
||||||
async with LambdaContext([(cg.std_string, "text_value")]) as control:
|
async with LambdaContext([(cg.std_string, "text_value")]) as control:
|
||||||
await widget.set_property("text", "text_value.c_str())")
|
await widget.set_property("text", "text_value.c_str()")
|
||||||
lv.event_send(widget.obj, API_EVENT, None)
|
lv.event_send(widget.obj, API_EVENT, cg.nullptr)
|
||||||
control.add(textvar.publish_state(widget.get_value()))
|
control.add(textvar.publish_state(widget.get_value()))
|
||||||
async with LambdaContext(EVENT_ARG) as lamb:
|
async with LambdaContext(EVENT_ARG) as lamb:
|
||||||
lv_add(textvar.publish_state(widget.get_value()))
|
lv_add(textvar.publish_state(widget.get_value()))
|
||||||
async with LvContext(paren):
|
async with LvContext(paren):
|
||||||
widget.var.set_control_lambda(await control.get_lambda())
|
lv_add(textvar.set_control_lambda(await control.get_lambda()))
|
||||||
lv_add(
|
lv_add(
|
||||||
paren.add_event_cb(
|
paren.add_event_cb(
|
||||||
widget.obj,
|
widget.obj,
|
||||||
|
|
|
@ -40,6 +40,7 @@ lv_event_code_t = cg.global_ns.enum("lv_event_code_t")
|
||||||
lv_indev_type_t = cg.global_ns.enum("lv_indev_type_t")
|
lv_indev_type_t = cg.global_ns.enum("lv_indev_type_t")
|
||||||
FontEngine = lvgl_ns.class_("FontEngine")
|
FontEngine = lvgl_ns.class_("FontEngine")
|
||||||
IdleTrigger = lvgl_ns.class_("IdleTrigger", automation.Trigger.template())
|
IdleTrigger = lvgl_ns.class_("IdleTrigger", automation.Trigger.template())
|
||||||
|
PauseTrigger = lvgl_ns.class_("PauseTrigger", automation.Trigger.template())
|
||||||
ObjUpdateAction = lvgl_ns.class_("ObjUpdateAction", automation.Action)
|
ObjUpdateAction = lvgl_ns.class_("ObjUpdateAction", automation.Action)
|
||||||
LvglCondition = lvgl_ns.class_("LvglCondition", automation.Condition)
|
LvglCondition = lvgl_ns.class_("LvglCondition", automation.Condition)
|
||||||
LvglAction = lvgl_ns.class_("LvglAction", automation.Action)
|
LvglAction = lvgl_ns.class_("LvglAction", automation.Action)
|
||||||
|
|
1
esphome/components/max17043/__init__.py
Normal file
1
esphome/components/max17043/__init__.py
Normal file
|
@ -0,0 +1 @@
|
||||||
|
CODEOWNERS = ["@blacknell"]
|
20
esphome/components/max17043/automation.h
Normal file
20
esphome/components/max17043/automation.h
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include "esphome/core/automation.h"
|
||||||
|
#include "max17043.h"
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace max17043 {
|
||||||
|
|
||||||
|
template<typename... Ts> class SleepAction : public Action<Ts...> {
|
||||||
|
public:
|
||||||
|
explicit SleepAction(MAX17043Component *max17043) : max17043_(max17043) {}
|
||||||
|
|
||||||
|
void play(Ts... x) override { this->max17043_->sleep_mode(); }
|
||||||
|
|
||||||
|
protected:
|
||||||
|
MAX17043Component *max17043_;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace max17043
|
||||||
|
} // namespace esphome
|
98
esphome/components/max17043/max17043.cpp
Normal file
98
esphome/components/max17043/max17043.cpp
Normal file
|
@ -0,0 +1,98 @@
|
||||||
|
#include "max17043.h"
|
||||||
|
#include "esphome/core/log.h"
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace max17043 {
|
||||||
|
|
||||||
|
// MAX174043 is a 1-Cell Fuel Gauge with ModelGauge and Low-Battery Alert
|
||||||
|
// Consult the datasheet at https://www.analog.com/en/products/max17043.html
|
||||||
|
|
||||||
|
static const char *const TAG = "max17043";
|
||||||
|
|
||||||
|
static const uint8_t MAX17043_VCELL = 0x02;
|
||||||
|
static const uint8_t MAX17043_SOC = 0x04;
|
||||||
|
static const uint8_t MAX17043_CONFIG = 0x0c;
|
||||||
|
|
||||||
|
static const uint16_t MAX17043_CONFIG_POWER_UP_DEFAULT = 0x971C;
|
||||||
|
static const uint16_t MAX17043_CONFIG_SAFE_MASK = 0xFF1F; // mask out sleep bit (7), unused bit (6) and alert bit (4)
|
||||||
|
static const uint16_t MAX17043_CONFIG_SLEEP_MASK = 0x0080;
|
||||||
|
|
||||||
|
void MAX17043Component::update() {
|
||||||
|
uint16_t raw_voltage, raw_percent;
|
||||||
|
|
||||||
|
if (this->voltage_sensor_ != nullptr) {
|
||||||
|
if (!this->read_byte_16(MAX17043_VCELL, &raw_voltage)) {
|
||||||
|
this->status_set_warning("Unable to read MAX17043_VCELL");
|
||||||
|
} else {
|
||||||
|
float voltage = (1.25 * (float) (raw_voltage >> 4)) / 1000.0;
|
||||||
|
this->voltage_sensor_->publish_state(voltage);
|
||||||
|
this->status_clear_warning();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (this->battery_remaining_sensor_ != nullptr) {
|
||||||
|
if (!this->read_byte_16(MAX17043_SOC, &raw_percent)) {
|
||||||
|
this->status_set_warning("Unable to read MAX17043_SOC");
|
||||||
|
} else {
|
||||||
|
float percent = (float) ((raw_percent >> 8) + 0.003906f * (raw_percent & 0x00ff));
|
||||||
|
this->battery_remaining_sensor_->publish_state(percent);
|
||||||
|
this->status_clear_warning();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MAX17043Component::setup() {
|
||||||
|
ESP_LOGCONFIG(TAG, "Setting up MAX17043...");
|
||||||
|
|
||||||
|
uint16_t config_reg;
|
||||||
|
if (this->write(&MAX17043_CONFIG, 1) != i2c::ERROR_OK) {
|
||||||
|
this->status_set_warning();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this->read(reinterpret_cast<uint8_t *>(&config_reg), 2) != i2c::ERROR_OK) {
|
||||||
|
this->status_set_warning();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
config_reg = i2c::i2ctohs(config_reg) & MAX17043_CONFIG_SAFE_MASK;
|
||||||
|
ESP_LOGV(TAG, "MAX17043 CONFIG register reads 0x%X", config_reg);
|
||||||
|
|
||||||
|
if (config_reg != MAX17043_CONFIG_POWER_UP_DEFAULT) {
|
||||||
|
ESP_LOGE(TAG, "Device does not appear to be a MAX17043");
|
||||||
|
this->status_set_error("unrecognised");
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// need to write back to config register to reset the sleep bit
|
||||||
|
if (!this->write_byte_16(MAX17043_CONFIG, MAX17043_CONFIG_POWER_UP_DEFAULT)) {
|
||||||
|
this->status_set_error("sleep reset failed");
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MAX17043Component::dump_config() {
|
||||||
|
ESP_LOGCONFIG(TAG, "MAX17043:");
|
||||||
|
LOG_I2C_DEVICE(this);
|
||||||
|
if (this->is_failed()) {
|
||||||
|
ESP_LOGE(TAG, "Communication with MAX17043 failed");
|
||||||
|
}
|
||||||
|
LOG_UPDATE_INTERVAL(this);
|
||||||
|
LOG_SENSOR(" ", "Battery Voltage", this->voltage_sensor_);
|
||||||
|
LOG_SENSOR(" ", "Battery Level", this->battery_remaining_sensor_);
|
||||||
|
}
|
||||||
|
|
||||||
|
float MAX17043Component::get_setup_priority() const { return setup_priority::DATA; }
|
||||||
|
|
||||||
|
void MAX17043Component::sleep_mode() {
|
||||||
|
if (!this->is_failed()) {
|
||||||
|
if (!this->write_byte_16(MAX17043_CONFIG, MAX17043_CONFIG_POWER_UP_DEFAULT | MAX17043_CONFIG_SLEEP_MASK)) {
|
||||||
|
ESP_LOGW(TAG, "Unable to write the sleep bit to config register");
|
||||||
|
this->status_set_warning();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace max17043
|
||||||
|
} // namespace esphome
|
29
esphome/components/max17043/max17043.h
Normal file
29
esphome/components/max17043/max17043.h
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "esphome/core/component.h"
|
||||||
|
#include "esphome/components/sensor/sensor.h"
|
||||||
|
#include "esphome/components/i2c/i2c.h"
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace max17043 {
|
||||||
|
|
||||||
|
class MAX17043Component : public PollingComponent, public i2c::I2CDevice {
|
||||||
|
public:
|
||||||
|
void setup() override;
|
||||||
|
void dump_config() override;
|
||||||
|
float get_setup_priority() const override;
|
||||||
|
void update() override;
|
||||||
|
void sleep_mode();
|
||||||
|
|
||||||
|
void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
|
||||||
|
void set_battery_remaining_sensor(sensor::Sensor *battery_remaining_sensor) {
|
||||||
|
battery_remaining_sensor_ = battery_remaining_sensor;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
sensor::Sensor *voltage_sensor_{nullptr};
|
||||||
|
sensor::Sensor *battery_remaining_sensor_{nullptr};
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace max17043
|
||||||
|
} // namespace esphome
|
77
esphome/components/max17043/sensor.py
Normal file
77
esphome/components/max17043/sensor.py
Normal file
|
@ -0,0 +1,77 @@
|
||||||
|
from esphome import automation
|
||||||
|
from esphome.automation import maybe_simple_id
|
||||||
|
import esphome.codegen as cg
|
||||||
|
from esphome.components import i2c, sensor
|
||||||
|
import esphome.config_validation as cv
|
||||||
|
from esphome.const import (
|
||||||
|
CONF_BATTERY_LEVEL,
|
||||||
|
CONF_BATTERY_VOLTAGE,
|
||||||
|
CONF_ID,
|
||||||
|
DEVICE_CLASS_BATTERY,
|
||||||
|
DEVICE_CLASS_VOLTAGE,
|
||||||
|
ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
|
STATE_CLASS_MEASUREMENT,
|
||||||
|
UNIT_PERCENT,
|
||||||
|
UNIT_VOLT,
|
||||||
|
)
|
||||||
|
|
||||||
|
DEPENDENCIES = ["i2c"]
|
||||||
|
|
||||||
|
max17043_ns = cg.esphome_ns.namespace("max17043")
|
||||||
|
MAX17043Component = max17043_ns.class_(
|
||||||
|
"MAX17043Component", cg.PollingComponent, i2c.I2CDevice
|
||||||
|
)
|
||||||
|
|
||||||
|
# Actions
|
||||||
|
SleepAction = max17043_ns.class_("SleepAction", automation.Action)
|
||||||
|
|
||||||
|
CONFIG_SCHEMA = (
|
||||||
|
cv.Schema(
|
||||||
|
{
|
||||||
|
cv.GenerateID(): cv.declare_id(MAX17043Component),
|
||||||
|
cv.Optional(CONF_BATTERY_VOLTAGE): sensor.sensor_schema(
|
||||||
|
unit_of_measurement=UNIT_VOLT,
|
||||||
|
accuracy_decimals=3,
|
||||||
|
device_class=DEVICE_CLASS_VOLTAGE,
|
||||||
|
state_class=STATE_CLASS_MEASUREMENT,
|
||||||
|
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(
|
||||||
|
unit_of_measurement=UNIT_PERCENT,
|
||||||
|
accuracy_decimals=3,
|
||||||
|
device_class=DEVICE_CLASS_BATTERY,
|
||||||
|
state_class=STATE_CLASS_MEASUREMENT,
|
||||||
|
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||||
|
),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.extend(cv.polling_component_schema("60s"))
|
||||||
|
.extend(i2c.i2c_device_schema(0x36))
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def to_code(config):
|
||||||
|
var = cg.new_Pvariable(config[CONF_ID])
|
||||||
|
await cg.register_component(var, config)
|
||||||
|
await i2c.register_i2c_device(var, config)
|
||||||
|
|
||||||
|
if voltage_config := config.get(CONF_BATTERY_VOLTAGE):
|
||||||
|
sens = await sensor.new_sensor(voltage_config)
|
||||||
|
cg.add(var.set_voltage_sensor(sens))
|
||||||
|
|
||||||
|
if CONF_BATTERY_LEVEL in config:
|
||||||
|
sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
|
||||||
|
cg.add(var.set_battery_remaining_sensor(sens))
|
||||||
|
|
||||||
|
|
||||||
|
MAX17043_ACTION_SCHEMA = maybe_simple_id(
|
||||||
|
{
|
||||||
|
cv.Required(CONF_ID): cv.use_id(MAX17043Component),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@automation.register_action("max17043.sleep_mode", SleepAction, MAX17043_ACTION_SCHEMA)
|
||||||
|
async def max17043_sleep_mode_to_code(config, action_id, template_arg, args):
|
||||||
|
paren = await cg.get_variable(config[CONF_ID])
|
||||||
|
return cg.new_Pvariable(action_id, template_arg, paren)
|
|
@ -1,143 +1,3 @@
|
||||||
import esphome.codegen as cg
|
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome import pins
|
|
||||||
from esphome.components import (
|
|
||||||
spi,
|
|
||||||
display,
|
|
||||||
)
|
|
||||||
from esphome.const import (
|
|
||||||
CONF_RESET_PIN,
|
|
||||||
CONF_ID,
|
|
||||||
CONF_DIMENSIONS,
|
|
||||||
CONF_WIDTH,
|
|
||||||
CONF_HEIGHT,
|
|
||||||
CONF_LAMBDA,
|
|
||||||
CONF_BRIGHTNESS,
|
|
||||||
CONF_ENABLE_PIN,
|
|
||||||
CONF_MODEL,
|
|
||||||
CONF_OFFSET_HEIGHT,
|
|
||||||
CONF_OFFSET_WIDTH,
|
|
||||||
CONF_INVERT_COLORS,
|
|
||||||
CONF_MIRROR_X,
|
|
||||||
CONF_MIRROR_Y,
|
|
||||||
CONF_SWAP_XY,
|
|
||||||
CONF_COLOR_ORDER,
|
|
||||||
CONF_TRANSFORM,
|
|
||||||
)
|
|
||||||
|
|
||||||
DEPENDENCIES = ["spi"]
|
CONFIG_SCHEMA = cv.invalid("The qspi_amoled component has been renamed to qspi_dbi")
|
||||||
|
|
||||||
qspi_amoled_ns = cg.esphome_ns.namespace("qspi_amoled")
|
|
||||||
QSPI_AMOLED = qspi_amoled_ns.class_(
|
|
||||||
"QspiAmoLed", display.Display, display.DisplayBuffer, cg.Component, spi.SPIDevice
|
|
||||||
)
|
|
||||||
ColorOrder = display.display_ns.enum("ColorMode")
|
|
||||||
Model = qspi_amoled_ns.enum("Model")
|
|
||||||
|
|
||||||
MODELS = {"RM690B0": Model.RM690B0, "RM67162": Model.RM67162}
|
|
||||||
|
|
||||||
COLOR_ORDERS = {
|
|
||||||
"RGB": ColorOrder.COLOR_ORDER_RGB,
|
|
||||||
"BGR": ColorOrder.COLOR_ORDER_BGR,
|
|
||||||
}
|
|
||||||
DATA_PIN_SCHEMA = pins.internal_gpio_output_pin_schema
|
|
||||||
|
|
||||||
|
|
||||||
def validate_dimension(value):
|
|
||||||
value = cv.positive_int(value)
|
|
||||||
if value % 2 != 0:
|
|
||||||
raise cv.Invalid("Width/height/offset must be divisible by 2")
|
|
||||||
return value
|
|
||||||
|
|
||||||
|
|
||||||
CONFIG_SCHEMA = cv.All(
|
|
||||||
display.FULL_DISPLAY_SCHEMA.extend(
|
|
||||||
cv.Schema(
|
|
||||||
{
|
|
||||||
cv.GenerateID(): cv.declare_id(QSPI_AMOLED),
|
|
||||||
cv.Required(CONF_MODEL): cv.enum(MODELS, upper=True),
|
|
||||||
cv.Required(CONF_DIMENSIONS): cv.Any(
|
|
||||||
cv.dimensions,
|
|
||||||
cv.Schema(
|
|
||||||
{
|
|
||||||
cv.Required(CONF_WIDTH): validate_dimension,
|
|
||||||
cv.Required(CONF_HEIGHT): validate_dimension,
|
|
||||||
cv.Optional(
|
|
||||||
CONF_OFFSET_HEIGHT, default=0
|
|
||||||
): validate_dimension,
|
|
||||||
cv.Optional(
|
|
||||||
CONF_OFFSET_WIDTH, default=0
|
|
||||||
): validate_dimension,
|
|
||||||
}
|
|
||||||
),
|
|
||||||
),
|
|
||||||
cv.Optional(CONF_TRANSFORM): cv.Schema(
|
|
||||||
{
|
|
||||||
cv.Optional(CONF_MIRROR_X, default=False): cv.boolean,
|
|
||||||
cv.Optional(CONF_MIRROR_Y, default=False): cv.boolean,
|
|
||||||
cv.Optional(CONF_SWAP_XY, default=False): cv.boolean,
|
|
||||||
}
|
|
||||||
),
|
|
||||||
cv.Optional(CONF_COLOR_ORDER, default="RGB"): cv.enum(
|
|
||||||
COLOR_ORDERS, upper=True
|
|
||||||
),
|
|
||||||
cv.Optional(CONF_INVERT_COLORS, default=False): cv.boolean,
|
|
||||||
cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
|
|
||||||
cv.Optional(CONF_ENABLE_PIN): pins.gpio_output_pin_schema,
|
|
||||||
cv.Optional(CONF_BRIGHTNESS, default=0xD0): cv.int_range(
|
|
||||||
0, 0xFF, min_included=True, max_included=True
|
|
||||||
),
|
|
||||||
}
|
|
||||||
).extend(
|
|
||||||
spi.spi_device_schema(
|
|
||||||
cs_pin_required=False,
|
|
||||||
default_mode="MODE0",
|
|
||||||
default_data_rate=10e6,
|
|
||||||
quad=True,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
),
|
|
||||||
cv.only_with_esp_idf,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
async def to_code(config):
|
|
||||||
var = cg.new_Pvariable(config[CONF_ID])
|
|
||||||
await display.register_display(var, config)
|
|
||||||
await spi.register_spi_device(var, config)
|
|
||||||
|
|
||||||
cg.add(var.set_color_mode(config[CONF_COLOR_ORDER]))
|
|
||||||
cg.add(var.set_invert_colors(config[CONF_INVERT_COLORS]))
|
|
||||||
cg.add(var.set_brightness(config[CONF_BRIGHTNESS]))
|
|
||||||
cg.add(var.set_model(config[CONF_MODEL]))
|
|
||||||
if enable_pin := config.get(CONF_ENABLE_PIN):
|
|
||||||
enable = await cg.gpio_pin_expression(enable_pin)
|
|
||||||
cg.add(var.set_enable_pin(enable))
|
|
||||||
|
|
||||||
if reset_pin := config.get(CONF_RESET_PIN):
|
|
||||||
reset = await cg.gpio_pin_expression(reset_pin)
|
|
||||||
cg.add(var.set_reset_pin(reset))
|
|
||||||
|
|
||||||
if transform := config.get(CONF_TRANSFORM):
|
|
||||||
cg.add(var.set_mirror_x(transform[CONF_MIRROR_X]))
|
|
||||||
cg.add(var.set_mirror_y(transform[CONF_MIRROR_Y]))
|
|
||||||
cg.add(var.set_swap_xy(transform[CONF_SWAP_XY]))
|
|
||||||
|
|
||||||
if CONF_DIMENSIONS in config:
|
|
||||||
dimensions = config[CONF_DIMENSIONS]
|
|
||||||
if isinstance(dimensions, dict):
|
|
||||||
cg.add(var.set_dimensions(dimensions[CONF_WIDTH], dimensions[CONF_HEIGHT]))
|
|
||||||
cg.add(
|
|
||||||
var.set_offsets(
|
|
||||||
dimensions[CONF_OFFSET_WIDTH], dimensions[CONF_OFFSET_HEIGHT]
|
|
||||||
)
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
(width, height) = dimensions
|
|
||||||
cg.add(var.set_dimensions(width, height))
|
|
||||||
|
|
||||||
if lamb := config.get(CONF_LAMBDA):
|
|
||||||
lambda_ = await cg.process_lambda(
|
|
||||||
lamb, [(display.DisplayRef, "it")], return_type=cg.void
|
|
||||||
)
|
|
||||||
cg.add(var.set_writer(lambda_))
|
|
||||||
|
|
185
esphome/components/qspi_dbi/display.py
Normal file
185
esphome/components/qspi_dbi/display.py
Normal file
|
@ -0,0 +1,185 @@
|
||||||
|
from esphome import pins
|
||||||
|
import esphome.codegen as cg
|
||||||
|
from esphome.components import display, spi
|
||||||
|
import esphome.config_validation as cv
|
||||||
|
from esphome.const import (
|
||||||
|
CONF_BRIGHTNESS,
|
||||||
|
CONF_COLOR_ORDER,
|
||||||
|
CONF_DIMENSIONS,
|
||||||
|
CONF_ENABLE_PIN,
|
||||||
|
CONF_HEIGHT,
|
||||||
|
CONF_ID,
|
||||||
|
CONF_INIT_SEQUENCE,
|
||||||
|
CONF_INVERT_COLORS,
|
||||||
|
CONF_LAMBDA,
|
||||||
|
CONF_MIRROR_X,
|
||||||
|
CONF_MIRROR_Y,
|
||||||
|
CONF_MODEL,
|
||||||
|
CONF_OFFSET_HEIGHT,
|
||||||
|
CONF_OFFSET_WIDTH,
|
||||||
|
CONF_RESET_PIN,
|
||||||
|
CONF_SWAP_XY,
|
||||||
|
CONF_TRANSFORM,
|
||||||
|
CONF_WIDTH,
|
||||||
|
)
|
||||||
|
from esphome.core import TimePeriod
|
||||||
|
|
||||||
|
from .models import DriverChip
|
||||||
|
|
||||||
|
DEPENDENCIES = ["spi"]
|
||||||
|
|
||||||
|
qspi_dbi_ns = cg.esphome_ns.namespace("qspi_dbi")
|
||||||
|
QSPI_DBI = qspi_dbi_ns.class_(
|
||||||
|
"QspiDbi", display.Display, display.DisplayBuffer, cg.Component, spi.SPIDevice
|
||||||
|
)
|
||||||
|
ColorOrder = display.display_ns.enum("ColorMode")
|
||||||
|
Model = qspi_dbi_ns.enum("Model")
|
||||||
|
|
||||||
|
COLOR_ORDERS = {
|
||||||
|
"RGB": ColorOrder.COLOR_ORDER_RGB,
|
||||||
|
"BGR": ColorOrder.COLOR_ORDER_BGR,
|
||||||
|
}
|
||||||
|
DATA_PIN_SCHEMA = pins.internal_gpio_output_pin_schema
|
||||||
|
|
||||||
|
CONF_DRAW_FROM_ORIGIN = "draw_from_origin"
|
||||||
|
DELAY_FLAG = 0xFF
|
||||||
|
|
||||||
|
|
||||||
|
def validate_dimension(value):
|
||||||
|
value = cv.positive_int(value)
|
||||||
|
if value % 2 != 0:
|
||||||
|
raise cv.Invalid("Width/height/offset must be divisible by 2")
|
||||||
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
def map_sequence(value):
|
||||||
|
"""
|
||||||
|
The format is a repeated sequence of [CMD, <data>] where <data> is s a sequence of bytes. The length is inferred
|
||||||
|
from the length of the sequence and should not be explicit.
|
||||||
|
A delay can be inserted by specifying "- delay N" where N is in ms
|
||||||
|
"""
|
||||||
|
if isinstance(value, str) and value.lower().startswith("delay "):
|
||||||
|
value = value.lower()[6:]
|
||||||
|
delay = cv.All(
|
||||||
|
cv.positive_time_period_milliseconds,
|
||||||
|
cv.Range(TimePeriod(milliseconds=1), TimePeriod(milliseconds=255)),
|
||||||
|
)(value)
|
||||||
|
return [delay, DELAY_FLAG]
|
||||||
|
value = cv.Length(min=1, max=254)(value)
|
||||||
|
params = value[1:]
|
||||||
|
return [value[0], len(params)] + list(params)
|
||||||
|
|
||||||
|
|
||||||
|
def _validate(config):
|
||||||
|
chip = DriverChip.chips[config[CONF_MODEL]]
|
||||||
|
if not chip.initsequence:
|
||||||
|
if CONF_INIT_SEQUENCE not in config:
|
||||||
|
raise cv.Invalid(f"{chip.name} model requires init_sequence")
|
||||||
|
return config
|
||||||
|
|
||||||
|
|
||||||
|
CONFIG_SCHEMA = cv.All(
|
||||||
|
display.FULL_DISPLAY_SCHEMA.extend(
|
||||||
|
cv.Schema(
|
||||||
|
{
|
||||||
|
cv.GenerateID(): cv.declare_id(QSPI_DBI),
|
||||||
|
cv.Required(CONF_MODEL): cv.one_of(
|
||||||
|
*DriverChip.chips.keys(), upper=True
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_INIT_SEQUENCE): cv.ensure_list(map_sequence),
|
||||||
|
cv.Required(CONF_DIMENSIONS): cv.Any(
|
||||||
|
cv.dimensions,
|
||||||
|
cv.Schema(
|
||||||
|
{
|
||||||
|
cv.Required(CONF_WIDTH): validate_dimension,
|
||||||
|
cv.Required(CONF_HEIGHT): validate_dimension,
|
||||||
|
cv.Optional(
|
||||||
|
CONF_OFFSET_HEIGHT, default=0
|
||||||
|
): validate_dimension,
|
||||||
|
cv.Optional(
|
||||||
|
CONF_OFFSET_WIDTH, default=0
|
||||||
|
): validate_dimension,
|
||||||
|
}
|
||||||
|
),
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_TRANSFORM): cv.Schema(
|
||||||
|
{
|
||||||
|
cv.Optional(CONF_MIRROR_X, default=False): cv.boolean,
|
||||||
|
cv.Optional(CONF_MIRROR_Y, default=False): cv.boolean,
|
||||||
|
cv.Optional(CONF_SWAP_XY, default=False): cv.boolean,
|
||||||
|
}
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_COLOR_ORDER, default="RGB"): cv.enum(
|
||||||
|
COLOR_ORDERS, upper=True
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_INVERT_COLORS, default=False): cv.boolean,
|
||||||
|
cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
|
||||||
|
cv.Optional(CONF_ENABLE_PIN): pins.gpio_output_pin_schema,
|
||||||
|
cv.Optional(CONF_BRIGHTNESS, default=0xD0): cv.int_range(
|
||||||
|
0, 0xFF, min_included=True, max_included=True
|
||||||
|
),
|
||||||
|
cv.Optional(CONF_DRAW_FROM_ORIGIN, default=False): cv.boolean,
|
||||||
|
}
|
||||||
|
).extend(
|
||||||
|
spi.spi_device_schema(
|
||||||
|
cs_pin_required=False,
|
||||||
|
default_mode="MODE0",
|
||||||
|
default_data_rate=10e6,
|
||||||
|
quad=True,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
|
cv.only_with_esp_idf,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def to_code(config):
|
||||||
|
var = cg.new_Pvariable(config[CONF_ID])
|
||||||
|
await display.register_display(var, config)
|
||||||
|
await spi.register_spi_device(var, config)
|
||||||
|
|
||||||
|
chip = DriverChip.chips[config[CONF_MODEL]]
|
||||||
|
if chip.initsequence:
|
||||||
|
cg.add(var.add_init_sequence(chip.initsequence))
|
||||||
|
if init_sequences := config.get(CONF_INIT_SEQUENCE):
|
||||||
|
sequence = []
|
||||||
|
for seq in init_sequences:
|
||||||
|
sequence.extend(seq)
|
||||||
|
cg.add(var.add_init_sequence(sequence))
|
||||||
|
|
||||||
|
cg.add(var.set_color_mode(config[CONF_COLOR_ORDER]))
|
||||||
|
cg.add(var.set_invert_colors(config[CONF_INVERT_COLORS]))
|
||||||
|
cg.add(var.set_brightness(config[CONF_BRIGHTNESS]))
|
||||||
|
cg.add(var.set_model(config[CONF_MODEL]))
|
||||||
|
cg.add(var.set_draw_from_origin(config[CONF_DRAW_FROM_ORIGIN]))
|
||||||
|
if enable_pin := config.get(CONF_ENABLE_PIN):
|
||||||
|
enable = await cg.gpio_pin_expression(enable_pin)
|
||||||
|
cg.add(var.set_enable_pin(enable))
|
||||||
|
|
||||||
|
if reset_pin := config.get(CONF_RESET_PIN):
|
||||||
|
reset = await cg.gpio_pin_expression(reset_pin)
|
||||||
|
cg.add(var.set_reset_pin(reset))
|
||||||
|
|
||||||
|
if transform := config.get(CONF_TRANSFORM):
|
||||||
|
cg.add(var.set_mirror_x(transform[CONF_MIRROR_X]))
|
||||||
|
cg.add(var.set_mirror_y(transform[CONF_MIRROR_Y]))
|
||||||
|
cg.add(var.set_swap_xy(transform[CONF_SWAP_XY]))
|
||||||
|
|
||||||
|
if CONF_DIMENSIONS in config:
|
||||||
|
dimensions = config[CONF_DIMENSIONS]
|
||||||
|
if isinstance(dimensions, dict):
|
||||||
|
cg.add(var.set_dimensions(dimensions[CONF_WIDTH], dimensions[CONF_HEIGHT]))
|
||||||
|
cg.add(
|
||||||
|
var.set_offsets(
|
||||||
|
dimensions[CONF_OFFSET_WIDTH], dimensions[CONF_OFFSET_HEIGHT]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
(width, height) = dimensions
|
||||||
|
cg.add(var.set_dimensions(width, height))
|
||||||
|
|
||||||
|
if lamb := config.get(CONF_LAMBDA):
|
||||||
|
lambda_ = await cg.process_lambda(
|
||||||
|
lamb, [(display.DisplayRef, "it")], return_type=cg.void
|
||||||
|
)
|
||||||
|
cg.add(var.set_writer(lambda_))
|
64
esphome/components/qspi_dbi/models.py
Normal file
64
esphome/components/qspi_dbi/models.py
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
# Commands
|
||||||
|
SW_RESET_CMD = 0x01
|
||||||
|
SLEEP_OUT = 0x11
|
||||||
|
INVERT_OFF = 0x20
|
||||||
|
INVERT_ON = 0x21
|
||||||
|
ALL_ON = 0x23
|
||||||
|
WRAM = 0x24
|
||||||
|
MIPI = 0x26
|
||||||
|
DISPLAY_OFF = 0x28
|
||||||
|
DISPLAY_ON = 0x29
|
||||||
|
RASET = 0x2B
|
||||||
|
CASET = 0x2A
|
||||||
|
WDATA = 0x2C
|
||||||
|
TEON = 0x35
|
||||||
|
MADCTL_CMD = 0x36
|
||||||
|
PIXFMT = 0x3A
|
||||||
|
BRIGHTNESS = 0x51
|
||||||
|
SWIRE1 = 0x5A
|
||||||
|
SWIRE2 = 0x5B
|
||||||
|
PAGESEL = 0xFE
|
||||||
|
|
||||||
|
|
||||||
|
class DriverChip:
|
||||||
|
chips = {}
|
||||||
|
|
||||||
|
def __init__(self, name: str):
|
||||||
|
name = name.upper()
|
||||||
|
self.name = name
|
||||||
|
self.chips[name] = self
|
||||||
|
self.initsequence = []
|
||||||
|
|
||||||
|
def cmd(self, c, *args):
|
||||||
|
"""
|
||||||
|
Add a command sequence to the init sequence
|
||||||
|
:param c: The command (8 bit)
|
||||||
|
:param args: zero or more arguments (8 bit values)
|
||||||
|
"""
|
||||||
|
self.initsequence.extend([c, len(args)] + list(args))
|
||||||
|
|
||||||
|
def delay(self, ms):
|
||||||
|
self.initsequence.extend([ms, 0xFF])
|
||||||
|
|
||||||
|
|
||||||
|
chip = DriverChip("RM67162")
|
||||||
|
chip.cmd(PIXFMT, 0x55)
|
||||||
|
chip.cmd(BRIGHTNESS, 0)
|
||||||
|
|
||||||
|
chip = DriverChip("RM690B0")
|
||||||
|
chip.cmd(PAGESEL, 0x20)
|
||||||
|
chip.cmd(MIPI, 0x0A)
|
||||||
|
chip.cmd(WRAM, 0x80)
|
||||||
|
chip.cmd(SWIRE1, 0x51)
|
||||||
|
chip.cmd(SWIRE2, 0x2E)
|
||||||
|
chip.cmd(PAGESEL, 0x00)
|
||||||
|
chip.cmd(0xC2, 0x00)
|
||||||
|
chip.delay(10)
|
||||||
|
chip.cmd(TEON, 0x00)
|
||||||
|
|
||||||
|
chip = DriverChip("AXS15231")
|
||||||
|
chip.cmd(0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA5)
|
||||||
|
chip.cmd(0xC1, 0x33)
|
||||||
|
chip.cmd(0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
|
||||||
|
|
||||||
|
DriverChip("Custom")
|
|
@ -1,12 +1,12 @@
|
||||||
#ifdef USE_ESP_IDF
|
#ifdef USE_ESP_IDF
|
||||||
#include "qspi_amoled.h"
|
#include "qspi_dbi.h"
|
||||||
#include "esphome/core/log.h"
|
#include "esphome/core/log.h"
|
||||||
|
|
||||||
namespace esphome {
|
namespace esphome {
|
||||||
namespace qspi_amoled {
|
namespace qspi_dbi {
|
||||||
|
|
||||||
void QspiAmoLed::setup() {
|
void QspiDbi::setup() {
|
||||||
esph_log_config(TAG, "Setting up QSPI_AMOLED");
|
ESP_LOGCONFIG(TAG, "Setting up QSPI_DBI");
|
||||||
this->spi_setup();
|
this->spi_setup();
|
||||||
if (this->enable_pin_ != nullptr) {
|
if (this->enable_pin_ != nullptr) {
|
||||||
this->enable_pin_->setup();
|
this->enable_pin_->setup();
|
||||||
|
@ -22,13 +22,17 @@ void QspiAmoLed::setup() {
|
||||||
}
|
}
|
||||||
this->set_timeout(120, [this] { this->write_command_(SLEEP_OUT); });
|
this->set_timeout(120, [this] { this->write_command_(SLEEP_OUT); });
|
||||||
this->set_timeout(240, [this] { this->write_init_sequence_(); });
|
this->set_timeout(240, [this] { this->write_init_sequence_(); });
|
||||||
|
if (this->draw_from_origin_)
|
||||||
|
check_buffer_();
|
||||||
}
|
}
|
||||||
|
|
||||||
void QspiAmoLed::update() {
|
void QspiDbi::update() {
|
||||||
if (!this->setup_complete_) {
|
if (!this->setup_complete_) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this->do_update_();
|
this->do_update_();
|
||||||
|
if (this->buffer_ == nullptr || this->x_low_ > this->x_high_ || this->y_low_ > this->y_high_)
|
||||||
|
return;
|
||||||
// Start addresses and widths/heights must be divisible by 2 (CASET/RASET restriction in datasheet)
|
// Start addresses and widths/heights must be divisible by 2 (CASET/RASET restriction in datasheet)
|
||||||
if (this->x_low_ % 2 == 1) {
|
if (this->x_low_ % 2 == 1) {
|
||||||
this->x_low_--;
|
this->x_low_--;
|
||||||
|
@ -42,10 +46,15 @@ void QspiAmoLed::update() {
|
||||||
if (this->y_high_ % 2 == 0) {
|
if (this->y_high_ % 2 == 0) {
|
||||||
this->y_high_++;
|
this->y_high_++;
|
||||||
}
|
}
|
||||||
|
if (this->draw_from_origin_) {
|
||||||
|
this->x_low_ = 0;
|
||||||
|
this->y_low_ = 0;
|
||||||
|
this->x_high_ = this->width_ - 1;
|
||||||
|
}
|
||||||
int w = this->x_high_ - this->x_low_ + 1;
|
int w = this->x_high_ - this->x_low_ + 1;
|
||||||
int h = this->y_high_ - this->y_low_ + 1;
|
int h = this->y_high_ - this->y_low_ + 1;
|
||||||
this->draw_pixels_at(this->x_low_, this->y_low_, w, h, this->buffer_, this->color_mode_, display::COLOR_BITNESS_565,
|
this->write_to_display_(this->x_low_, this->y_low_, w, h, this->buffer_, this->x_low_, this->y_low_,
|
||||||
true, this->x_low_, this->y_low_, this->get_width_internal() - w - this->x_low_);
|
this->width_ - w - this->x_low_);
|
||||||
// invalidate watermarks
|
// invalidate watermarks
|
||||||
this->x_low_ = this->width_;
|
this->x_low_ = this->width_;
|
||||||
this->y_low_ = this->height_;
|
this->y_low_ = this->height_;
|
||||||
|
@ -53,21 +62,19 @@ void QspiAmoLed::update() {
|
||||||
this->y_high_ = 0;
|
this->y_high_ = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void QspiAmoLed::draw_absolute_pixel_internal(int x, int y, Color color) {
|
void QspiDbi::draw_absolute_pixel_internal(int x, int y, Color color) {
|
||||||
if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0) {
|
if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this->buffer_ == nullptr)
|
|
||||||
this->init_internal_(this->width_ * this->height_ * 2);
|
|
||||||
if (this->is_failed())
|
if (this->is_failed())
|
||||||
return;
|
return;
|
||||||
|
check_buffer_();
|
||||||
uint32_t pos = (y * this->width_) + x;
|
uint32_t pos = (y * this->width_) + x;
|
||||||
uint16_t new_color;
|
|
||||||
bool updated = false;
|
bool updated = false;
|
||||||
pos = pos * 2;
|
pos = pos * 2;
|
||||||
new_color = display::ColorUtil::color_to_565(color, display::ColorOrder::COLOR_ORDER_RGB);
|
uint16_t new_color = display::ColorUtil::color_to_565(color, display::ColorOrder::COLOR_ORDER_RGB);
|
||||||
if (this->buffer_[pos] != (uint8_t) (new_color >> 8)) {
|
if (this->buffer_[pos] != static_cast<uint8_t>(new_color >> 8)) {
|
||||||
this->buffer_[pos] = (uint8_t) (new_color >> 8);
|
this->buffer_[pos] = static_cast<uint8_t>(new_color >> 8);
|
||||||
updated = true;
|
updated = true;
|
||||||
}
|
}
|
||||||
pos = pos + 1;
|
pos = pos + 1;
|
||||||
|
@ -90,7 +97,7 @@ void QspiAmoLed::draw_absolute_pixel_internal(int x, int y, Color color) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void QspiAmoLed::reset_params_(bool ready) {
|
void QspiDbi::reset_params_(bool ready) {
|
||||||
if (!ready && !this->is_ready())
|
if (!ready && !this->is_ready())
|
||||||
return;
|
return;
|
||||||
this->write_command_(this->invert_colors_ ? INVERT_ON : INVERT_OFF);
|
this->write_command_(this->invert_colors_ ? INVERT_ON : INVERT_OFF);
|
||||||
|
@ -102,55 +109,64 @@ void QspiAmoLed::reset_params_(bool ready) {
|
||||||
mad |= MADCTL_MX;
|
mad |= MADCTL_MX;
|
||||||
if (this->mirror_y_)
|
if (this->mirror_y_)
|
||||||
mad |= MADCTL_MY;
|
mad |= MADCTL_MY;
|
||||||
this->write_command_(MADCTL_CMD, &mad, 1);
|
this->write_command_(MADCTL_CMD, mad);
|
||||||
this->write_command_(BRIGHTNESS, &this->brightness_, 1);
|
this->write_command_(BRIGHTNESS, this->brightness_);
|
||||||
|
this->write_command_(NORON);
|
||||||
|
this->write_command_(DISPLAY_ON);
|
||||||
}
|
}
|
||||||
|
|
||||||
void QspiAmoLed::write_init_sequence_() {
|
void QspiDbi::write_init_sequence_() {
|
||||||
if (this->model_ == RM690B0) {
|
for (const auto &seq : this->init_sequences_) {
|
||||||
this->write_command_(PAGESEL, 0x20);
|
this->write_sequence_(seq);
|
||||||
this->write_command_(MIPI, 0x0A);
|
|
||||||
this->write_command_(WRAM, 0x80);
|
|
||||||
this->write_command_(SWIRE1, 0x51);
|
|
||||||
this->write_command_(SWIRE2, 0x2E);
|
|
||||||
this->write_command_(PAGESEL, 0x00);
|
|
||||||
this->write_command_(0xC2, 0x00);
|
|
||||||
delay(10);
|
|
||||||
this->write_command_(TEON, 0x00);
|
|
||||||
}
|
}
|
||||||
this->write_command_(PIXFMT, 0x55);
|
|
||||||
this->write_command_(BRIGHTNESS, 0);
|
|
||||||
this->write_command_(DISPLAY_ON);
|
|
||||||
this->reset_params_(true);
|
this->reset_params_(true);
|
||||||
this->setup_complete_ = true;
|
this->setup_complete_ = true;
|
||||||
esph_log_config(TAG, "QSPI_AMOLED setup complete");
|
ESP_LOGCONFIG(TAG, "QSPI_DBI setup complete");
|
||||||
}
|
}
|
||||||
|
|
||||||
void QspiAmoLed::set_addr_window_(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
|
void QspiDbi::set_addr_window_(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) {
|
||||||
|
ESP_LOGVV(TAG, "Set addr %d/%d, %d/%d", x1, y1, x2, y2);
|
||||||
uint8_t buf[4];
|
uint8_t buf[4];
|
||||||
x1 += this->offset_x_;
|
x1 += this->offset_x_;
|
||||||
x2 += this->offset_x_;
|
x2 += this->offset_x_;
|
||||||
y1 += this->offset_y_;
|
y1 += this->offset_y_;
|
||||||
y2 += this->offset_y_;
|
y2 += this->offset_y_;
|
||||||
put16_be(buf, x1);
|
|
||||||
put16_be(buf + 2, x2);
|
|
||||||
this->write_command_(CASET, buf, sizeof buf);
|
|
||||||
put16_be(buf, y1);
|
put16_be(buf, y1);
|
||||||
put16_be(buf + 2, y2);
|
put16_be(buf + 2, y2);
|
||||||
this->write_command_(RASET, buf, sizeof buf);
|
this->write_command_(RASET, buf, sizeof buf);
|
||||||
|
put16_be(buf, x1);
|
||||||
|
put16_be(buf + 2, x2);
|
||||||
|
this->write_command_(CASET, buf, sizeof buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
void QspiAmoLed::draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, display::ColorOrder order,
|
void QspiDbi::draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, display::ColorOrder order,
|
||||||
display::ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) {
|
display::ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) {
|
||||||
if (!this->setup_complete_ || this->is_failed())
|
if (!this->setup_complete_ || this->is_failed())
|
||||||
return;
|
return;
|
||||||
if (w <= 0 || h <= 0)
|
if (w <= 0 || h <= 0)
|
||||||
return;
|
return;
|
||||||
if (bitness != display::COLOR_BITNESS_565 || order != this->color_mode_ ||
|
if (bitness != display::COLOR_BITNESS_565 || order != this->color_mode_ ||
|
||||||
big_endian != (this->bit_order_ == spi::BIT_ORDER_MSB_FIRST)) {
|
big_endian != (this->bit_order_ == spi::BIT_ORDER_MSB_FIRST)) {
|
||||||
return display::Display::draw_pixels_at(x_start, y_start, w, h, ptr, order, bitness, big_endian, x_offset, y_offset,
|
return Display::draw_pixels_at(x_start, y_start, w, h, ptr, order, bitness, big_endian, x_offset, y_offset, x_pad);
|
||||||
x_pad);
|
} else if (this->draw_from_origin_) {
|
||||||
|
auto stride = x_offset + w + x_pad;
|
||||||
|
for (int y = 0; y != h; y++) {
|
||||||
|
memcpy(this->buffer_ + ((y + y_start) * this->width_ + x_start) * 2,
|
||||||
|
ptr + ((y + y_offset) * stride + x_offset) * 2, w * 2);
|
||||||
|
}
|
||||||
|
ptr = this->buffer_;
|
||||||
|
w = this->width_;
|
||||||
|
h += y_start;
|
||||||
|
x_start = 0;
|
||||||
|
y_start = 0;
|
||||||
|
x_offset = 0;
|
||||||
|
y_offset = 0;
|
||||||
}
|
}
|
||||||
|
this->write_to_display_(x_start, y_start, w, h, ptr, x_offset, y_offset, x_pad);
|
||||||
|
}
|
||||||
|
|
||||||
|
void QspiDbi::write_to_display_(int x_start, int y_start, int w, int h, const uint8_t *ptr, int x_offset, int y_offset,
|
||||||
|
int x_pad) {
|
||||||
this->set_addr_window_(x_start, y_start, x_start + w - 1, y_start + h - 1);
|
this->set_addr_window_(x_start, y_start, x_start + w - 1, y_start + h - 1);
|
||||||
this->enable();
|
this->enable();
|
||||||
// x_ and y_offset are offsets into the source buffer, unrelated to our own offsets into the display.
|
// x_ and y_offset are offsets into the source buffer, unrelated to our own offsets into the display.
|
||||||
|
@ -158,17 +174,50 @@ void QspiAmoLed::draw_pixels_at(int x_start, int y_start, int w, int h, const ui
|
||||||
// we could deal here with a non-zero y_offset, but if x_offset is zero, y_offset probably will be so don't bother
|
// we could deal here with a non-zero y_offset, but if x_offset is zero, y_offset probably will be so don't bother
|
||||||
this->write_cmd_addr_data(8, 0x32, 24, 0x2C00, ptr, w * h * 2, 4);
|
this->write_cmd_addr_data(8, 0x32, 24, 0x2C00, ptr, w * h * 2, 4);
|
||||||
} else {
|
} else {
|
||||||
this->write_cmd_addr_data(8, 0x32, 24, 0x2C00, nullptr, 0, 4);
|
|
||||||
auto stride = x_offset + w + x_pad;
|
auto stride = x_offset + w + x_pad;
|
||||||
|
uint16_t cmd = 0x2C00;
|
||||||
for (int y = 0; y != h; y++) {
|
for (int y = 0; y != h; y++) {
|
||||||
this->write_cmd_addr_data(0, 0, 0, 0, ptr + ((y + y_offset) * stride + x_offset) * 2, w * 2, 4);
|
this->write_cmd_addr_data(8, 0x32, 24, cmd, ptr + ((y + y_offset) * stride + x_offset) * 2, w * 2, 4);
|
||||||
|
cmd = 0x3C00;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this->disable();
|
this->disable();
|
||||||
}
|
}
|
||||||
|
void QspiDbi::write_command_(uint8_t cmd, const uint8_t *bytes, size_t len) {
|
||||||
|
ESP_LOGV(TAG, "Command %02X, length %d, bytes %s", cmd, len, format_hex_pretty(bytes, len).c_str());
|
||||||
|
this->enable();
|
||||||
|
this->write_cmd_addr_data(8, 0x02, 24, cmd << 8, bytes, len);
|
||||||
|
this->disable();
|
||||||
|
}
|
||||||
|
|
||||||
void QspiAmoLed::dump_config() {
|
void QspiDbi::write_sequence_(const std::vector<uint8_t> &vec) {
|
||||||
ESP_LOGCONFIG("", "QSPI AMOLED");
|
size_t index = 0;
|
||||||
|
while (index != vec.size()) {
|
||||||
|
if (vec.size() - index < 2) {
|
||||||
|
ESP_LOGE(TAG, "Malformed init sequence");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
uint8_t cmd = vec[index++];
|
||||||
|
uint8_t x = vec[index++];
|
||||||
|
if (x == DELAY_FLAG) {
|
||||||
|
ESP_LOGV(TAG, "Delay %dms", cmd);
|
||||||
|
delay(cmd);
|
||||||
|
} else {
|
||||||
|
uint8_t num_args = x & 0x7F;
|
||||||
|
if (vec.size() - index < num_args) {
|
||||||
|
ESP_LOGE(TAG, "Malformed init sequence");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const auto *ptr = vec.data() + index;
|
||||||
|
this->write_command_(cmd, ptr, num_args);
|
||||||
|
index += num_args;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void QspiDbi::dump_config() {
|
||||||
|
ESP_LOGCONFIG("", "QSPI_DBI Display");
|
||||||
|
ESP_LOGCONFIG("", "Model: %s", this->model_);
|
||||||
ESP_LOGCONFIG(TAG, " Height: %u", this->height_);
|
ESP_LOGCONFIG(TAG, " Height: %u", this->height_);
|
||||||
ESP_LOGCONFIG(TAG, " Width: %u", this->width_);
|
ESP_LOGCONFIG(TAG, " Width: %u", this->width_);
|
||||||
LOG_PIN(" CS Pin: ", this->cs_);
|
LOG_PIN(" CS Pin: ", this->cs_);
|
||||||
|
@ -176,6 +225,6 @@ void QspiAmoLed::dump_config() {
|
||||||
ESP_LOGCONFIG(TAG, " SPI Data rate: %dMHz", (unsigned) (this->data_rate_ / 1000000));
|
ESP_LOGCONFIG(TAG, " SPI Data rate: %dMHz", (unsigned) (this->data_rate_ / 1000000));
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace qspi_amoled
|
} // namespace qspi_dbi
|
||||||
} // namespace esphome
|
} // namespace esphome
|
||||||
#endif
|
#endif
|
|
@ -14,11 +14,12 @@
|
||||||
#include "esp_lcd_panel_rgb.h"
|
#include "esp_lcd_panel_rgb.h"
|
||||||
|
|
||||||
namespace esphome {
|
namespace esphome {
|
||||||
namespace qspi_amoled {
|
namespace qspi_dbi {
|
||||||
|
|
||||||
constexpr static const char *const TAG = "display.qspi_amoled";
|
constexpr static const char *const TAG = "display.qspi_dbi";
|
||||||
static const uint8_t SW_RESET_CMD = 0x01;
|
static const uint8_t SW_RESET_CMD = 0x01;
|
||||||
static const uint8_t SLEEP_OUT = 0x11;
|
static const uint8_t SLEEP_OUT = 0x11;
|
||||||
|
static const uint8_t NORON = 0x13;
|
||||||
static const uint8_t INVERT_OFF = 0x20;
|
static const uint8_t INVERT_OFF = 0x20;
|
||||||
static const uint8_t INVERT_ON = 0x21;
|
static const uint8_t INVERT_ON = 0x21;
|
||||||
static const uint8_t ALL_ON = 0x23;
|
static const uint8_t ALL_ON = 0x23;
|
||||||
|
@ -42,6 +43,7 @@ static const uint8_t MADCTL_MV = 0x20; ///< Bit 5 Reverse Mode
|
||||||
static const uint8_t MADCTL_RGB = 0x00; ///< Bit 3 Red-Green-Blue pixel order
|
static const uint8_t MADCTL_RGB = 0x00; ///< Bit 3 Red-Green-Blue pixel order
|
||||||
static const uint8_t MADCTL_BGR = 0x08; ///< Bit 3 Blue-Green-Red pixel order
|
static const uint8_t MADCTL_BGR = 0x08; ///< Bit 3 Blue-Green-Red pixel order
|
||||||
|
|
||||||
|
static const uint8_t DELAY_FLAG = 0xFF;
|
||||||
// store a 16 bit value in a buffer, big endian.
|
// store a 16 bit value in a buffer, big endian.
|
||||||
static inline void put16_be(uint8_t *buf, uint16_t value) {
|
static inline void put16_be(uint8_t *buf, uint16_t value) {
|
||||||
buf[0] = value >> 8;
|
buf[0] = value >> 8;
|
||||||
|
@ -49,15 +51,16 @@ static inline void put16_be(uint8_t *buf, uint16_t value) {
|
||||||
}
|
}
|
||||||
|
|
||||||
enum Model {
|
enum Model {
|
||||||
|
CUSTOM,
|
||||||
RM690B0,
|
RM690B0,
|
||||||
RM67162,
|
RM67162,
|
||||||
};
|
};
|
||||||
|
|
||||||
class QspiAmoLed : public display::DisplayBuffer,
|
class QspiDbi : public display::DisplayBuffer,
|
||||||
public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW, spi::CLOCK_PHASE_LEADING,
|
public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW, spi::CLOCK_PHASE_LEADING,
|
||||||
spi::DATA_RATE_1MHZ> {
|
spi::DATA_RATE_1MHZ> {
|
||||||
public:
|
public:
|
||||||
void set_model(Model model) { this->model_ = model; }
|
void set_model(const char *model) { this->model_ = model; }
|
||||||
void update() override;
|
void update() override;
|
||||||
void setup() override;
|
void setup() override;
|
||||||
display::ColorOrder get_color_mode() { return this->color_mode_; }
|
display::ColorOrder get_color_mode() { return this->color_mode_; }
|
||||||
|
@ -93,17 +96,27 @@ class QspiAmoLed : public display::DisplayBuffer,
|
||||||
this->offset_x_ = offset_x;
|
this->offset_x_ = offset_x;
|
||||||
this->offset_y_ = offset_y;
|
this->offset_y_ = offset_y;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void set_draw_from_origin(bool draw_from_origin) { this->draw_from_origin_ = draw_from_origin; }
|
||||||
display::DisplayType get_display_type() override { return display::DisplayType::DISPLAY_TYPE_COLOR; }
|
display::DisplayType get_display_type() override { return display::DisplayType::DISPLAY_TYPE_COLOR; }
|
||||||
void dump_config() override;
|
void dump_config() override;
|
||||||
|
|
||||||
int get_width_internal() override { return this->width_; }
|
int get_width_internal() override { return this->width_; }
|
||||||
int get_height_internal() override { return this->height_; }
|
int get_height_internal() override { return this->height_; }
|
||||||
bool can_proceed() override { return this->setup_complete_; }
|
bool can_proceed() override { return this->setup_complete_; }
|
||||||
|
void add_init_sequence(const std::vector<uint8_t> &sequence) { this->init_sequences_.push_back(sequence); }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
void check_buffer_() {
|
||||||
|
if (this->buffer_ == nullptr)
|
||||||
|
this->init_internal_(this->width_ * this->height_ * 2);
|
||||||
|
}
|
||||||
|
void write_sequence_(const std::vector<uint8_t> &vec);
|
||||||
void draw_absolute_pixel_internal(int x, int y, Color color) override;
|
void draw_absolute_pixel_internal(int x, int y, Color color) override;
|
||||||
void draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, display::ColorOrder order,
|
void draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, display::ColorOrder order,
|
||||||
display::ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) override;
|
display::ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) override;
|
||||||
|
void write_to_display_(int x_start, int y_start, int w, int h, const uint8_t *ptr, int x_offset, int y_offset,
|
||||||
|
int x_pad);
|
||||||
/**
|
/**
|
||||||
* the RM67162 in quad SPI mode seems to work like this (not in the datasheet, this is deduced from the
|
* the RM67162 in quad SPI mode seems to work like this (not in the datasheet, this is deduced from the
|
||||||
* sample code.)
|
* sample code.)
|
||||||
|
@ -122,11 +135,7 @@ class QspiAmoLed : public display::DisplayBuffer,
|
||||||
* @param bytes
|
* @param bytes
|
||||||
* @param len
|
* @param len
|
||||||
*/
|
*/
|
||||||
void write_command_(uint8_t cmd, const uint8_t *bytes, size_t len) {
|
void write_command_(uint8_t cmd, const uint8_t *bytes, size_t len);
|
||||||
this->enable();
|
|
||||||
this->write_cmd_addr_data(8, 0x02, 24, cmd << 8, bytes, len);
|
|
||||||
this->disable();
|
|
||||||
}
|
|
||||||
|
|
||||||
void write_command_(uint8_t cmd, uint8_t data) { this->write_command_(cmd, &data, 1); }
|
void write_command_(uint8_t cmd, uint8_t data) { this->write_command_(cmd, &data, 1); }
|
||||||
void write_command_(uint8_t cmd) { this->write_command_(cmd, &cmd, 0); }
|
void write_command_(uint8_t cmd) { this->write_command_(cmd, &cmd, 0); }
|
||||||
|
@ -136,8 +145,8 @@ class QspiAmoLed : public display::DisplayBuffer,
|
||||||
|
|
||||||
GPIOPin *reset_pin_{nullptr};
|
GPIOPin *reset_pin_{nullptr};
|
||||||
GPIOPin *enable_pin_{nullptr};
|
GPIOPin *enable_pin_{nullptr};
|
||||||
uint16_t x_low_{0};
|
uint16_t x_low_{1};
|
||||||
uint16_t y_low_{0};
|
uint16_t y_low_{1};
|
||||||
uint16_t x_high_{0};
|
uint16_t x_high_{0};
|
||||||
uint16_t y_high_{0};
|
uint16_t y_high_{0};
|
||||||
bool setup_complete_{};
|
bool setup_complete_{};
|
||||||
|
@ -151,12 +160,14 @@ class QspiAmoLed : public display::DisplayBuffer,
|
||||||
bool swap_xy_{};
|
bool swap_xy_{};
|
||||||
bool mirror_x_{};
|
bool mirror_x_{};
|
||||||
bool mirror_y_{};
|
bool mirror_y_{};
|
||||||
|
bool draw_from_origin_{false};
|
||||||
uint8_t brightness_{0xD0};
|
uint8_t brightness_{0xD0};
|
||||||
Model model_{RM690B0};
|
const char *model_{"Unknown"};
|
||||||
|
std::vector<std::vector<uint8_t>> init_sequences_{};
|
||||||
|
|
||||||
esp_lcd_panel_handle_t handle_{};
|
esp_lcd_panel_handle_t handle_{};
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace qspi_amoled
|
} // namespace qspi_dbi
|
||||||
} // namespace esphome
|
} // namespace esphome
|
||||||
#endif
|
#endif
|
|
@ -1,5 +1,7 @@
|
||||||
#include "radon_eye_listener.h"
|
#include "radon_eye_listener.h"
|
||||||
#include "esphome/core/log.h"
|
#include "esphome/core/log.h"
|
||||||
|
#include <algorithm>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
#ifdef USE_ESP32
|
#ifdef USE_ESP32
|
||||||
|
|
||||||
|
@ -10,9 +12,14 @@ static const char *const TAG = "radon_eye_ble";
|
||||||
|
|
||||||
bool RadonEyeListener::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
|
bool RadonEyeListener::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
|
||||||
if (not device.get_name().empty()) {
|
if (not device.get_name().empty()) {
|
||||||
if (device.get_name().rfind("FR:R", 0) == 0) {
|
// Vector containing the prefixes to search for
|
||||||
// This is an RD200, I think
|
std::vector<std::string> prefixes = {"FR:R", "FR:I", "FR:H"};
|
||||||
ESP_LOGD(TAG, "Found Radon Eye RD200 device Name: %s (MAC: %s)", device.get_name().c_str(),
|
|
||||||
|
// Check if the device name starts with any of the prefixes
|
||||||
|
if (std::any_of(prefixes.begin(), prefixes.end(),
|
||||||
|
[&](const std::string &prefix) { return device.get_name().rfind(prefix, 0) == 0; })) {
|
||||||
|
// Device found
|
||||||
|
ESP_LOGD(TAG, "Found Radon Eye device Name: %s (MAC: %s)", device.get_name().c_str(),
|
||||||
device.address_str().c_str());
|
device.address_str().c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,46 +64,46 @@ uint16_t shelly_dimmer_checksum(const uint8_t *buf, int len) {
|
||||||
return std::accumulate<decltype(buf), uint16_t>(buf, buf + len, 0);
|
return std::accumulate<decltype(buf), uint16_t>(buf, buf + len, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ShellyDimmer::is_running_configured_version() const {
|
||||||
|
return this->version_major_ == USE_SHD_FIRMWARE_MAJOR_VERSION &&
|
||||||
|
this->version_minor_ == USE_SHD_FIRMWARE_MINOR_VERSION;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShellyDimmer::handle_firmware() {
|
||||||
|
// Reset the STM32 and check the firmware version.
|
||||||
|
this->reset_normal_boot_();
|
||||||
|
this->send_command_(SHELLY_DIMMER_PROTO_CMD_VERSION, nullptr, 0);
|
||||||
|
ESP_LOGI(TAG, "STM32 current firmware version: %d.%d, desired version: %d.%d", this->version_major_,
|
||||||
|
this->version_minor_, USE_SHD_FIRMWARE_MAJOR_VERSION, USE_SHD_FIRMWARE_MINOR_VERSION);
|
||||||
|
|
||||||
|
if (!is_running_configured_version()) {
|
||||||
|
#ifdef USE_SHD_FIRMWARE_DATA
|
||||||
|
if (!this->upgrade_firmware_()) {
|
||||||
|
ESP_LOGW(TAG, "Failed to upgrade firmware");
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this->reset_normal_boot_();
|
||||||
|
this->send_command_(SHELLY_DIMMER_PROTO_CMD_VERSION, nullptr, 0);
|
||||||
|
if (!is_running_configured_version()) {
|
||||||
|
ESP_LOGE(TAG, "STM32 firmware upgrade already performed, but version is still incorrect");
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
ESP_LOGW(TAG, "Firmware version mismatch, put 'update: true' in the yaml to flash an update.");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void ShellyDimmer::setup() {
|
void ShellyDimmer::setup() {
|
||||||
this->pin_nrst_->setup();
|
this->pin_nrst_->setup();
|
||||||
this->pin_boot0_->setup();
|
this->pin_boot0_->setup();
|
||||||
|
|
||||||
ESP_LOGI(TAG, "Initializing Shelly Dimmer...");
|
ESP_LOGI(TAG, "Initializing Shelly Dimmer...");
|
||||||
|
|
||||||
// Reset the STM32 and check the firmware version.
|
this->handle_firmware();
|
||||||
for (int i = 0; i < 2; i++) {
|
|
||||||
this->reset_normal_boot_();
|
|
||||||
this->send_command_(SHELLY_DIMMER_PROTO_CMD_VERSION, nullptr, 0);
|
|
||||||
ESP_LOGI(TAG, "STM32 current firmware version: %d.%d, desired version: %d.%d", this->version_major_,
|
|
||||||
this->version_minor_, USE_SHD_FIRMWARE_MAJOR_VERSION, USE_SHD_FIRMWARE_MINOR_VERSION);
|
|
||||||
if (this->version_major_ != USE_SHD_FIRMWARE_MAJOR_VERSION ||
|
|
||||||
this->version_minor_ != USE_SHD_FIRMWARE_MINOR_VERSION) {
|
|
||||||
#ifdef USE_SHD_FIRMWARE_DATA
|
|
||||||
// Update firmware if needed.
|
|
||||||
ESP_LOGW(TAG, "Unsupported STM32 firmware version, flashing");
|
|
||||||
if (i > 0) {
|
|
||||||
// Upgrade was already performed but the reported version is still not right.
|
|
||||||
ESP_LOGE(TAG, "STM32 firmware upgrade already performed, but version is still incorrect");
|
|
||||||
this->mark_failed();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this->upgrade_firmware_()) {
|
|
||||||
ESP_LOGW(TAG, "Failed to upgrade firmware");
|
|
||||||
this->mark_failed();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Firmware upgrade completed, do the checks again.
|
|
||||||
continue;
|
|
||||||
#else
|
|
||||||
ESP_LOGW(TAG, "Firmware version mismatch, put 'update: true' in the yaml to flash an update.");
|
|
||||||
this->mark_failed();
|
|
||||||
return;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
this->send_settings_();
|
this->send_settings_();
|
||||||
// Do an immediate poll to refresh current state.
|
// Do an immediate poll to refresh current state.
|
||||||
|
|
|
@ -20,6 +20,8 @@ class ShellyDimmer : public PollingComponent, public light::LightOutput, public
|
||||||
public:
|
public:
|
||||||
float get_setup_priority() const override { return setup_priority::LATE; }
|
float get_setup_priority() const override { return setup_priority::LATE; }
|
||||||
|
|
||||||
|
bool is_running_configured_version() const;
|
||||||
|
void handle_firmware();
|
||||||
void setup() override;
|
void setup() override;
|
||||||
void update() override;
|
void update() override;
|
||||||
void dump_config() override;
|
void dump_config() override;
|
||||||
|
|
|
@ -18,6 +18,7 @@ from esphome.const import (
|
||||||
CONF_HSYNC_PIN,
|
CONF_HSYNC_PIN,
|
||||||
CONF_ID,
|
CONF_ID,
|
||||||
CONF_IGNORE_STRAPPING_WARNING,
|
CONF_IGNORE_STRAPPING_WARNING,
|
||||||
|
CONF_INIT_SEQUENCE,
|
||||||
CONF_INVERT_COLORS,
|
CONF_INVERT_COLORS,
|
||||||
CONF_LAMBDA,
|
CONF_LAMBDA,
|
||||||
CONF_MIRROR_X,
|
CONF_MIRROR_X,
|
||||||
|
@ -35,7 +36,6 @@ from esphome.core import TimePeriod
|
||||||
|
|
||||||
from .init_sequences import ST7701S_INITS, cmd
|
from .init_sequences import ST7701S_INITS, cmd
|
||||||
|
|
||||||
CONF_INIT_SEQUENCE = "init_sequence"
|
|
||||||
CONF_DE_PIN = "de_pin"
|
CONF_DE_PIN = "de_pin"
|
||||||
CONF_PCLK_PIN = "pclk_pin"
|
CONF_PCLK_PIN = "pclk_pin"
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
#include "statsd.h"
|
#include "statsd.h"
|
||||||
|
|
||||||
|
#ifdef USE_NETWORK
|
||||||
namespace esphome {
|
namespace esphome {
|
||||||
namespace statsd {
|
namespace statsd {
|
||||||
|
|
||||||
|
@ -154,3 +155,4 @@ void StatsdComponent::send_(std::string *out) {
|
||||||
|
|
||||||
} // namespace statsd
|
} // namespace statsd
|
||||||
} // namespace esphome
|
} // namespace esphome
|
||||||
|
#endif
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "esphome/core/defines.h"
|
#include "esphome/core/defines.h"
|
||||||
|
#ifdef USE_NETWORK
|
||||||
#include "esphome/core/component.h"
|
#include "esphome/core/component.h"
|
||||||
#include "esphome/components/socket/socket.h"
|
#include "esphome/components/socket/socket.h"
|
||||||
#include "esphome/components/network/ip_address.h"
|
#include "esphome/components/network/ip_address.h"
|
||||||
|
@ -84,3 +85,4 @@ class StatsdComponent : public PollingComponent {
|
||||||
|
|
||||||
} // namespace statsd
|
} // namespace statsd
|
||||||
} // namespace esphome
|
} // namespace esphome
|
||||||
|
#endif
|
||||||
|
|
1
esphome/components/tc74/__init__.py
Normal file
1
esphome/components/tc74/__init__.py
Normal file
|
@ -0,0 +1 @@
|
||||||
|
CODEOWNERS = ["@sethgirvan"]
|
32
esphome/components/tc74/sensor.py
Normal file
32
esphome/components/tc74/sensor.py
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
import esphome.codegen as cg
|
||||||
|
from esphome.components import i2c, sensor
|
||||||
|
import esphome.config_validation as cv
|
||||||
|
from esphome.const import (
|
||||||
|
DEVICE_CLASS_TEMPERATURE,
|
||||||
|
STATE_CLASS_MEASUREMENT,
|
||||||
|
UNIT_CELSIUS,
|
||||||
|
)
|
||||||
|
|
||||||
|
CODEOWNERS = ["@sethgirvan"]
|
||||||
|
DEPENDENCIES = ["i2c"]
|
||||||
|
|
||||||
|
tc74_ns = cg.esphome_ns.namespace("tc74")
|
||||||
|
TC74Component = tc74_ns.class_("TC74Component", cg.PollingComponent, i2c.I2CDevice)
|
||||||
|
|
||||||
|
CONFIG_SCHEMA = (
|
||||||
|
sensor.sensor_schema(
|
||||||
|
TC74Component,
|
||||||
|
unit_of_measurement=UNIT_CELSIUS,
|
||||||
|
accuracy_decimals=1,
|
||||||
|
device_class=DEVICE_CLASS_TEMPERATURE,
|
||||||
|
state_class=STATE_CLASS_MEASUREMENT,
|
||||||
|
)
|
||||||
|
.extend(cv.polling_component_schema("60s"))
|
||||||
|
.extend(i2c.i2c_device_schema(0x48))
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def to_code(config):
|
||||||
|
var = await sensor.new_sensor(config)
|
||||||
|
await cg.register_component(var, config)
|
||||||
|
await i2c.register_i2c_device(var, config)
|
68
esphome/components/tc74/tc74.cpp
Normal file
68
esphome/components/tc74/tc74.cpp
Normal file
|
@ -0,0 +1,68 @@
|
||||||
|
// Based on the TC74 datasheet https://ww1.microchip.com/downloads/en/DeviceDoc/21462D.pdf
|
||||||
|
|
||||||
|
#include "tc74.h"
|
||||||
|
#include "esphome/core/log.h"
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace tc74 {
|
||||||
|
|
||||||
|
static const char *const TAG = "tc74";
|
||||||
|
|
||||||
|
static const uint8_t TC74_REGISTER_TEMPERATURE = 0x00;
|
||||||
|
static const uint8_t TC74_REGISTER_CONFIGURATION = 0x01;
|
||||||
|
static const uint8_t TC74_DATA_READY_MASK = 0x40;
|
||||||
|
|
||||||
|
// It is possible the "Data Ready" bit will not be set if the TC74 has not been powered on for at least 250ms, so it not
|
||||||
|
// being set does not constitute a failure.
|
||||||
|
void TC74Component::setup() {
|
||||||
|
ESP_LOGCONFIG(TAG, "Setting up TC74...");
|
||||||
|
uint8_t config_reg;
|
||||||
|
if (this->read_register(TC74_REGISTER_CONFIGURATION, &config_reg, 1) != i2c::ERROR_OK) {
|
||||||
|
this->mark_failed();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this->data_ready_ = config_reg & TC74_DATA_READY_MASK;
|
||||||
|
}
|
||||||
|
|
||||||
|
void TC74Component::update() { this->read_temperature_(); }
|
||||||
|
|
||||||
|
void TC74Component::dump_config() {
|
||||||
|
LOG_SENSOR("", "TC74", this);
|
||||||
|
LOG_I2C_DEVICE(this);
|
||||||
|
if (this->is_failed()) {
|
||||||
|
ESP_LOGE(TAG, "Connection with TC74 failed!");
|
||||||
|
}
|
||||||
|
LOG_UPDATE_INTERVAL(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TC74Component::read_temperature_() {
|
||||||
|
if (!this->data_ready_) {
|
||||||
|
uint8_t config_reg;
|
||||||
|
if (this->read_register(TC74_REGISTER_CONFIGURATION, &config_reg, 1) != i2c::ERROR_OK) {
|
||||||
|
this->status_set_warning();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config_reg & TC74_DATA_READY_MASK) {
|
||||||
|
this->data_ready_ = true;
|
||||||
|
} else {
|
||||||
|
ESP_LOGD(TAG, "TC74 not ready");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t temperature_reg;
|
||||||
|
if (this->read_register(TC74_REGISTER_TEMPERATURE, &temperature_reg, 1) != i2c::ERROR_OK) {
|
||||||
|
this->status_set_warning();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ESP_LOGD(TAG, "Got Temperature=%d °C", temperature_reg);
|
||||||
|
this->publish_state(temperature_reg);
|
||||||
|
this->status_clear_warning();
|
||||||
|
}
|
||||||
|
|
||||||
|
float TC74Component::get_setup_priority() const { return setup_priority::DATA; }
|
||||||
|
|
||||||
|
} // namespace tc74
|
||||||
|
} // namespace esphome
|
28
esphome/components/tc74/tc74.h
Normal file
28
esphome/components/tc74/tc74.h
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "esphome/core/component.h"
|
||||||
|
#include "esphome/components/sensor/sensor.h"
|
||||||
|
#include "esphome/components/i2c/i2c.h"
|
||||||
|
|
||||||
|
namespace esphome {
|
||||||
|
namespace tc74 {
|
||||||
|
|
||||||
|
class TC74Component : public PollingComponent, public i2c::I2CDevice, public sensor::Sensor {
|
||||||
|
public:
|
||||||
|
/// Setup the sensor and check connection.
|
||||||
|
void setup() override;
|
||||||
|
void dump_config() override;
|
||||||
|
/// Update the sensor value (temperature).
|
||||||
|
void update() override;
|
||||||
|
|
||||||
|
float get_setup_priority() const override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
/// Internal method to read the temperature from the component after it has been scheduled.
|
||||||
|
void read_temperature_();
|
||||||
|
|
||||||
|
bool data_ready_ = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace tc74
|
||||||
|
} // namespace esphome
|
|
@ -1,8 +1,10 @@
|
||||||
import esphome.codegen as cg
|
|
||||||
import esphome.config_validation as cv
|
|
||||||
from esphome import automation
|
from esphome import automation
|
||||||
|
import esphome.codegen as cg
|
||||||
from esphome.components import binary_sensor
|
from esphome.components import binary_sensor
|
||||||
from esphome.const import CONF_ID, CONF_LAMBDA, CONF_STATE
|
import esphome.config_validation as cv
|
||||||
|
from esphome.const import CONF_CONDITION, CONF_ID, CONF_LAMBDA, CONF_STATE
|
||||||
|
from esphome.cpp_generator import LambdaExpression
|
||||||
|
|
||||||
from .. import template_ns
|
from .. import template_ns
|
||||||
|
|
||||||
TemplateBinarySensor = template_ns.class_(
|
TemplateBinarySensor = template_ns.class_(
|
||||||
|
@ -13,7 +15,10 @@ CONFIG_SCHEMA = (
|
||||||
binary_sensor.binary_sensor_schema(TemplateBinarySensor)
|
binary_sensor.binary_sensor_schema(TemplateBinarySensor)
|
||||||
.extend(
|
.extend(
|
||||||
{
|
{
|
||||||
cv.Optional(CONF_LAMBDA): cv.returning_lambda,
|
cv.Exclusive(CONF_LAMBDA, CONF_CONDITION): cv.returning_lambda,
|
||||||
|
cv.Exclusive(
|
||||||
|
CONF_CONDITION, CONF_CONDITION
|
||||||
|
): automation.validate_potentially_and_condition,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
.extend(cv.COMPONENT_SCHEMA)
|
.extend(cv.COMPONENT_SCHEMA)
|
||||||
|
@ -24,9 +29,17 @@ async def to_code(config):
|
||||||
var = await binary_sensor.new_binary_sensor(config)
|
var = await binary_sensor.new_binary_sensor(config)
|
||||||
await cg.register_component(var, config)
|
await cg.register_component(var, config)
|
||||||
|
|
||||||
if CONF_LAMBDA in config:
|
if lamb := config.get(CONF_LAMBDA):
|
||||||
template_ = await cg.process_lambda(
|
template_ = await cg.process_lambda(
|
||||||
config[CONF_LAMBDA], [], return_type=cg.optional.template(bool)
|
lamb, [], return_type=cg.optional.template(bool)
|
||||||
|
)
|
||||||
|
cg.add(var.set_template(template_))
|
||||||
|
if condition := config.get(CONF_CONDITION):
|
||||||
|
condition = await automation.build_condition(
|
||||||
|
condition, cg.TemplateArguments(), []
|
||||||
|
)
|
||||||
|
template_ = LambdaExpression(
|
||||||
|
f"return {condition.check()};", [], return_type=cg.optional.template(bool)
|
||||||
)
|
)
|
||||||
cg.add(var.set_template(template_))
|
cg.add(var.set_template(template_))
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,8 @@ void Touchscreen::attach_interrupt_(InternalGPIOPin *irq_pin, esphome::gpio::Int
|
||||||
|
|
||||||
void Touchscreen::call_setup() {
|
void Touchscreen::call_setup() {
|
||||||
if (this->display_ != nullptr) {
|
if (this->display_ != nullptr) {
|
||||||
this->display_width_ = this->display_->get_native_width();
|
this->display_width_ = this->display_->get_width();
|
||||||
this->display_height_ = this->display_->get_native_height();
|
this->display_height_ = this->display_->get_height();
|
||||||
}
|
}
|
||||||
PollingComponent::call_setup();
|
PollingComponent::call_setup();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1441,9 +1441,26 @@ std::string WebServer::alarm_control_panel_json(alarm_control_panel::AlarmContro
|
||||||
void WebServer::on_event(event::Event *obj, const std::string &event_type) {
|
void WebServer::on_event(event::Event *obj, const std::string &event_type) {
|
||||||
this->events_.send(this->event_json(obj, event_type, DETAIL_STATE).c_str(), "state");
|
this->events_.send(this->event_json(obj, event_type, DETAIL_STATE).c_str(), "state");
|
||||||
}
|
}
|
||||||
|
void WebServer::handle_event_request(AsyncWebServerRequest *request, const UrlMatch &match) {
|
||||||
|
for (event::Event *obj : App.get_events()) {
|
||||||
|
if (obj->get_object_id() != match.id)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (request->method() == HTTP_GET && match.method.empty()) {
|
||||||
|
auto detail = DETAIL_STATE;
|
||||||
|
auto *param = request->getParam("detail");
|
||||||
|
if (param && param->value() == "all") {
|
||||||
|
detail = DETAIL_ALL;
|
||||||
|
}
|
||||||
|
std::string data = this->event_json(obj, "", detail);
|
||||||
|
request->send(200, "application/json", data.c_str());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
request->send(404);
|
||||||
|
}
|
||||||
std::string WebServer::event_json(event::Event *obj, const std::string &event_type, JsonDetail start_config) {
|
std::string WebServer::event_json(event::Event *obj, const std::string &event_type, JsonDetail start_config) {
|
||||||
return json::build_json([obj, event_type, start_config](JsonObject root) {
|
return json::build_json([this, obj, event_type, start_config](JsonObject root) {
|
||||||
set_json_id(root, obj, "event-" + obj->get_object_id(), start_config);
|
set_json_id(root, obj, "event-" + obj->get_object_id(), start_config);
|
||||||
if (!event_type.empty()) {
|
if (!event_type.empty()) {
|
||||||
root["event_type"] = event_type;
|
root["event_type"] = event_type;
|
||||||
|
@ -1454,6 +1471,12 @@ std::string WebServer::event_json(event::Event *obj, const std::string &event_ty
|
||||||
event_types.add(event_type);
|
event_types.add(event_type);
|
||||||
}
|
}
|
||||||
root["device_class"] = obj->get_device_class();
|
root["device_class"] = obj->get_device_class();
|
||||||
|
if (this->sorting_entitys_.find(obj) != this->sorting_entitys_.end()) {
|
||||||
|
root["sorting_weight"] = this->sorting_entitys_[obj].weight;
|
||||||
|
if (this->sorting_groups_.find(this->sorting_entitys_[obj].group_id) != this->sorting_groups_.end()) {
|
||||||
|
root["sorting_group"] = this->sorting_groups_[this->sorting_entitys_[obj].group_id].name;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -1645,6 +1668,11 @@ bool WebServer::canHandle(AsyncWebServerRequest *request) {
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_EVENT
|
||||||
|
if (request->method() == HTTP_GET && match.domain == "event")
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef USE_UPDATE
|
#ifdef USE_UPDATE
|
||||||
if ((request->method() == HTTP_POST || request->method() == HTTP_GET) && match.domain == "update")
|
if ((request->method() == HTTP_POST || request->method() == HTTP_GET) && match.domain == "update")
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -322,6 +322,9 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
|
||||||
#ifdef USE_EVENT
|
#ifdef USE_EVENT
|
||||||
void on_event(event::Event *obj, const std::string &event_type) override;
|
void on_event(event::Event *obj, const std::string &event_type) override;
|
||||||
|
|
||||||
|
/// Handle a event request under '/event<id>'.
|
||||||
|
void handle_event_request(AsyncWebServerRequest *request, const UrlMatch &match);
|
||||||
|
|
||||||
/// Dump the event details with its value as a JSON string.
|
/// Dump the event details with its value as a JSON string.
|
||||||
std::string event_json(event::Event *obj, const std::string &event_type, JsonDetail start_config);
|
std::string event_json(event::Event *obj, const std::string &event_type, JsonDetail start_config);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
"""Constants used by esphome."""
|
"""Constants used by esphome."""
|
||||||
|
|
||||||
__version__ = "2024.10.0-dev"
|
__version__ = "2024.11.0-dev"
|
||||||
|
|
||||||
ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
|
ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
|
||||||
VALID_SUBSTITUTIONS_CHARACTERS = (
|
VALID_SUBSTITUTIONS_CHARACTERS = (
|
||||||
|
@ -49,6 +49,7 @@ CONF_ADDRESS = "address"
|
||||||
CONF_ADDRESSABLE_LIGHT_ID = "addressable_light_id"
|
CONF_ADDRESSABLE_LIGHT_ID = "addressable_light_id"
|
||||||
CONF_ADVANCED = "advanced"
|
CONF_ADVANCED = "advanced"
|
||||||
CONF_AFTER = "after"
|
CONF_AFTER = "after"
|
||||||
|
CONF_ALL = "all"
|
||||||
CONF_ALLOW_OTHER_USES = "allow_other_uses"
|
CONF_ALLOW_OTHER_USES = "allow_other_uses"
|
||||||
CONF_ALPHA = "alpha"
|
CONF_ALPHA = "alpha"
|
||||||
CONF_ALTITUDE = "altitude"
|
CONF_ALTITUDE = "altitude"
|
||||||
|
@ -57,6 +58,7 @@ CONF_AMMONIA = "ammonia"
|
||||||
CONF_ANALOG = "analog"
|
CONF_ANALOG = "analog"
|
||||||
CONF_AND = "and"
|
CONF_AND = "and"
|
||||||
CONF_ANGLE = "angle"
|
CONF_ANGLE = "angle"
|
||||||
|
CONF_ANY = "any"
|
||||||
CONF_AP = "ap"
|
CONF_AP = "ap"
|
||||||
CONF_APPARENT_POWER = "apparent_power"
|
CONF_APPARENT_POWER = "apparent_power"
|
||||||
CONF_ARDUINO_VERSION = "arduino_version"
|
CONF_ARDUINO_VERSION = "arduino_version"
|
||||||
|
@ -396,8 +398,10 @@ CONF_INCLUDES = "includes"
|
||||||
CONF_INDEX = "index"
|
CONF_INDEX = "index"
|
||||||
CONF_INDOOR = "indoor"
|
CONF_INDOOR = "indoor"
|
||||||
CONF_INFRARED = "infrared"
|
CONF_INFRARED = "infrared"
|
||||||
|
CONF_INIT_SEQUENCE = "init_sequence"
|
||||||
CONF_INITIAL_MODE = "initial_mode"
|
CONF_INITIAL_MODE = "initial_mode"
|
||||||
CONF_INITIAL_OPTION = "initial_option"
|
CONF_INITIAL_OPTION = "initial_option"
|
||||||
|
CONF_INITIAL_STATE = "initial_state"
|
||||||
CONF_INITIAL_VALUE = "initial_value"
|
CONF_INITIAL_VALUE = "initial_value"
|
||||||
CONF_INPUT = "input"
|
CONF_INPUT = "input"
|
||||||
CONF_INTEGRATION_TIME = "integration_time"
|
CONF_INTEGRATION_TIME = "integration_time"
|
||||||
|
|
|
@ -651,35 +651,45 @@ void delay_microseconds_safe(uint32_t us);
|
||||||
/// @name Memory management
|
/// @name Memory management
|
||||||
///@{
|
///@{
|
||||||
|
|
||||||
/** An STL allocator that uses SPI RAM.
|
/** An STL allocator that uses SPI or internal RAM.
|
||||||
|
* Returns `nullptr` in case no memory is available.
|
||||||
*
|
*
|
||||||
* By setting flags, it can be configured to don't try main memory if SPI RAM is full or unavailable, and to return
|
* By setting flags, it can be configured to:
|
||||||
* `nulllptr` instead of aborting when no memory is available.
|
* - perform external allocation falling back to main memory if SPI RAM is full or unavailable
|
||||||
|
* - perform external allocation only
|
||||||
|
* - perform internal allocation only
|
||||||
*/
|
*/
|
||||||
template<class T> class ExternalRAMAllocator {
|
template<class T> class RAMAllocator {
|
||||||
public:
|
public:
|
||||||
using value_type = T;
|
using value_type = T;
|
||||||
|
|
||||||
enum Flags {
|
enum Flags {
|
||||||
NONE = 0,
|
NONE = 0, // Perform external allocation and fall back to internal memory
|
||||||
REFUSE_INTERNAL = 1 << 0, ///< Refuse falling back to internal memory when external RAM is full or unavailable.
|
ALLOC_EXTERNAL = 1 << 0, // Perform external allocation only.
|
||||||
ALLOW_FAILURE = 1 << 1, ///< Don't abort when memory allocation fails.
|
ALLOC_INTERNAL = 1 << 1, // Perform internal allocation only.
|
||||||
|
ALLOW_FAILURE = 1 << 2, // Does nothing. Kept for compatibility.
|
||||||
};
|
};
|
||||||
|
|
||||||
ExternalRAMAllocator() = default;
|
RAMAllocator() = default;
|
||||||
ExternalRAMAllocator(Flags flags) : flags_{flags} {}
|
RAMAllocator(uint8_t flags) : flags_{flags} {}
|
||||||
template<class U> constexpr ExternalRAMAllocator(const ExternalRAMAllocator<U> &other) : flags_{other.flags_} {}
|
template<class U> constexpr RAMAllocator(const RAMAllocator<U> &other) : flags_{other.flags_} {}
|
||||||
|
|
||||||
T *allocate(size_t n) {
|
T *allocate(size_t n) {
|
||||||
size_t size = n * sizeof(T);
|
size_t size = n * sizeof(T);
|
||||||
T *ptr = nullptr;
|
T *ptr = nullptr;
|
||||||
#ifdef USE_ESP32
|
#ifdef USE_ESP32
|
||||||
ptr = static_cast<T *>(heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT));
|
// External allocation by default or if explicitely requested
|
||||||
#endif
|
if ((this->flags_ & Flags::ALLOC_EXTERNAL) || ((this->flags_ & Flags::ALLOC_INTERNAL) == 0)) {
|
||||||
if (ptr == nullptr && (this->flags_ & Flags::REFUSE_INTERNAL) == 0)
|
ptr = static_cast<T *>(heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT));
|
||||||
|
}
|
||||||
|
// Fallback to internal allocation if explicitely requested or no flag is specified
|
||||||
|
if (ptr == nullptr && ((this->flags_ & Flags::ALLOC_INTERNAL) || (this->flags_ & Flags::ALLOC_EXTERNAL) == 0)) {
|
||||||
ptr = static_cast<T *>(malloc(size)); // NOLINT(cppcoreguidelines-owning-memory,cppcoreguidelines-no-malloc)
|
ptr = static_cast<T *>(malloc(size)); // NOLINT(cppcoreguidelines-owning-memory,cppcoreguidelines-no-malloc)
|
||||||
if (ptr == nullptr && (this->flags_ & Flags::ALLOW_FAILURE) == 0)
|
}
|
||||||
abort();
|
#else
|
||||||
|
// Ignore ALLOC_EXTERNAL/ALLOC_INTERNAL flags if external allocation is not supported
|
||||||
|
ptr = static_cast<T *>(malloc(size)); // NOLINT(cppcoreguidelines-owning-memory,cppcoreguidelines-no-malloc)
|
||||||
|
#endif
|
||||||
return ptr;
|
return ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -688,9 +698,11 @@ template<class T> class ExternalRAMAllocator {
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Flags flags_{Flags::ALLOW_FAILURE};
|
uint8_t flags_{Flags::ALLOW_FAILURE};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
template<class T> using ExternalRAMAllocator = RAMAllocator<T>;
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
|
|
||||||
/// @name Internal functions
|
/// @name Internal functions
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
async_timeout==4.0.3; python_version <= "3.10"
|
async_timeout==4.0.3; python_version <= "3.10"
|
||||||
cryptography==43.0.0
|
cryptography==43.0.0
|
||||||
voluptuous==0.14.2
|
voluptuous==0.14.2
|
||||||
PyYAML==6.0.1
|
PyYAML==6.0.2
|
||||||
paho-mqtt==1.6.1
|
paho-mqtt==1.6.1
|
||||||
colorama==0.4.6
|
colorama==0.4.6
|
||||||
icmplib==3.0.4
|
icmplib==3.0.4
|
||||||
|
@ -9,7 +9,7 @@ tornado==6.4
|
||||||
tzlocal==5.2 # from time
|
tzlocal==5.2 # from time
|
||||||
tzdata>=2021.1 # from time
|
tzdata>=2021.1 # from time
|
||||||
pyserial==3.5
|
pyserial==3.5
|
||||||
platformio==6.1.15 # When updating platformio, also update Dockerfile
|
platformio==6.1.16 # When updating platformio, also update Dockerfile
|
||||||
esptool==4.7.0
|
esptool==4.7.0
|
||||||
click==8.1.7
|
click==8.1.7
|
||||||
esphome-dashboard==20240620.0
|
esphome-dashboard==20240620.0
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
pillow==10.2.0
|
pillow==10.4.0
|
||||||
cairosvg==2.7.1
|
cairosvg==2.7.1
|
||||||
|
|
|
@ -2,6 +2,15 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
help() {
|
||||||
|
echo "Usage: $0 [-e <config|compile|clean>] [-c <string>] [-t <string>]" 1>&2
|
||||||
|
echo 1>&2
|
||||||
|
echo " - e - Parameter for esphome command. Default compile. Common alternative is config." 1>&2
|
||||||
|
echo " - c - Component folder name to test. Default *. E.g. '-c logger'." 1>&2
|
||||||
|
echo " - t - Target name to test. Put '-t list' to display all possibilities. E.g. '-t esp32-s2-idf-51'." 1>&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
# Parse parameter:
|
# Parse parameter:
|
||||||
# - `e` - Parameter for `esphome` command. Default `compile`. Common alternative is `config`.
|
# - `e` - Parameter for `esphome` command. Default `compile`. Common alternative is `config`.
|
||||||
# - `c` - Component folder name to test. Default `*`.
|
# - `c` - Component folder name to test. Default `*`.
|
||||||
|
@ -13,7 +22,7 @@ do
|
||||||
e) esphome_command=${OPTARG};;
|
e) esphome_command=${OPTARG};;
|
||||||
c) target_component=${OPTARG};;
|
c) target_component=${OPTARG};;
|
||||||
t) requested_target_platform=${OPTARG};;
|
t) requested_target_platform=${OPTARG};;
|
||||||
\?) echo "Usage: $0 [-e <config|compile|clean>] [-c <string>] [-t <string>]" 1>&2; exit 1;;
|
\?) help;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -24,8 +33,8 @@ if ! [ -d "./tests/test_build_components/build" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
start_esphome() {
|
start_esphome() {
|
||||||
if [ -n "$requested_target_platform" ] && [ "$requested_target_platform" != "$target_platform" ]; then
|
if [ -n "$requested_target_platform" ] && [ "$requested_target_platform" != "$target_platform_with_version" ]; then
|
||||||
echo "Skiping $target_platform"
|
echo "Skipping $target_platform_with_version"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
# create dynamic yaml file in `build` folder.
|
# create dynamic yaml file in `build` folder.
|
||||||
|
|
|
@ -4,6 +4,7 @@ touchscreen:
|
||||||
interrupt_pin:
|
interrupt_pin:
|
||||||
number: 21
|
number: 21
|
||||||
reset_pin: GPIO16
|
reset_pin: GPIO16
|
||||||
|
skip_probe: false
|
||||||
transform:
|
transform:
|
||||||
mirror_x: false
|
mirror_x: false
|
||||||
mirror_y: false
|
mirror_y: false
|
||||||
|
@ -11,14 +12,14 @@ touchscreen:
|
||||||
|
|
||||||
i2c:
|
i2c:
|
||||||
sda: 3
|
sda: 3
|
||||||
scl: 2
|
scl: 4
|
||||||
|
|
||||||
display:
|
display:
|
||||||
- id: my_display
|
- id: my_display
|
||||||
platform: ili9xxx
|
platform: ili9xxx
|
||||||
dimensions: 480x320
|
dimensions: 480x320
|
||||||
model: ST7796
|
model: ST7796
|
||||||
cs_pin: 15
|
cs_pin: 18
|
||||||
dc_pin: 20
|
dc_pin: 20
|
||||||
reset_pin: 22
|
reset_pin: 22
|
||||||
transform:
|
transform:
|
||||||
|
|
|
@ -34,3 +34,7 @@ display:
|
||||||
|
|
||||||
it.line_at_angle(centerX, centerY, minuteAngle, radius - 5, radius);
|
it.line_at_angle(centerX, centerY, minuteAngle, radius - 5, radius);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Nice ring around and some gauge
|
||||||
|
it.filled_ring(centerX, centerY, radius+5, radius+8);
|
||||||
|
it.filled_gauge(centerX, centerY, radius/2, radius/2-5, 66);
|
||||||
|
|
125
tests/components/light/common.yaml
Normal file
125
tests/components/light/common.yaml
Normal file
|
@ -0,0 +1,125 @@
|
||||||
|
esphome:
|
||||||
|
on_boot:
|
||||||
|
then:
|
||||||
|
- light.toggle: test_binary_light
|
||||||
|
- light.turn_off: test_rgb_light
|
||||||
|
- light.turn_on:
|
||||||
|
id: test_rgb_light
|
||||||
|
brightness: 100%
|
||||||
|
red: 100%
|
||||||
|
green: 100%
|
||||||
|
blue: 1.0
|
||||||
|
- light.control:
|
||||||
|
id: test_monochromatic_light
|
||||||
|
state: on
|
||||||
|
- light.dim_relative:
|
||||||
|
id: test_monochromatic_light
|
||||||
|
relative_brightness: 5%
|
||||||
|
brightness_limits:
|
||||||
|
max_brightness: 90%
|
||||||
|
|
||||||
|
light:
|
||||||
|
- platform: binary
|
||||||
|
id: test_binary_light
|
||||||
|
name: Binary Light
|
||||||
|
output: test_binary
|
||||||
|
effects:
|
||||||
|
- strobe:
|
||||||
|
on_state:
|
||||||
|
- logger.log: Binary light state changed
|
||||||
|
- platform: monochromatic
|
||||||
|
id: test_monochromatic_light
|
||||||
|
name: Monochromatic Light
|
||||||
|
output: test_ledc_1
|
||||||
|
gamma_correct: 2.8
|
||||||
|
default_transition_length: 2s
|
||||||
|
effects:
|
||||||
|
- strobe:
|
||||||
|
- flicker:
|
||||||
|
- flicker:
|
||||||
|
name: My Flicker
|
||||||
|
alpha: 98%
|
||||||
|
intensity: 1.5%
|
||||||
|
- lambda:
|
||||||
|
name: My Custom Effect
|
||||||
|
update_interval: 1s
|
||||||
|
lambda: |-
|
||||||
|
static int state = 0;
|
||||||
|
state += 1;
|
||||||
|
if (state == 4)
|
||||||
|
state = 0;
|
||||||
|
- pulse:
|
||||||
|
transition_length: 10s
|
||||||
|
update_interval: 20s
|
||||||
|
min_brightness: 10%
|
||||||
|
max_brightness: 90%
|
||||||
|
- pulse:
|
||||||
|
name: pulse2
|
||||||
|
transition_length:
|
||||||
|
on_length: 10s
|
||||||
|
off_length: 5s
|
||||||
|
update_interval: 15s
|
||||||
|
min_brightness: 10%
|
||||||
|
max_brightness: 90%
|
||||||
|
- platform: rgb
|
||||||
|
id: test_rgb_light
|
||||||
|
name: RGB Light
|
||||||
|
red: test_ledc_1
|
||||||
|
green: test_ledc_2
|
||||||
|
blue: test_ledc_3
|
||||||
|
- platform: rgbw
|
||||||
|
id: test_rgbw_light
|
||||||
|
name: RGBW Light
|
||||||
|
red: test_ledc_1
|
||||||
|
green: test_ledc_2
|
||||||
|
blue: test_ledc_3
|
||||||
|
white: test_ledc_4
|
||||||
|
color_interlock: true
|
||||||
|
- platform: rgbww
|
||||||
|
id: test_rgbww_light
|
||||||
|
name: RGBWW Light
|
||||||
|
red: test_ledc_1
|
||||||
|
green: test_ledc_2
|
||||||
|
blue: test_ledc_3
|
||||||
|
cold_white: test_ledc_4
|
||||||
|
warm_white: test_ledc_5
|
||||||
|
cold_white_color_temperature: 153 mireds
|
||||||
|
warm_white_color_temperature: 500 mireds
|
||||||
|
color_interlock: true
|
||||||
|
- platform: rgbct
|
||||||
|
id: test_rgbct_light
|
||||||
|
name: RGBCT Light
|
||||||
|
red: test_ledc_1
|
||||||
|
green: test_ledc_2
|
||||||
|
blue: test_ledc_3
|
||||||
|
color_temperature: test_ledc_4
|
||||||
|
white_brightness: test_ledc_5
|
||||||
|
cold_white_color_temperature: 153 mireds
|
||||||
|
warm_white_color_temperature: 500 mireds
|
||||||
|
color_interlock: true
|
||||||
|
- platform: cwww
|
||||||
|
id: test_cwww_light
|
||||||
|
name: CWWW Light
|
||||||
|
cold_white: test_ledc_1
|
||||||
|
warm_white: test_ledc_2
|
||||||
|
cold_white_color_temperature: 153 mireds
|
||||||
|
warm_white_color_temperature: 500 mireds
|
||||||
|
constant_brightness: true
|
||||||
|
- platform: color_temperature
|
||||||
|
id: test_color_temperature_light
|
||||||
|
name: CT Light
|
||||||
|
color_temperature: test_ledc_1
|
||||||
|
brightness: test_ledc_2
|
||||||
|
cold_white_color_temperature: 153 mireds
|
||||||
|
warm_white_color_temperature: 500 mireds
|
||||||
|
- platform: rgb
|
||||||
|
id: test_rgb_light_initial_state
|
||||||
|
name: RGB Light
|
||||||
|
red: test_ledc_1
|
||||||
|
green: test_ledc_2
|
||||||
|
blue: test_ledc_3
|
||||||
|
initial_state:
|
||||||
|
color_mode: rgb
|
||||||
|
red: 100%
|
||||||
|
green: 50%
|
||||||
|
blue: 50%
|
|
@ -1,23 +1,3 @@
|
||||||
esphome:
|
|
||||||
on_boot:
|
|
||||||
then:
|
|
||||||
- light.toggle: test_binary_light
|
|
||||||
- light.turn_off: test_rgb_light
|
|
||||||
- light.turn_on:
|
|
||||||
id: test_rgb_light
|
|
||||||
brightness: 100%
|
|
||||||
red: 100%
|
|
||||||
green: 100%
|
|
||||||
blue: 1.0
|
|
||||||
- light.control:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
state: on
|
|
||||||
- light.dim_relative:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
relative_brightness: 5%
|
|
||||||
brightness_limits:
|
|
||||||
max_brightness: 90%
|
|
||||||
|
|
||||||
output:
|
output:
|
||||||
- platform: gpio
|
- platform: gpio
|
||||||
id: test_binary
|
id: test_binary
|
||||||
|
@ -38,97 +18,4 @@ output:
|
||||||
id: test_ledc_5
|
id: test_ledc_5
|
||||||
pin: 17
|
pin: 17
|
||||||
|
|
||||||
light:
|
<<: !include common.yaml
|
||||||
- platform: binary
|
|
||||||
id: test_binary_light
|
|
||||||
name: Binary Light
|
|
||||||
output: test_binary
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
on_state:
|
|
||||||
- logger.log: Binary light state changed
|
|
||||||
- platform: monochromatic
|
|
||||||
id: test_monochromatic_light
|
|
||||||
name: Monochromatic Light
|
|
||||||
output: test_ledc_1
|
|
||||||
gamma_correct: 2.8
|
|
||||||
default_transition_length: 2s
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
- flicker:
|
|
||||||
- flicker:
|
|
||||||
name: My Flicker
|
|
||||||
alpha: 98%
|
|
||||||
intensity: 1.5%
|
|
||||||
- lambda:
|
|
||||||
name: My Custom Effect
|
|
||||||
update_interval: 1s
|
|
||||||
lambda: |-
|
|
||||||
static int state = 0;
|
|
||||||
state += 1;
|
|
||||||
if (state == 4)
|
|
||||||
state = 0;
|
|
||||||
- pulse:
|
|
||||||
transition_length: 10s
|
|
||||||
update_interval: 20s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- pulse:
|
|
||||||
name: pulse2
|
|
||||||
transition_length:
|
|
||||||
on_length: 10s
|
|
||||||
off_length: 5s
|
|
||||||
update_interval: 15s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- platform: rgb
|
|
||||||
id: test_rgb_light
|
|
||||||
name: RGB Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
- platform: rgbw
|
|
||||||
id: test_rgbw_light
|
|
||||||
name: RGBW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
white: test_ledc_4
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbww
|
|
||||||
id: test_rgbww_light
|
|
||||||
name: RGBWW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
cold_white: test_ledc_4
|
|
||||||
warm_white: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbct
|
|
||||||
id: test_rgbct_light
|
|
||||||
name: RGBCT Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
color_temperature: test_ledc_4
|
|
||||||
white_brightness: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: cwww
|
|
||||||
id: test_cwww_light
|
|
||||||
name: CWWW Light
|
|
||||||
cold_white: test_ledc_1
|
|
||||||
warm_white: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
constant_brightness: true
|
|
||||||
- platform: color_temperature
|
|
||||||
id: test_color_temperature_light
|
|
||||||
name: CT Light
|
|
||||||
color_temperature: test_ledc_1
|
|
||||||
brightness: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
|
|
|
@ -1,23 +1,3 @@
|
||||||
esphome:
|
|
||||||
on_boot:
|
|
||||||
then:
|
|
||||||
- light.toggle: test_binary_light
|
|
||||||
- light.turn_off: test_rgb_light
|
|
||||||
- light.turn_on:
|
|
||||||
id: test_rgb_light
|
|
||||||
brightness: 100%
|
|
||||||
red: 100%
|
|
||||||
green: 100%
|
|
||||||
blue: 1.0
|
|
||||||
- light.control:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
state: on
|
|
||||||
- light.dim_relative:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
relative_brightness: 5%
|
|
||||||
brightness_limits:
|
|
||||||
max_brightness: 90%
|
|
||||||
|
|
||||||
output:
|
output:
|
||||||
- platform: gpio
|
- platform: gpio
|
||||||
id: test_binary
|
id: test_binary
|
||||||
|
@ -38,97 +18,4 @@ output:
|
||||||
id: test_ledc_5
|
id: test_ledc_5
|
||||||
pin: 5
|
pin: 5
|
||||||
|
|
||||||
light:
|
<<: !include common.yaml
|
||||||
- platform: binary
|
|
||||||
id: test_binary_light
|
|
||||||
name: Binary Light
|
|
||||||
output: test_binary
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
on_state:
|
|
||||||
- logger.log: Binary light state changed
|
|
||||||
- platform: monochromatic
|
|
||||||
id: test_monochromatic_light
|
|
||||||
name: Monochromatic Light
|
|
||||||
output: test_ledc_1
|
|
||||||
gamma_correct: 2.8
|
|
||||||
default_transition_length: 2s
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
- flicker:
|
|
||||||
- flicker:
|
|
||||||
name: My Flicker
|
|
||||||
alpha: 98%
|
|
||||||
intensity: 1.5%
|
|
||||||
- lambda:
|
|
||||||
name: My Custom Effect
|
|
||||||
update_interval: 1s
|
|
||||||
lambda: |-
|
|
||||||
static int state = 0;
|
|
||||||
state += 1;
|
|
||||||
if (state == 4)
|
|
||||||
state = 0;
|
|
||||||
- pulse:
|
|
||||||
transition_length: 10s
|
|
||||||
update_interval: 20s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- pulse:
|
|
||||||
name: pulse2
|
|
||||||
transition_length:
|
|
||||||
on_length: 10s
|
|
||||||
off_length: 5s
|
|
||||||
update_interval: 15s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- platform: rgb
|
|
||||||
id: test_rgb_light
|
|
||||||
name: RGB Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
- platform: rgbw
|
|
||||||
id: test_rgbw_light
|
|
||||||
name: RGBW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
white: test_ledc_4
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbww
|
|
||||||
id: test_rgbww_light
|
|
||||||
name: RGBWW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
cold_white: test_ledc_4
|
|
||||||
warm_white: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbct
|
|
||||||
id: test_rgbct_light
|
|
||||||
name: RGBCT Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
color_temperature: test_ledc_4
|
|
||||||
white_brightness: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: cwww
|
|
||||||
id: test_cwww_light
|
|
||||||
name: CWWW Light
|
|
||||||
cold_white: test_ledc_1
|
|
||||||
warm_white: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
constant_brightness: true
|
|
||||||
- platform: color_temperature
|
|
||||||
id: test_color_temperature_light
|
|
||||||
name: CT Light
|
|
||||||
color_temperature: test_ledc_1
|
|
||||||
brightness: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
|
|
|
@ -1,23 +1,3 @@
|
||||||
esphome:
|
|
||||||
on_boot:
|
|
||||||
then:
|
|
||||||
- light.toggle: test_binary_light
|
|
||||||
- light.turn_off: test_rgb_light
|
|
||||||
- light.turn_on:
|
|
||||||
id: test_rgb_light
|
|
||||||
brightness: 100%
|
|
||||||
red: 100%
|
|
||||||
green: 100%
|
|
||||||
blue: 1.0
|
|
||||||
- light.control:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
state: on
|
|
||||||
- light.dim_relative:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
relative_brightness: 5%
|
|
||||||
brightness_limits:
|
|
||||||
max_brightness: 90%
|
|
||||||
|
|
||||||
output:
|
output:
|
||||||
- platform: gpio
|
- platform: gpio
|
||||||
id: test_binary
|
id: test_binary
|
||||||
|
@ -38,97 +18,4 @@ output:
|
||||||
id: test_ledc_5
|
id: test_ledc_5
|
||||||
pin: 5
|
pin: 5
|
||||||
|
|
||||||
light:
|
<<: !include common.yaml
|
||||||
- platform: binary
|
|
||||||
id: test_binary_light
|
|
||||||
name: Binary Light
|
|
||||||
output: test_binary
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
on_state:
|
|
||||||
- logger.log: Binary light state changed
|
|
||||||
- platform: monochromatic
|
|
||||||
id: test_monochromatic_light
|
|
||||||
name: Monochromatic Light
|
|
||||||
output: test_ledc_1
|
|
||||||
gamma_correct: 2.8
|
|
||||||
default_transition_length: 2s
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
- flicker:
|
|
||||||
- flicker:
|
|
||||||
name: My Flicker
|
|
||||||
alpha: 98%
|
|
||||||
intensity: 1.5%
|
|
||||||
- lambda:
|
|
||||||
name: My Custom Effect
|
|
||||||
update_interval: 1s
|
|
||||||
lambda: |-
|
|
||||||
static int state = 0;
|
|
||||||
state += 1;
|
|
||||||
if (state == 4)
|
|
||||||
state = 0;
|
|
||||||
- pulse:
|
|
||||||
transition_length: 10s
|
|
||||||
update_interval: 20s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- pulse:
|
|
||||||
name: pulse2
|
|
||||||
transition_length:
|
|
||||||
on_length: 10s
|
|
||||||
off_length: 5s
|
|
||||||
update_interval: 15s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- platform: rgb
|
|
||||||
id: test_rgb_light
|
|
||||||
name: RGB Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
- platform: rgbw
|
|
||||||
id: test_rgbw_light
|
|
||||||
name: RGBW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
white: test_ledc_4
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbww
|
|
||||||
id: test_rgbww_light
|
|
||||||
name: RGBWW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
cold_white: test_ledc_4
|
|
||||||
warm_white: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbct
|
|
||||||
id: test_rgbct_light
|
|
||||||
name: RGBCT Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
color_temperature: test_ledc_4
|
|
||||||
white_brightness: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: cwww
|
|
||||||
id: test_cwww_light
|
|
||||||
name: CWWW Light
|
|
||||||
cold_white: test_ledc_1
|
|
||||||
warm_white: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
constant_brightness: true
|
|
||||||
- platform: color_temperature
|
|
||||||
id: test_color_temperature_light
|
|
||||||
name: CT Light
|
|
||||||
color_temperature: test_ledc_1
|
|
||||||
brightness: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
|
|
|
@ -1,23 +1,3 @@
|
||||||
esphome:
|
|
||||||
on_boot:
|
|
||||||
then:
|
|
||||||
- light.toggle: test_binary_light
|
|
||||||
- light.turn_off: test_rgb_light
|
|
||||||
- light.turn_on:
|
|
||||||
id: test_rgb_light
|
|
||||||
brightness: 100%
|
|
||||||
red: 100%
|
|
||||||
green: 100%
|
|
||||||
blue: 1.0
|
|
||||||
- light.control:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
state: on
|
|
||||||
- light.dim_relative:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
relative_brightness: 5%
|
|
||||||
brightness_limits:
|
|
||||||
max_brightness: 90%
|
|
||||||
|
|
||||||
output:
|
output:
|
||||||
- platform: gpio
|
- platform: gpio
|
||||||
id: test_binary
|
id: test_binary
|
||||||
|
@ -38,97 +18,4 @@ output:
|
||||||
id: test_ledc_5
|
id: test_ledc_5
|
||||||
pin: 17
|
pin: 17
|
||||||
|
|
||||||
light:
|
<<: !include common.yaml
|
||||||
- platform: binary
|
|
||||||
id: test_binary_light
|
|
||||||
name: Binary Light
|
|
||||||
output: test_binary
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
on_state:
|
|
||||||
- logger.log: Binary light state changed
|
|
||||||
- platform: monochromatic
|
|
||||||
id: test_monochromatic_light
|
|
||||||
name: Monochromatic Light
|
|
||||||
output: test_ledc_1
|
|
||||||
gamma_correct: 2.8
|
|
||||||
default_transition_length: 2s
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
- flicker:
|
|
||||||
- flicker:
|
|
||||||
name: My Flicker
|
|
||||||
alpha: 98%
|
|
||||||
intensity: 1.5%
|
|
||||||
- lambda:
|
|
||||||
name: My Custom Effect
|
|
||||||
update_interval: 1s
|
|
||||||
lambda: |-
|
|
||||||
static int state = 0;
|
|
||||||
state += 1;
|
|
||||||
if (state == 4)
|
|
||||||
state = 0;
|
|
||||||
- pulse:
|
|
||||||
transition_length: 10s
|
|
||||||
update_interval: 20s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- pulse:
|
|
||||||
name: pulse2
|
|
||||||
transition_length:
|
|
||||||
on_length: 10s
|
|
||||||
off_length: 5s
|
|
||||||
update_interval: 15s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- platform: rgb
|
|
||||||
id: test_rgb_light
|
|
||||||
name: RGB Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
- platform: rgbw
|
|
||||||
id: test_rgbw_light
|
|
||||||
name: RGBW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
white: test_ledc_4
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbww
|
|
||||||
id: test_rgbww_light
|
|
||||||
name: RGBWW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
cold_white: test_ledc_4
|
|
||||||
warm_white: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbct
|
|
||||||
id: test_rgbct_light
|
|
||||||
name: RGBCT Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
color_temperature: test_ledc_4
|
|
||||||
white_brightness: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: cwww
|
|
||||||
id: test_cwww_light
|
|
||||||
name: CWWW Light
|
|
||||||
cold_white: test_ledc_1
|
|
||||||
warm_white: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
constant_brightness: true
|
|
||||||
- platform: color_temperature
|
|
||||||
id: test_color_temperature_light
|
|
||||||
name: CT Light
|
|
||||||
color_temperature: test_ledc_1
|
|
||||||
brightness: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
|
|
|
@ -1,23 +1,3 @@
|
||||||
esphome:
|
|
||||||
on_boot:
|
|
||||||
then:
|
|
||||||
- light.toggle: test_binary_light
|
|
||||||
- light.turn_off: test_rgb_light
|
|
||||||
- light.turn_on:
|
|
||||||
id: test_rgb_light
|
|
||||||
brightness: 100%
|
|
||||||
red: 100%
|
|
||||||
green: 100%
|
|
||||||
blue: 1.0
|
|
||||||
- light.control:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
state: on
|
|
||||||
- light.dim_relative:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
relative_brightness: 5%
|
|
||||||
brightness_limits:
|
|
||||||
max_brightness: 90%
|
|
||||||
|
|
||||||
output:
|
output:
|
||||||
- platform: gpio
|
- platform: gpio
|
||||||
id: test_binary
|
id: test_binary
|
||||||
|
@ -38,97 +18,4 @@ output:
|
||||||
id: test_ledc_5
|
id: test_ledc_5
|
||||||
pin: 16
|
pin: 16
|
||||||
|
|
||||||
light:
|
<<: !include common.yaml
|
||||||
- platform: binary
|
|
||||||
id: test_binary_light
|
|
||||||
name: Binary Light
|
|
||||||
output: test_binary
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
on_state:
|
|
||||||
- logger.log: Binary light state changed
|
|
||||||
- platform: monochromatic
|
|
||||||
id: test_monochromatic_light
|
|
||||||
name: Monochromatic Light
|
|
||||||
output: test_ledc_1
|
|
||||||
gamma_correct: 2.8
|
|
||||||
default_transition_length: 2s
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
- flicker:
|
|
||||||
- flicker:
|
|
||||||
name: My Flicker
|
|
||||||
alpha: 98%
|
|
||||||
intensity: 1.5%
|
|
||||||
- lambda:
|
|
||||||
name: My Custom Effect
|
|
||||||
update_interval: 1s
|
|
||||||
lambda: |-
|
|
||||||
static int state = 0;
|
|
||||||
state += 1;
|
|
||||||
if (state == 4)
|
|
||||||
state = 0;
|
|
||||||
- pulse:
|
|
||||||
transition_length: 10s
|
|
||||||
update_interval: 20s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- pulse:
|
|
||||||
name: pulse2
|
|
||||||
transition_length:
|
|
||||||
on_length: 10s
|
|
||||||
off_length: 5s
|
|
||||||
update_interval: 15s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- platform: rgb
|
|
||||||
id: test_rgb_light
|
|
||||||
name: RGB Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
- platform: rgbw
|
|
||||||
id: test_rgbw_light
|
|
||||||
name: RGBW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
white: test_ledc_4
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbww
|
|
||||||
id: test_rgbww_light
|
|
||||||
name: RGBWW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
cold_white: test_ledc_4
|
|
||||||
warm_white: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbct
|
|
||||||
id: test_rgbct_light
|
|
||||||
name: RGBCT Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
color_temperature: test_ledc_4
|
|
||||||
white_brightness: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: cwww
|
|
||||||
id: test_cwww_light
|
|
||||||
name: CWWW Light
|
|
||||||
cold_white: test_ledc_1
|
|
||||||
warm_white: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
constant_brightness: true
|
|
||||||
- platform: color_temperature
|
|
||||||
id: test_color_temperature_light
|
|
||||||
name: CT Light
|
|
||||||
color_temperature: test_ledc_1
|
|
||||||
brightness: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
|
|
|
@ -1,23 +1,3 @@
|
||||||
esphome:
|
|
||||||
on_boot:
|
|
||||||
then:
|
|
||||||
- light.toggle: test_binary_light
|
|
||||||
- light.turn_off: test_rgb_light
|
|
||||||
- light.turn_on:
|
|
||||||
id: test_rgb_light
|
|
||||||
brightness: 100%
|
|
||||||
red: 100%
|
|
||||||
green: 100%
|
|
||||||
blue: 1.0
|
|
||||||
- light.control:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
state: on
|
|
||||||
- light.dim_relative:
|
|
||||||
id: test_monochromatic_light
|
|
||||||
relative_brightness: 5%
|
|
||||||
brightness_limits:
|
|
||||||
max_brightness: 90%
|
|
||||||
|
|
||||||
output:
|
output:
|
||||||
- platform: gpio
|
- platform: gpio
|
||||||
id: test_binary
|
id: test_binary
|
||||||
|
@ -38,97 +18,4 @@ output:
|
||||||
id: test_ledc_5
|
id: test_ledc_5
|
||||||
pin: 5
|
pin: 5
|
||||||
|
|
||||||
light:
|
<<: !include common.yaml
|
||||||
- platform: binary
|
|
||||||
id: test_binary_light
|
|
||||||
name: Binary Light
|
|
||||||
output: test_binary
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
on_state:
|
|
||||||
- logger.log: Binary light state changed
|
|
||||||
- platform: monochromatic
|
|
||||||
id: test_monochromatic_light
|
|
||||||
name: Monochromatic Light
|
|
||||||
output: test_ledc_1
|
|
||||||
gamma_correct: 2.8
|
|
||||||
default_transition_length: 2s
|
|
||||||
effects:
|
|
||||||
- strobe:
|
|
||||||
- flicker:
|
|
||||||
- flicker:
|
|
||||||
name: My Flicker
|
|
||||||
alpha: 98%
|
|
||||||
intensity: 1.5%
|
|
||||||
- lambda:
|
|
||||||
name: My Custom Effect
|
|
||||||
update_interval: 1s
|
|
||||||
lambda: |-
|
|
||||||
static int state = 0;
|
|
||||||
state += 1;
|
|
||||||
if (state == 4)
|
|
||||||
state = 0;
|
|
||||||
- pulse:
|
|
||||||
transition_length: 10s
|
|
||||||
update_interval: 20s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- pulse:
|
|
||||||
name: pulse2
|
|
||||||
transition_length:
|
|
||||||
on_length: 10s
|
|
||||||
off_length: 5s
|
|
||||||
update_interval: 15s
|
|
||||||
min_brightness: 10%
|
|
||||||
max_brightness: 90%
|
|
||||||
- platform: rgb
|
|
||||||
id: test_rgb_light
|
|
||||||
name: RGB Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
- platform: rgbw
|
|
||||||
id: test_rgbw_light
|
|
||||||
name: RGBW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
white: test_ledc_4
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbww
|
|
||||||
id: test_rgbww_light
|
|
||||||
name: RGBWW Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
cold_white: test_ledc_4
|
|
||||||
warm_white: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: rgbct
|
|
||||||
id: test_rgbct_light
|
|
||||||
name: RGBCT Light
|
|
||||||
red: test_ledc_1
|
|
||||||
green: test_ledc_2
|
|
||||||
blue: test_ledc_3
|
|
||||||
color_temperature: test_ledc_4
|
|
||||||
white_brightness: test_ledc_5
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
color_interlock: true
|
|
||||||
- platform: cwww
|
|
||||||
id: test_cwww_light
|
|
||||||
name: CWWW Light
|
|
||||||
cold_white: test_ledc_1
|
|
||||||
warm_white: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
constant_brightness: true
|
|
||||||
- platform: color_temperature
|
|
||||||
id: test_color_temperature_light
|
|
||||||
name: CT Light
|
|
||||||
color_temperature: test_ledc_1
|
|
||||||
brightness: test_ledc_2
|
|
||||||
cold_white_color_temperature: 153 mireds
|
|
||||||
warm_white_color_temperature: 500 mireds
|
|
||||||
|
|
|
@ -135,3 +135,9 @@ wifi:
|
||||||
time:
|
time:
|
||||||
platform: sntp
|
platform: sntp
|
||||||
id: time_id
|
id: time_id
|
||||||
|
|
||||||
|
text:
|
||||||
|
- id: lvgl_text
|
||||||
|
platform: lvgl
|
||||||
|
widget: hello_label
|
||||||
|
mode: text
|
||||||
|
|
|
@ -12,6 +12,11 @@ substitutions:
|
||||||
arrow_down: "\U000F004B"
|
arrow_down: "\U000F004B"
|
||||||
|
|
||||||
lvgl:
|
lvgl:
|
||||||
|
resume_on_input: true
|
||||||
|
on_pause:
|
||||||
|
logger.log: LVGL is Paused
|
||||||
|
on_resume:
|
||||||
|
logger.log: LVGL has resumed
|
||||||
log_level: TRACE
|
log_level: TRACE
|
||||||
bg_color: light_blue
|
bg_color: light_blue
|
||||||
disp_bg_color: color_id
|
disp_bg_color: color_id
|
||||||
|
@ -151,6 +156,10 @@ lvgl:
|
||||||
align: center
|
align: center
|
||||||
text_font: montserrat_40
|
text_font: montserrat_40
|
||||||
border_post: true
|
border_post: true
|
||||||
|
on_press:
|
||||||
|
lvgl.label.update:
|
||||||
|
id: hello_label
|
||||||
|
text: Goodbye
|
||||||
on_click:
|
on_click:
|
||||||
then:
|
then:
|
||||||
- lvgl.animimg.stop: anim_img
|
- lvgl.animimg.stop: anim_img
|
||||||
|
|
|
@ -44,6 +44,7 @@ binary_sensor:
|
||||||
number: GPIO39
|
number: GPIO39
|
||||||
inverted: true
|
inverted: true
|
||||||
lvgl:
|
lvgl:
|
||||||
|
draw_rounding: 8
|
||||||
encoders:
|
encoders:
|
||||||
group: switches
|
group: switches
|
||||||
initial_focus: button_button
|
initial_focus: button_button
|
||||||
|
|
19
tests/components/max17043/common.yaml
Normal file
19
tests/components/max17043/common.yaml
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
esphome:
|
||||||
|
on_boot:
|
||||||
|
then:
|
||||||
|
- max17043.sleep_mode: max17043_id
|
||||||
|
|
||||||
|
i2c:
|
||||||
|
- id: i2c_id
|
||||||
|
scl: ${scl_pin}
|
||||||
|
sda: ${sda_pin}
|
||||||
|
|
||||||
|
sensor:
|
||||||
|
- platform: max17043
|
||||||
|
id: max17043_id
|
||||||
|
i2c_id: i2c_id
|
||||||
|
battery_voltage:
|
||||||
|
name: "Battery Voltage"
|
||||||
|
battery_level:
|
||||||
|
name: Battery
|
||||||
|
update_interval: 10s
|
6
tests/components/max17043/test.esp32-ard.yaml
Normal file
6
tests/components/max17043/test.esp32-ard.yaml
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
substitutions:
|
||||||
|
sda_pin: GPIO21
|
||||||
|
scl_pin: GPIO22
|
||||||
|
|
||||||
|
<<: !include common.yaml
|
||||||
|
|
5
tests/components/max17043/test.esp32-c3-ard.yaml
Normal file
5
tests/components/max17043/test.esp32-c3-ard.yaml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
substitutions:
|
||||||
|
sda_pin: GPIO8
|
||||||
|
scl_pin: GPIO10
|
||||||
|
|
||||||
|
<<: !include common.yaml
|
5
tests/components/max17043/test.esp32-c3-idf.yaml
Normal file
5
tests/components/max17043/test.esp32-c3-idf.yaml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
substitutions:
|
||||||
|
sda_pin: GPIO8
|
||||||
|
scl_pin: GPIO10
|
||||||
|
|
||||||
|
<<: !include common.yaml
|
5
tests/components/max17043/test.esp32-idf.yaml
Normal file
5
tests/components/max17043/test.esp32-idf.yaml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
substitutions:
|
||||||
|
sda_pin: GPIO21
|
||||||
|
scl_pin: GPIO22
|
||||||
|
|
||||||
|
<<: !include common.yaml
|
5
tests/components/max17043/test.esp8266-ard.yaml
Normal file
5
tests/components/max17043/test.esp8266-ard.yaml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
substitutions:
|
||||||
|
sda_pin: GPIO4
|
||||||
|
scl_pin: GPIO5
|
||||||
|
|
||||||
|
<<: !include common.yaml
|
5
tests/components/max17043/test.rp2040-ard.yaml
Normal file
5
tests/components/max17043/test.rp2040-ard.yaml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
substitutions:
|
||||||
|
sda_pin: GPIO21
|
||||||
|
scl_pin: GPIO22
|
||||||
|
|
||||||
|
<<: !include common.yaml
|
|
@ -5,7 +5,7 @@ spi:
|
||||||
data_pins: [14, 10, 16, 12]
|
data_pins: [14, 10, 16, 12]
|
||||||
|
|
||||||
display:
|
display:
|
||||||
- platform: qspi_amoled
|
- platform: qspi_dbi
|
||||||
model: RM690B0
|
model: RM690B0
|
||||||
data_rate: 80MHz
|
data_rate: 80MHz
|
||||||
spi_mode: mode0
|
spi_mode: mode0
|
||||||
|
@ -20,9 +20,10 @@ display:
|
||||||
reset_pin: 13
|
reset_pin: 13
|
||||||
enable_pin: 9
|
enable_pin: 9
|
||||||
|
|
||||||
- platform: qspi_amoled
|
- platform: qspi_dbi
|
||||||
model: RM67162
|
model: CUSTOM
|
||||||
id: main_lcd
|
id: main_lcd
|
||||||
|
draw_from_origin: true
|
||||||
dimensions:
|
dimensions:
|
||||||
height: 240
|
height: 240
|
||||||
width: 536
|
width: 536
|
||||||
|
@ -34,3 +35,10 @@ display:
|
||||||
cs_pin: 6
|
cs_pin: 6
|
||||||
reset_pin: 17
|
reset_pin: 17
|
||||||
enable_pin: 38
|
enable_pin: 38
|
||||||
|
init_sequence:
|
||||||
|
- [0x3A, 0x66]
|
||||||
|
- [0x11]
|
||||||
|
- delay 120ms
|
||||||
|
- [0x29]
|
||||||
|
- delay 20ms
|
||||||
|
|
8
tests/components/tc74/test.esp32-ard.yaml
Normal file
8
tests/components/tc74/test.esp32-ard.yaml
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
i2c:
|
||||||
|
- id: i2c_tc74
|
||||||
|
scl: 16
|
||||||
|
sda: 17
|
||||||
|
|
||||||
|
sensor:
|
||||||
|
- platform: tc74
|
||||||
|
name: TC74 Temperature
|
8
tests/components/tc74/test.esp32-c3-ard.yaml
Normal file
8
tests/components/tc74/test.esp32-c3-ard.yaml
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
i2c:
|
||||||
|
- id: i2c_tc74
|
||||||
|
scl: 5
|
||||||
|
sda: 4
|
||||||
|
|
||||||
|
sensor:
|
||||||
|
- platform: tc74
|
||||||
|
name: TC74 Temperature
|
8
tests/components/tc74/test.esp32-c3-idf.yaml
Normal file
8
tests/components/tc74/test.esp32-c3-idf.yaml
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
i2c:
|
||||||
|
- id: i2c_tc74
|
||||||
|
scl: 5
|
||||||
|
sda: 4
|
||||||
|
|
||||||
|
sensor:
|
||||||
|
- platform: tc74
|
||||||
|
name: TC74 Temperature
|
8
tests/components/tc74/test.esp32-idf.yaml
Normal file
8
tests/components/tc74/test.esp32-idf.yaml
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
i2c:
|
||||||
|
- id: i2c_tc74
|
||||||
|
scl: 16
|
||||||
|
sda: 17
|
||||||
|
|
||||||
|
sensor:
|
||||||
|
- platform: tc74
|
||||||
|
name: TC74 Temperature
|
8
tests/components/tc74/test.esp8266-ard.yaml
Normal file
8
tests/components/tc74/test.esp8266-ard.yaml
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
i2c:
|
||||||
|
- id: i2c_tc74
|
||||||
|
scl: 5
|
||||||
|
sda: 4
|
||||||
|
|
||||||
|
sensor:
|
||||||
|
- platform: tc74
|
||||||
|
name: TC74 Temperature
|
8
tests/components/tc74/test.rp2040-ard.yaml
Normal file
8
tests/components/tc74/test.rp2040-ard.yaml
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
i2c:
|
||||||
|
- id: i2c_tc74
|
||||||
|
scl: 5
|
||||||
|
sda: 4
|
||||||
|
|
||||||
|
sensor:
|
||||||
|
- platform: tc74
|
||||||
|
name: TC74 Temperature
|
|
@ -46,6 +46,13 @@ binary_sensor:
|
||||||
// Garage Door is closed.
|
// Garage Door is closed.
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
- platform: template
|
||||||
|
id: other_binary_sensor
|
||||||
|
name: "Garage Door Closed"
|
||||||
|
condition:
|
||||||
|
sensor.in_range:
|
||||||
|
id: template_sens
|
||||||
|
below: 30.0
|
||||||
|
|
||||||
output:
|
output:
|
||||||
- platform: template
|
- platform: template
|
||||||
|
|
Loading…
Reference in a new issue