sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-29 00:22:21 +01:00
Code Issues Releases Wiki Activity

Merge branch 'integration' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-25 14:33:43 -05:00
parent a4af23ebe4 f7d617fabe
commit 76a2725a25
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/climate/climate.cpp
View File

@@ -368,7 +368,7 @@ void Climate::save_state_() {
const auto &supported = traits.get_supported_custom_fan_modes(); const auto &supported = traits.get_supported_custom_fan_modes();
std::vector<std::string> vec{supported.begin(), supported.end()}; std::vector<std::string> vec{supported.begin(), supported.end()};
for (size_t i = 0; i < vec.size(); i++) { for (size_t i = 0; i < vec.size(); i++) {
if (vec[i] == custom_fan_mode.value()) { if (vec[i] == custom_fan_mode) {
state.custom_fan_mode = i; state.custom_fan_mode = i;
break; break;
} }
@@ -383,7 +383,7 @@ void Climate::save_state_() {
const auto &supported = traits.get_supported_custom_presets(); const auto &supported = traits.get_supported_custom_presets();
std::vector<std::string> vec{supported.begin(), supported.end()}; std::vector<std::string> vec{supported.begin(), supported.end()};
for (size_t i = 0; i < vec.size(); i++) { for (size_t i = 0; i < vec.size(); i++) {
if (vec[i] == custom_preset.value()) { if (vec[i] == custom_preset) {
state.custom_preset = i; state.custom_preset = i;
break; break;
} }

14
esphome/components/web_server/web_server.cpp
View File

@@ -108,14 +108,14 @@ static UrlMatch match_url(const char *url_ptr, size_t url_len, bool only_domain)
void DeferredUpdateEventSource::deq_push_back_with_dedup_(void *source, message_generator_t *message_generator) { void DeferredUpdateEventSource::deq_push_back_with_dedup_(void *source, message_generator_t *message_generator) {
DeferredEvent item(source, message_generator); DeferredEvent item(source, message_generator);
auto iter = std::find_if(this->deferred_queue_.begin(), this->deferred_queue_.end(), // Use range-based for loop instead of std::find_if to reduce template instantiation overhead and binary size
[&item](const DeferredEvent &test) -> bool { return test == item; }); for (auto &event : this->deferred_queue_) {
if (event == item) {
if (iter != this->deferred_queue_.end()) { event = item;
(*iter) = item; return;
} else { }
this->deferred_queue_.push_back(item);
} }
this->deferred_queue_.push_back(item);
} }
void DeferredUpdateEventSource::process_deferred_queue_() { void DeferredUpdateEventSource::process_deferred_queue_() {