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

Merge branch 'select_options_in_flash' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-27 22:06:26 -05:00
parent 9fd7125d48 d2f5fcd201
commit 62af87b7b2
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/modbus_controller/select/modbus_select.cpp
View File

@@ -28,7 +28,7 @@ void ModbusSelect::parse_and_publish(const std::vector<uint8_t> &data) {
if (map_it != this->mapping_.cend()) { if (map_it != this->mapping_.cend()) {
size_t idx = std::distance(this->mapping_.cbegin(), map_it); size_t idx = std::distance(this->mapping_.cbegin(), map_it);
new_state = std::string(this->traits.get_options()[idx]); new_state = std::string(this->option_at(idx));
ESP_LOGV(TAG, "Found option %s for value %lld", new_state->c_str(), value); ESP_LOGV(TAG, "Found option %s for value %lld", new_state->c_str(), value);
} else { } else {
ESP_LOGE(TAG, "No option found for mapping %lld", value); ESP_LOGE(TAG, "No option found for mapping %lld", value);

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

@@ -60,5 +60,7 @@ optional<std::string> Select::at(size_t index) const {
} }
} }
const char *Select::option_at(size_t index) const { return traits.get_options().at(index); }
} // namespace select } // namespace select
} // namespace esphome } // namespace esphome

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

@@ -56,6 +56,9 @@ class Select : public EntityBase {
/// Return the (optional) option value at the provided index offset. /// Return the (optional) option value at the provided index offset.
optional<std::string> at(size_t index) const; optional<std::string> at(size_t index) const;
/// Return the option value at the provided index offset (as const char* from flash).
const char *option_at(size_t index) const;
void add_on_state_callback(std::function<void(std::string, size_t)> &&callback); void add_on_state_callback(std::function<void(std::string, size_t)> &&callback);
protected: protected:

9
esphome/components/template/select/template_select.cpp
View File

@@ -16,12 +16,12 @@ void TemplateSelect::setup() {
size_t restored_index; size_t restored_index;
if (this->pref_.load(&restored_index) && this->has_index(restored_index)) { if (this->pref_.load(&restored_index) && this->has_index(restored_index)) {
index = restored_index; index = restored_index;
ESP_LOGD(TAG, "State from restore: %s", this->at(index).value().c_str()); ESP_LOGD(TAG, "State from restore: %s", this->option_at(index));
} else { } else {
ESP_LOGD(TAG, "State from initial (could not load or invalid stored index): %s", this->at(index).value().c_str()); ESP_LOGD(TAG, "State from initial (could not load or invalid stored index): %s", this->option_at(index));
} }
} else { } else {
ESP_LOGD(TAG, "State from initial: %s", this->at(index).value().c_str()); ESP_LOGD(TAG, "State from initial: %s", this->option_at(index));
} }
this->publish_state(this->at(index).value()); this->publish_state(this->at(index).value());
@@ -64,8 +64,7 @@ void TemplateSelect::dump_config() {
" Optimistic: %s\n" " Optimistic: %s\n"
" Initial Option: %s\n" " Initial Option: %s\n"
" Restore Value: %s", " Restore Value: %s",
YESNO(this->optimistic_), this->at(this->initial_option_index_).value().c_str(), YESNO(this->optimistic_), this->option_at(this->initial_option_index_), YESNO(this->restore_value_));
YESNO(this->restore_value_));
} }
} // namespace template_ } // namespace template_