github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-24 12:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] Add ESP8266 support to wake_loop_any_context() (#14392)

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-02 11:11:04 -10:00
committed by GitHub
parent 38f671a923
commit d1de50c0e5
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/socket/lwip_raw_tcp_impl.cpp
View File

@@ -36,7 +36,7 @@ void socket_delay(uint32_t ms) {
esp_delay(ms, []() { return !s_socket_woke; });
}
void socket_wake() {
void IRAM_ATTR socket_wake() {
s_socket_woke = true;
esp_schedule();
}

5
esphome/components/socket/socket.h
View File

@@ -86,8 +86,9 @@ size_t format_sockaddr_to(const struct sockaddr *addr_ptr, socklen_t len, std::s
/// On ESP8266, lwip callbacks set a flag and call esp_schedule() to wake the delay.
void socket_delay(uint32_t ms);
/// Called by lwip callbacks to signal socket activity and wake delay.
void socket_wake();
/// Signal socket/IO activity and wake the main loop from esp_delay() early.
/// ISR-safe: uses IRAM_ATTR internally and only sets a volatile flag + esp_schedule().
void socket_wake(); // NOLINT(readability-redundant-declaration)
#endif
} // namespace esphome::socket

12
esphome/core/application.h
View File

@@ -34,7 +34,11 @@
#endif
#endif
#endif // USE_SOCKET_SELECT_SUPPORT
#if defined(USE_ESP8266) && defined(USE_SOCKET_IMPL_LWIP_TCP)
namespace esphome::socket {
void socket_wake(); // NOLINT(readability-redundant-declaration)
} // namespace esphome::socket
#endif
#ifdef USE_BINARY_SENSOR
#include "esphome/components/binary_sensor/binary_sensor.h"
#endif
@@ -530,6 +534,12 @@ class Application {
#endif
#endif
#if defined(USE_ESP8266) && defined(USE_SOCKET_IMPL_LWIP_TCP)
/// Wake the main event loop from any context (ISR, thread, or main loop).
/// On ESP8266: sets the socket wake flag and calls esp_schedule() to exit esp_delay() early.
static void IRAM_ATTR wake_loop_any_context() { socket::socket_wake(); }
#endif
protected:
friend Component;
#ifdef USE_SOCKET_SELECT_SUPPORT

9
esphome/core/component.cpp
View File

@@ -323,10 +323,11 @@ void IRAM_ATTR HOT Component::enable_loop_soon_any_context() {
// 8. Race condition with main loop is handled by clearing flag before processing
this->pending_enable_loop_ = true;
App.has_pending_enable_loop_requests_ = true;
#if defined(USE_LWIP_FAST_SELECT) && defined(USE_ESP32)
// Wake the main loop if sleeping in ulTaskNotifyTake(). Without this,
// the main loop would not wake until the select timeout expires (~16ms).
// Uses xPortInIsrContext() to choose the correct FreeRTOS notify API.
#if (defined(USE_LWIP_FAST_SELECT) && defined(USE_ESP32)) || (defined(USE_ESP8266) && defined(USE_SOCKET_IMPL_LWIP_TCP))
// Wake the main loop from sleep. Without this, the main loop would not
// wake until the select/delay timeout expires (~16ms).
// ESP32: uses xPortInIsrContext() to choose the correct FreeRTOS notify API.
// ESP8266: sets socket wake flag and calls esp_schedule() to exit esp_delay() early.
Application::wake_loop_any_context();
#endif
}