jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-07 10:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
J. Nick Koston 2025-07-06 17:27:32 -05:00
parent 2e24a11a1d
commit 3ca956cd6a
No known key found for this signature in database
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
esphome/core/scheduler.cpp
View File

@ -58,31 +58,6 @@ static void validate_static_string(const char *name) {
// iterating over them from the loop task is fine; but iterating from any other context requires the lock to be held to // iterating over them from the loop task is fine; but iterating from any other context requires the lock to be held to
// avoid the main thread modifying the list while it is being accessed. // avoid the main thread modifying the list while it is being accessed.
// Helper to cancel items by name - must be called with lock held
bool HOT Scheduler::cancel_item_locked_(Component *component, const char *name, SchedulerItem::Type type) {
bool ret = false;
for (auto &it : this->items_) {
const char *item_name = it->get_name();
if (it->component == component && item_name != nullptr && strcmp(name, item_name) == 0 && it->type == type &&
!it->remove) {
this->to_remove_++;
it->remove = true;
ret = true;
}
}
for (auto &it : this->to_add_) {
const char *item_name = it->get_name();
if (it->component == component && item_name != nullptr && strcmp(name, item_name) == 0 && it->type == type &&
!it->remove) {
it->remove = true;
ret = true;
}
}
return ret;
}
// Common implementation for both timeout and interval // Common implementation for both timeout and interval
void HOT Scheduler::set_timer_common_(Component *component, SchedulerItem::Type type, bool is_static_string, void HOT Scheduler::set_timer_common_(Component *component, SchedulerItem::Type type, bool is_static_string,
const void *name_ptr, uint32_t delay, std::function<void()> func) { const void *name_ptr, uint32_t delay, std::function<void()> func) {