github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-02 02:56:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] Use TemplatableStorage alias to select TemplatableFn or TemplatableValue

Browse Source 
TEMPLATABLE_VALUE macro now uses TemplatableStorage<T, Ts...> which
selects TemplatableFn for non-string types (4 bytes) and
TemplatableValue for std::string (full PROGMEM/FlashStringHelper support).

Fixes ESP8266 compile failure where __FlashStringHelper* couldn't
assign to TemplatableFn<std::string>.
This commit is contained in:
J. Nick Koston
2026-04-07 14:17:41 -10:00
parent 0dddeea4d2
commit 6d0c61dc73
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/automation.h
+10 -1
View File
@@ -62,9 +62,18 @@ template<typename T, typename... X> class TemplatableFn {
T (*f_)(X...){nullptr};
};
// Forward declaration for TemplatableValue (string specialization needs it)
template<typename T, typename... X> class TemplatableValue;
/// Selects TemplatableFn (4 bytes) for non-string types, TemplatableValue (8 bytes) for std::string.
/// std::string needs TemplatableValue for const char*, __FlashStringHelper*, and PROGMEM support.
template<typename T, typename... X>
using TemplatableStorage =
std::conditional_t<std::same_as<T, std::string>, TemplatableValue<T, X...>, TemplatableFn<T, X...>>;
#define TEMPLATABLE_VALUE_(type, name) \
protected: \
TemplatableFn<type, Ts...> name##_{}; \
TemplatableStorage<type, Ts...> name##_{}; \
\
public: \
template<typename V> void set_##name(V name) { this->name##_ = name; }