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

Merge branch 'fixed_vector_HomeAssistantServiceCallAction' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-15 16:19:47 -10:00
parent 052b4b44e8 295ac4b1b8
commit 322b141e51
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
esphome/components/api/homeassistant_service.h
View File

@@ -97,28 +97,22 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
template<typename T> void set_service(T service) { this->service_ = service; } template<typename T> void set_service(T service) { this->service_ = service; }
// Initialize FixedVector members - called from Python codegen with compile-time known sizes // Initialize FixedVector members - called from Python codegen with compile-time known sizes.
// Must be called before any add_* methods; capacity must match the number of subsequent add_* calls.
void init_data(size_t count) { this->data_.init(count); } void init_data(size_t count) { this->data_.init(count); }
void init_data_template(size_t count) { this->data_template_.init(count); } void init_data_template(size_t count) { this->data_template_.init(count); }
void init_variables(size_t count) { this->variables_.init(count); } void init_variables(size_t count) { this->variables_.init(count); }
// Keys are always string literals from the Python code generation (e.g., cg.add(var.add_data("tag_id", templ))). // Keys are always string literals from the Python code generation (e.g., cg.add(var.add_data("tag_id", templ))).
// The value parameter can be a lambda/template, but keys are never templatable. // The value parameter can be a lambda/template, but keys are never templatable.
// Using pass-by-value allows the compiler to optimize for both lvalues and rvalues. template<typename K, typename V> void add_data(K &&key, V &&value) {
template<typename T> void add_data(std::string key, T value) { this->add_kv_(this->data_, std::forward<K>(key), std::forward<V>(value));
auto &kv = this->data_.emplace_back();
kv.key = std::move(key);
kv.value = value;
} }
template<typename T> void add_data_template(std::string key, T value) { template<typename K, typename V> void add_data_template(K &&key, V &&value) {
auto &kv = this->data_template_.emplace_back(); this->add_kv_(this->data_template_, std::forward<K>(key), std::forward<V>(value));
kv.key = std::move(key);
kv.value = value;
} }
template<typename T> void add_variable(std::string key, T value) { template<typename K, typename V> void add_variable(K &&key, V &&value) {
auto &kv = this->variables_.emplace_back(); this->add_kv_(this->variables_, std::forward<K>(key), std::forward<V>(value));
kv.key = std::move(key);
kv.value = value;
} }
#ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES #ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES
@@ -191,6 +185,13 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
} }
protected: protected:
// Helper to add key-value pairs to FixedVectors with perfect forwarding to avoid copies
template<typename K, typename V> void add_kv_(FixedVector<TemplatableKeyValuePair<Ts...>> &vec, K &&key, V &&value) {
auto &kv = vec.emplace_back();
kv.key = std::forward<K>(key);
kv.value = std::forward<V>(value);
}
template<typename VectorType, typename SourceType> template<typename VectorType, typename SourceType>
static void populate_service_map(VectorType &dest, SourceType &source, Ts... x) { static void populate_service_map(VectorType &dest, SourceType &source, Ts... x) {
dest.init(source.size()); dest.init(source.size());