mirror of
https://github.com/esphome/esphome.git
synced 2025-11-17 15:26:01 +00:00
[sx126x] Optimize send_packet action memory usage - store static data in flash (#11790)
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
This commit is contained in:
@@ -3,7 +3,7 @@ import esphome.codegen as cg
|
|||||||
from esphome.components import spi
|
from esphome.components import spi
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.const import CONF_BUSY_PIN, CONF_DATA, CONF_FREQUENCY, CONF_ID
|
from esphome.const import CONF_BUSY_PIN, CONF_DATA, CONF_FREQUENCY, CONF_ID
|
||||||
from esphome.core import TimePeriod
|
from esphome.core import ID, TimePeriod
|
||||||
|
|
||||||
MULTI_CONF = True
|
MULTI_CONF = True
|
||||||
CODEOWNERS = ["@swoboda1337"]
|
CODEOWNERS = ["@swoboda1337"]
|
||||||
@@ -329,5 +329,8 @@ async def send_packet_action_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))
|
# Generate static array in flash to avoid RAM copy
|
||||||
|
arr_id = ID(f"{action_id}_data", is_declaration=True, type=cg.uint8)
|
||||||
|
arr = cg.static_const_array(arr_id, cg.ArrayInitializer(*data))
|
||||||
|
cg.add(var.set_data_static(arr, len(data)))
|
||||||
return var
|
return var
|
||||||
|
|||||||
@@ -14,28 +14,34 @@ template<typename... Ts> class RunImageCalAction : public Action<Ts...>, public
|
|||||||
|
|
||||||
template<typename... Ts> class SendPacketAction : public Action<Ts...>, public Parented<SX126x> {
|
template<typename... Ts> class SendPacketAction : public Action<Ts...>, public Parented<SX126x> {
|
||||||
public:
|
public:
|
||||||
void set_data_template(std::function<std::vector<uint8_t>(Ts...)> func) {
|
void set_data_template(std::vector<uint8_t> (*func)(Ts...)) {
|
||||||
this->data_func_ = func;
|
this->data_.func = func;
|
||||||
this->static_ = false;
|
this->len_ = -1; // Sentinel value indicates template mode
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_data_static(const std::vector<uint8_t> &data) {
|
void set_data_static(const uint8_t *data, size_t len) {
|
||||||
this->data_static_ = data;
|
this->data_.data = data;
|
||||||
this->static_ = true;
|
this->len_ = len; // Length >= 0 indicates static mode
|
||||||
}
|
}
|
||||||
|
|
||||||
void play(const Ts &...x) override {
|
void play(const Ts &...x) override {
|
||||||
if (this->static_) {
|
std::vector<uint8_t> data;
|
||||||
this->parent_->transmit_packet(this->data_static_);
|
if (this->len_ >= 0) {
|
||||||
|
// Static mode: copy from flash to vector
|
||||||
|
data.assign(this->data_.data, this->data_.data + this->len_);
|
||||||
} else {
|
} else {
|
||||||
this->parent_->transmit_packet(this->data_func_(x...));
|
// Template mode: call function
|
||||||
|
data = this->data_.func(x...);
|
||||||
}
|
}
|
||||||
|
this->parent_->transmit_packet(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool static_{false};
|
ssize_t len_{-1}; // -1 = template mode, >=0 = static mode with length
|
||||||
std::function<std::vector<uint8_t>(Ts...)> data_func_{};
|
union Data {
|
||||||
std::vector<uint8_t> data_static_{};
|
std::vector<uint8_t> (*func)(Ts...); // Function pointer (stateless lambdas)
|
||||||
|
const uint8_t *data; // Pointer to static data in flash
|
||||||
|
} data_;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename... Ts> class SetModeTxAction : public Action<Ts...>, public Parented<SX126x> {
|
template<typename... Ts> class SetModeTxAction : public Action<Ts...>, public Parented<SX126x> {
|
||||||
|
|||||||
Reference in New Issue
Block a user