github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-13 08:17:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] Match wake storage conditionals across platform TUs

Browse Source 
ESPHome's defines.h unconditionally #defines every feature flag for
static analysis, so clang-tidy sees ESPHOME_THREAD_MULTI_ATOMICS even
when building wake_esp8266.cpp / wake_rp2040.cpp / wake_generic.cpp.
In that mode wake.h picks the std::atomic<uint8_t> extern, and the
plain-volatile definitions in those TUs trip a redefinition error.

Guard each TU's g_wake_requested with the same
ESPHOME_THREAD_MULTI_ATOMICS check wake.h uses. Real builds still pick
volatile on every SINGLE platform.
This commit is contained in:
J. Nick Koston
2026-04-24 12:50:23 -05:00
parent 881c74febc
commit 522395f93b
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/wake/wake_esp8266.cpp
+7 -1
View File
@@ -8,9 +8,15 @@
namespace esphome {
// === Wake-requested flag + main-loop woke flag storage ===
// ESP8266 is always ESPHOME_THREAD_SINGLE.
// ESP8266 is always ESPHOME_THREAD_SINGLE in real builds, but defines.h (used
// for static analysis / IDE) can define ESPHOME_THREAD_MULTI_ATOMICS alongside
// USE_ESP8266, so the storage type here has to match wake.h's conditional.
// NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
#ifdef ESPHOME_THREAD_MULTI_ATOMICS
std::atomic<uint8_t> g_wake_requested{0};
#else
volatile uint8_t g_wake_requested = 0;
#endif
volatile bool g_main_loop_woke = false;
// NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
esphome/core/wake/wake_generic.cpp
+10 -2
View File
@@ -8,9 +8,17 @@
namespace esphome {
// === Wake-requested flag storage ===
// Fallback platforms (currently only Zephyr/NRF52) are ESPHOME_THREAD_SINGLE.
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
// Fallback platforms (currently only Zephyr/NRF52) are ESPHOME_THREAD_SINGLE in
// real builds, but defines.h (used for static analysis / IDE) can define
// ESPHOME_THREAD_MULTI_ATOMICS here too, so the storage type has to match
// wake.h's conditional.
// NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
#ifdef ESPHOME_THREAD_MULTI_ATOMICS
std::atomic<uint8_t> g_wake_requested{0};
#else
volatile uint8_t g_wake_requested = 0;
#endif
// NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
} // namespace esphome
esphome/core/wake/wake_rp2040.cpp
+7 -1
View File
@@ -11,9 +11,15 @@
namespace esphome {
// === Wake-requested flag + main-loop woke flag storage ===
// RP2040 is always ESPHOME_THREAD_SINGLE.
// RP2040 is always ESPHOME_THREAD_SINGLE in real builds, but defines.h (used
// for static analysis / IDE) can define ESPHOME_THREAD_MULTI_ATOMICS alongside
// USE_RP2040, so the storage type here has to match wake.h's conditional.
// NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
#ifdef ESPHOME_THREAD_MULTI_ATOMICS
std::atomic<uint8_t> g_wake_requested{0};
#else
volatile uint8_t g_wake_requested = 0;
#endif
volatile bool g_main_loop_woke = false;
// NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)