sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-01 15:41:52 +00:00
Code Issues Releases Wiki Activity

Merge branch 'integration' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-30 13:26:48 -05:00
parent 16f298896d fb6efe93cd
commit 27cef4d250
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
esphome/components/select/select.cpp
View File

@@ -26,6 +26,7 @@ void Select::publish_state(size_t index) {
const char *option = this->option_at(index); const char *option = this->option_at(index);
this->set_has_state(true); this->set_has_state(true);
this->active_index_ = index; this->active_index_ = index;
this->state = option; // Update deprecated member for backward compatibility
ESP_LOGD(TAG, "'%s': Sending state %s (index %zu)", this->get_name().c_str(), option, index); ESP_LOGD(TAG, "'%s': Sending state %s (index %zu)", this->get_name().c_str(), option, index);
// Callback signature requires std::string, create temporary for compatibility // Callback signature requires std::string, create temporary for compatibility
this->state_callback_.call(std::string(option), index); this->state_callback_.call(std::string(option), index);

19
esphome/components/select/select.h
View File

@@ -32,6 +32,9 @@ class Select : public EntityBase {
public: public:
SelectTraits traits; SelectTraits traits;
/// @deprecated Use current_option() instead. This member will be removed in a future release.
__attribute__((deprecated("Use current_option() instead of .state"))) std::string state{};
void publish_state(const std::string &state); void publish_state(const std::string &state);
void publish_state(const char *state); void publish_state(const char *state);
void publish_state(size_t index); void publish_state(size_t index);
@@ -82,11 +85,14 @@ class Select : public EntityBase {
size_t active_index_{0}; size_t active_index_{0};
/** Set the value of the select, this is a virtual method that each select integration must implement. /** Set the value of the select, this is a virtual method that each select integration can implement.
* *
* This method is called by control(size_t) when not overridden, or directly by external code. * This method is called by control(size_t) when not overridden, or directly by external code.
* All existing integrations implement this method. New integrations can optionally override * Integrations can either:
* control(size_t) instead to work with indices directly and avoid string conversions. * 1. Override this method to handle string-based control (traditional approach)
* 2. Override control(size_t) instead to work with indices directly (recommended)
*
* Default implementation converts to index and calls control(size_t).
* *
* Delegation chain: * Delegation chain:
* - SelectCall::perform() → control(size_t) → [if not overridden] → control(string) * - SelectCall::perform() → control(size_t) → [if not overridden] → control(string)
@@ -94,7 +100,12 @@ class Select : public EntityBase {
* *
* @param value The value as validated by the SelectCall. * @param value The value as validated by the SelectCall.
*/ */
virtual void control(const std::string &value) = 0; virtual void control(const std::string &value) {
auto index = this->index_of(value);
if (index.has_value()) {
this->control(index.value());
}
}
CallbackManager<void(std::string, size_t)> state_callback_; CallbackManager<void(std::string, size_t)> state_callback_;
}; };