mirror of
https://github.com/esphome/esphome.git
synced 2024-11-13 02:37:47 +01:00
Arduino global delay/millis/... symbols workaround (#2575)
This commit is contained in:
parent
e39f314e7a
commit
f41f7994a3
1 changed files with 28 additions and 0 deletions
|
@ -206,6 +206,31 @@ def include_file(path, basename):
|
||||||
cg.add_global(cg.RawStatement(f'#include "{basename}"'))
|
cg.add_global(cg.RawStatement(f'#include "{basename}"'))
|
||||||
|
|
||||||
|
|
||||||
|
ARDUINO_GLUE_CODE = """\
|
||||||
|
#define yield() esphome::yield()
|
||||||
|
#define millis() esphome::millis()
|
||||||
|
#define delay(x) esphome::delay(x)
|
||||||
|
#define delayMicroseconds(x) esphome::delayMicroseconds(x)
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
@coroutine_with_priority(-999.0)
|
||||||
|
async def add_arduino_global_workaround():
|
||||||
|
# The Arduino framework defined these itself in the global
|
||||||
|
# namespace. For the esphome codebase that is not a problem,
|
||||||
|
# but when custom code
|
||||||
|
# 1. writes `millis()` for example AND
|
||||||
|
# 2. has `using namespace esphome;` like our guides suggest
|
||||||
|
# Then the compiler will complain that the call is ambiguous
|
||||||
|
# Define a hacky macro so that the call is never ambiguous
|
||||||
|
# and always uses the esphome namespace one.
|
||||||
|
# See also https://github.com/esphome/issues/issues/2510
|
||||||
|
# Priority -999 so that it runs before adding includes, as those
|
||||||
|
# also might reference these symbols
|
||||||
|
for line in ARDUINO_GLUE_CODE.splitlines():
|
||||||
|
cg.add_global(cg.RawStatement(line))
|
||||||
|
|
||||||
|
|
||||||
@coroutine_with_priority(-1000.0)
|
@coroutine_with_priority(-1000.0)
|
||||||
async def add_includes(includes):
|
async def add_includes(includes):
|
||||||
# Add includes at the very end, so that the included files can access global variables
|
# Add includes at the very end, so that the included files can access global variables
|
||||||
|
@ -287,6 +312,9 @@ async def to_code(config):
|
||||||
cg.add_build_flag("-Wno-unused-but-set-variable")
|
cg.add_build_flag("-Wno-unused-but-set-variable")
|
||||||
cg.add_build_flag("-Wno-sign-compare")
|
cg.add_build_flag("-Wno-sign-compare")
|
||||||
|
|
||||||
|
if CORE.using_arduino:
|
||||||
|
CORE.add_job(add_arduino_global_workaround)
|
||||||
|
|
||||||
if config[CONF_INCLUDES]:
|
if config[CONF_INCLUDES]:
|
||||||
CORE.add_job(add_includes, config[CONF_INCLUDES])
|
CORE.add_job(add_includes, config[CONF_INCLUDES])
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue