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

Merge remote-tracking branch 'dala318/multi_device' into multi_device

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-22 13:02:48 +02:00
parent 502b8a6073 8a725250a9
commit 3c07a186b2
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/host/__init__.py
View File

@@ -41,6 +41,6 @@ CONFIG_SCHEMA = cv.All(
async def to_code(config): async def to_code(config):
cg.add_build_flag("-DUSE_HOST") cg.add_build_flag("-DUSE_HOST")
cg.add_define("USE_ESPHOME_HOST_MAC_ADDRESS", config[CONF_MAC_ADDRESS].parts) cg.add_define("USE_ESPHOME_HOST_MAC_ADDRESS", config[CONF_MAC_ADDRESS].parts)
cg.add_build_flag("-std=c++17") cg.add_build_flag("-std=gnu++17")
cg.add_define("ESPHOME_BOARD", "host") cg.add_define("ESPHOME_BOARD", "host")
cg.add_platformio_option("platform", "platformio/native") cg.add_platformio_option("platform", "platformio/native")

6
esphome/cpp_generator.py
View File

@@ -616,6 +616,12 @@ def add_build_unflag(build_unflag: str) -> None:
def set_cpp_standard(standard: str) -> None: def set_cpp_standard(standard: str) -> None:
"""Set C++ standard with compiler flag `-std={standard}`.""" """Set C++ standard with compiler flag `-std={standard}`."""
CORE.add_build_unflag("-std=gnu++11") CORE.add_build_unflag("-std=gnu++11")
CORE.add_build_unflag("-std=gnu++14")
CORE.add_build_unflag("-std=gnu++20")
CORE.add_build_unflag("-std=gnu++23")
CORE.add_build_unflag("-std=gnu++2a")
CORE.add_build_unflag("-std=gnu++2b")
CORE.add_build_unflag("-std=gnu++2c")
CORE.add_build_flag(f"-std={standard}") CORE.add_build_flag(f"-std={standard}")

6
platformio.ini
View File

@@ -50,6 +50,12 @@ build_flags =
-std=gnu++17 -std=gnu++17
build_unflags = build_unflags =
-std=gnu++11 -std=gnu++11
-std=gnu++14
-std=gnu++20
-std=gnu++23
-std=gnu++2a
-std=gnu++2b
-std=gnu++2c
src_filter = src_filter =
+<./> +<./>
+<../tests/dummy_main.cpp> +<../tests/dummy_main.cpp>

2
requirements.txt
View File

@@ -10,7 +10,7 @@ tzlocal==5.3.1 # from time
tzdata>=2021.1 # from time tzdata>=2021.1 # from time
pyserial==3.5 pyserial==3.5
platformio==6.1.18 # When updating platformio, also update /docker/Dockerfile platformio==6.1.18 # When updating platformio, also update /docker/Dockerfile
esptool==4.8.1 esptool==4.9.0
click==8.1.7 click==8.1.7
esphome-dashboard==20250514.0 esphome-dashboard==20250514.0
aioesphomeapi==32.2.4 aioesphomeapi==32.2.4