sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 23:21:54 +00:00
Code Issues Releases Wiki Activity

[uart] Optimize UART components to eliminate temporary vector allocations (#11570)

Browse Source 
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
This commit is contained in:
J. Nick Koston
2025-10-28 15:48:20 -05:00
committed by GitHub
parent 7ed7e7ad26
commit f1bce262ed
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/uart/__init__.py
View File

@@ -446,7 +446,7 @@ async def uart_write_to_code(config, action_id, template_arg, args):
templ = await cg.templatable(data, args, cg.std_vector.template(cg.uint8)) templ = await cg.templatable(data, args, cg.std_vector.template(cg.uint8))
cg.add(var.set_data_template(templ)) cg.add(var.set_data_template(templ))
else: else:
cg.add(var.set_data_static(data)) cg.add(var.set_data_static(cg.ArrayInitializer(*data)))
return var return var

8
esphome/components/uart/automation.h
View File

@@ -14,8 +14,12 @@ template<typename... Ts> class UARTWriteAction : public Action<Ts...>, public Pa
this->data_func_ = func; this->data_func_ = func;
this->static_ = false; this->static_ = false;
} }
void set_data_static(const std::vector<uint8_t> &data) { void set_data_static(std::vector<uint8_t> &&data) {
this->data_static_ = data; this->data_static_ = std::move(data);
this->static_ = true;
}
void set_data_static(std::initializer_list<uint8_t> data) {
this->data_static_ = std::vector<uint8_t>(data);
this->static_ = true; this->static_ = true;
} }

2
esphome/components/uart/button/__init__.py
View File

@@ -33,4 +33,4 @@ async def to_code(config):
data = config[CONF_DATA] data = config[CONF_DATA]
if isinstance(data, bytes): if isinstance(data, bytes):
data = [HexInt(x) for x in data] data = [HexInt(x) for x in data]
cg.add(var.set_data(data)) cg.add(var.set_data(cg.ArrayInitializer(*data)))

3
esphome/components/uart/button/uart_button.h
View File

@@ -11,7 +11,8 @@ namespace uart {
class UARTButton : public button::Button, public UARTDevice, public Component { class UARTButton : public button::Button, public UARTDevice, public Component {
public: public:
void set_data(const std::vector<uint8_t> &data) { this->data_ = data; } void set_data(std::vector<uint8_t> &&data) { this->data_ = std::move(data); }
void set_data(std::initializer_list<uint8_t> data) { this->data_ = std::vector<uint8_t>(data); }
void dump_config() override; void dump_config() override;

6
esphome/components/uart/switch/__init__.py
View File

@@ -44,16 +44,16 @@ async def to_code(config):
if data_on := data.get(CONF_TURN_ON): if data_on := data.get(CONF_TURN_ON):
if isinstance(data_on, bytes): if isinstance(data_on, bytes):
data_on = [HexInt(x) for x in data_on] data_on = [HexInt(x) for x in data_on]
cg.add(var.set_data_on(data_on)) cg.add(var.set_data_on(cg.ArrayInitializer(*data_on)))
if data_off := data.get(CONF_TURN_OFF): if data_off := data.get(CONF_TURN_OFF):
if isinstance(data_off, bytes): if isinstance(data_off, bytes):
data_off = [HexInt(x) for x in data_off] data_off = [HexInt(x) for x in data_off]
cg.add(var.set_data_off(data_off)) cg.add(var.set_data_off(cg.ArrayInitializer(*data_off)))
else: else:
data = config[CONF_DATA] data = config[CONF_DATA]
if isinstance(data, bytes): if isinstance(data, bytes):
data = [HexInt(x) for x in data] data = [HexInt(x) for x in data]
cg.add(var.set_data_on(data)) cg.add(var.set_data_on(cg.ArrayInitializer(*data)))
cg.add(var.set_single_state(True)) cg.add(var.set_single_state(True))
if CONF_SEND_EVERY in config: if CONF_SEND_EVERY in config:
cg.add(var.set_send_every(config[CONF_SEND_EVERY])) cg.add(var.set_send_every(config[CONF_SEND_EVERY]))

6
esphome/components/uart/switch/uart_switch.h
View File

@@ -14,8 +14,10 @@ class UARTSwitch : public switch_::Switch, public UARTDevice, public Component {
public: public:
void loop() override; void loop() override;
void set_data_on(const std::vector<uint8_t> &data) { this->data_on_ = data; } void set_data_on(std::vector<uint8_t> &&data) { this->data_on_ = std::move(data); }
void set_data_off(const std::vector<uint8_t> &data) { this->data_off_ = 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_send_every(uint32_t send_every) { this->send_every_ = send_every; } void set_send_every(uint32_t send_every) { this->send_every_ = send_every; }
void set_single_state(bool single) { this->single_state_ = single; } void set_single_state(bool single) { this->single_state_ = single; }