From bde2d643eca430b6cae3f1487eeba9a0c9732076 Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Fri, 4 Aug 2023 15:40:31 +0300 Subject: [PATCH 1/3] Sync PlatformIO build scripts (#8488) Added special handling of the `ARDUINO_BUILD_CORE` macro required only for the core files --- tools/platformio-build.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/platformio-build.py b/tools/platformio-build.py index e3c7b50db..5b11c1a9b 100644 --- a/tools/platformio-build.py +++ b/tools/platformio-build.py @@ -172,6 +172,10 @@ SConscript( # Target: Build Core Library # +# Set -DARDUINO_CORE_BUILD only for the core library +corelib_env = env.Clone() +corelib_env.Append(CPPDEFINES=["ARDUINO_CORE_BUILD"]) + libs = [] variants_dir = join(FRAMEWORK_DIR, "variants") @@ -181,13 +185,14 @@ if "build.variants_dir" in board_config: if "build.variant" in board_config: env.Append(CPPPATH=[join(variants_dir, board_config.get("build.variant"))]) - env.BuildSources( + corelib_env.Append(CPPPATH=[join(variants_dir, board_config.get("build.variant"))]) + corelib_env.BuildSources( join("$BUILD_DIR", "FrameworkArduinoVariant"), join(variants_dir, board_config.get("build.variant")), ) libs.append( - env.BuildLibrary( + corelib_env.BuildLibrary( join("$BUILD_DIR", "FrameworkArduino"), join(FRAMEWORK_DIR, "cores", board_config.get("build.core")), ) From e1f14331f173a00a9062f616bc9a62c358b9076f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Barto=C5=A1ka?= <76958047+VojtechBartoska@users.noreply.github.com> Date: Fri, 4 Aug 2023 15:27:54 +0200 Subject: [PATCH 2/3] Add v2.0.11 into issue template (#8460) --- .github/ISSUE_TEMPLATE/Issue-report.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/Issue-report.yml b/.github/ISSUE_TEMPLATE/Issue-report.yml index 05d929c87..3628cba1f 100644 --- a/.github/ISSUE_TEMPLATE/Issue-report.yml +++ b/.github/ISSUE_TEMPLATE/Issue-report.yml @@ -41,6 +41,7 @@ body: options: - latest master (checkout manually) - latest development Release Candidate (RC-X) + - v2.0.11 - v2.0.10 - v2.0.9 - v2.0.8 From e9346a635d21c4d48e4cabfb579d9ba844ba3bb5 Mon Sep 17 00:00:00 2001 From: Tomas Pilny Date: Fri, 11 Aug 2023 11:28:13 +0200 Subject: [PATCH 3/3] Removed duplicate MDNS.begin() call in example --- libraries/HTTPUpdateServer/examples/WebUpdater/WebUpdater.ino | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/HTTPUpdateServer/examples/WebUpdater/WebUpdater.ino b/libraries/HTTPUpdateServer/examples/WebUpdater/WebUpdater.ino index f2503a7ef..21688c3e7 100644 --- a/libraries/HTTPUpdateServer/examples/WebUpdater/WebUpdater.ino +++ b/libraries/HTTPUpdateServer/examples/WebUpdater/WebUpdater.ino @@ -33,8 +33,7 @@ void setup(void) { Serial.println("WiFi failed, retrying."); } - MDNS.begin(host); - if (MDNS.begin("esp32")) { + if (MDNS.begin(host)) { Serial.println("mDNS responder started"); }