Update the patched UART component to ESPHome 2026.11.0
ESPHome 2026.11's tuya component calls uart.new_uart_component(), which the 2026.10.2 copy didn't have, so the build failed. Copy the UART component from 2026.11.0, reapply the PA13/PA14 patch, regenerate the patch file and point the refs at v1.0.6. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
bcc6b3a42b
commit
1457e25d98
39 files changed
+907
-304
No files matched your search
@@ -1,10 +1,10 @@
|
||||
from esphome import automation
|
||||
import esphome.codegen as cg
|
||||
from esphome.components import switch, uart
|
||||
import esphome.config_validation as cv
|
||||
from esphome.const import CONF_DATA, CONF_SEND_EVERY
|
||||
from esphome.core import HexInt
|
||||
|
||||
from .. import uart_ns, validate_raw_data
|
||||
from .. import uart_ns, validate_raw_payload
|
||||
|
||||
DEPENDENCIES = ["uart"]
|
||||
|
||||
@@ -18,11 +18,11 @@ CONFIG_SCHEMA = (
|
||||
.extend(
|
||||
{
|
||||
cv.Required(CONF_DATA): cv.Any(
|
||||
validate_raw_data,
|
||||
validate_raw_payload,
|
||||
cv.Schema(
|
||||
{
|
||||
cv.Optional(CONF_TURN_OFF): validate_raw_data,
|
||||
cv.Optional(CONF_TURN_ON): validate_raw_data,
|
||||
cv.Optional(CONF_TURN_OFF): validate_raw_payload,
|
||||
cv.Optional(CONF_TURN_ON): validate_raw_payload,
|
||||
}
|
||||
),
|
||||
),
|
||||
@@ -40,20 +40,15 @@ async def to_code(config):
|
||||
await uart.register_uart_device(var, config)
|
||||
|
||||
data = config[CONF_DATA]
|
||||
if isinstance(data, dict):
|
||||
if data_on := data.get(CONF_TURN_ON):
|
||||
if isinstance(data_on, bytes):
|
||||
data_on = [HexInt(x) for x in data_on]
|
||||
cg.add(var.set_data_on(cg.ArrayInitializer(*data_on)))
|
||||
if data_off := data.get(CONF_TURN_OFF):
|
||||
if isinstance(data_off, bytes):
|
||||
data_off = [HexInt(x) for x in data_off]
|
||||
cg.add(var.set_data_off(cg.ArrayInitializer(*data_off)))
|
||||
else:
|
||||
data = config[CONF_DATA]
|
||||
if isinstance(data, bytes):
|
||||
data = [HexInt(x) for x in data]
|
||||
cg.add(var.set_data_on(cg.ArrayInitializer(*data)))
|
||||
single_state = not isinstance(data, dict)
|
||||
if single_state:
|
||||
data = {CONF_TURN_ON: data}
|
||||
for key, setter in (
|
||||
(CONF_TURN_ON, var.set_data_on),
|
||||
(CONF_TURN_OFF, var.set_data_off),
|
||||
):
|
||||
if payload := data.get(key):
|
||||
cg.add(setter(automation.progmem_bytes("uart_data", payload), len(payload)))
|
||||
if single_state:
|
||||
cg.add(var.set_single_state(True))
|
||||
if CONF_SEND_EVERY in config:
|
||||
cg.add(var.set_send_every(config[CONF_SEND_EVERY]))
|
||||
cg.add_optional(var.set_send_every, config.get(CONF_SEND_EVERY))
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
namespace esphome::uart {
|
||||
|
||||
static const char *const TAG = "uart.switch";
|
||||
ESPHOME_LOG_TAG(TAG, "uart.switch");
|
||||
|
||||
void UARTSwitch::loop() {
|
||||
if (this->send_every_) {
|
||||
@@ -17,13 +17,13 @@ void UARTSwitch::loop() {
|
||||
}
|
||||
|
||||
void UARTSwitch::write_command_(bool state) {
|
||||
if (state && !this->data_on_.empty()) {
|
||||
ESP_LOGD(TAG, "'%s': Sending on data", this->get_name().c_str());
|
||||
this->write_array(this->data_on_.data(), this->data_on_.size());
|
||||
if (state && this->data_on_len_ != 0) {
|
||||
ESP_LOGD(TAG, "'%s': Sending on data", LOG_STR_ARG(this->get_log_name()));
|
||||
this->write_array_progmem(this->data_on_, this->data_on_len_);
|
||||
}
|
||||
if (!state && !this->data_off_.empty()) {
|
||||
ESP_LOGD(TAG, "'%s': Sending off data", this->get_name().c_str());
|
||||
this->write_array(this->data_off_.data(), this->data_off_.size());
|
||||
if (!state && this->data_off_len_ != 0) {
|
||||
ESP_LOGD(TAG, "'%s': Sending off data", LOG_STR_ARG(this->get_log_name()));
|
||||
this->write_array_progmem(this->data_off_, this->data_off_len_);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
#include "esphome/components/switch/switch.h"
|
||||
|
||||
#include <cinttypes>
|
||||
#include <vector>
|
||||
|
||||
namespace esphome::uart {
|
||||
|
||||
@@ -13,10 +12,14 @@ class UARTSwitch final : public switch_::Switch, public UARTDevice, public Compo
|
||||
public:
|
||||
void loop() override;
|
||||
|
||||
void set_data_on(std::vector<uint8_t> &&data) { this->data_on_ = std::move(data); }
|
||||
void set_data_on(std::initializer_list<uint8_t> data) { this->data_on_ = std::vector<uint8_t>(data); }
|
||||
void set_data_off(std::vector<uint8_t> &&data) { this->data_off_ = std::move(data); }
|
||||
void set_data_off(std::initializer_list<uint8_t> data) { this->data_off_ = std::vector<uint8_t>(data); }
|
||||
void set_data_on(const uint8_t *data, uint16_t len) {
|
||||
this->data_on_ = data;
|
||||
this->data_on_len_ = len;
|
||||
}
|
||||
void set_data_off(const uint8_t *data, uint16_t len) {
|
||||
this->data_off_ = data;
|
||||
this->data_off_len_ = len;
|
||||
}
|
||||
void set_send_every(uint32_t send_every) { this->send_every_ = send_every; }
|
||||
void set_single_state(bool single) { this->single_state_ = single; }
|
||||
|
||||
@@ -25,8 +28,10 @@ class UARTSwitch final : public switch_::Switch, public UARTDevice, public Compo
|
||||
protected:
|
||||
void write_command_(bool state);
|
||||
void write_state(bool state) override;
|
||||
std::vector<uint8_t> data_on_;
|
||||
std::vector<uint8_t> data_off_;
|
||||
const uint8_t *data_on_{nullptr};
|
||||
const uint8_t *data_off_{nullptr};
|
||||
uint16_t data_on_len_{0};
|
||||
uint16_t data_off_len_{0};
|
||||
bool single_state_{false};
|
||||
uint32_t send_every_;
|
||||
uint32_t last_transmission_;
|
||||
|
||||
Reference in new issue
Block a user