adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into add-adafruit-metro-s3

Browse source
This commit is contained in:
hathach 2023-08-14 11:04:56 +07:00
commit 061c02dbc2
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/ISSUE_TEMPLATE/Issue-report.yml vendored
View file

@ -41,6 +41,7 @@ body:
options: options:
- latest master (checkout manually) - latest master (checkout manually)
- latest development Release Candidate (RC-X) - latest development Release Candidate (RC-X)
- v2.0.11
- v2.0.10 - v2.0.10
- v2.0.9 - v2.0.9
- v2.0.8 - v2.0.8

3
libraries/HTTPUpdateServer/examples/WebUpdater/WebUpdater.ino
View file

@ -33,8 +33,7 @@ void setup(void) {
Serial.println("WiFi failed, retrying."); Serial.println("WiFi failed, retrying.");
} }
MDNS.begin(host); if (MDNS.begin(host)) {
if (MDNS.begin("esp32")) {
Serial.println("mDNS responder started"); Serial.println("mDNS responder started");
} }

9
tools/platformio-build.py
View file

@ -172,6 +172,10 @@ SConscript(
# Target: Build Core Library # 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 = [] libs = []
variants_dir = join(FRAMEWORK_DIR, "variants") variants_dir = join(FRAMEWORK_DIR, "variants")
@ -181,13 +185,14 @@ if "build.variants_dir" in board_config:
if "build.variant" in board_config: if "build.variant" in board_config:
env.Append(CPPPATH=[join(variants_dir, board_config.get("build.variant"))]) 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("$BUILD_DIR", "FrameworkArduinoVariant"),
join(variants_dir, board_config.get("build.variant")), join(variants_dir, board_config.get("build.variant")),
) )
libs.append( libs.append(
env.BuildLibrary( corelib_env.BuildLibrary(
join("$BUILD_DIR", "FrameworkArduino"), join("$BUILD_DIR", "FrameworkArduino"),
join(FRAMEWORK_DIR, "cores", board_config.get("build.core")), join(FRAMEWORK_DIR, "cores", board_config.get("build.core")),
) )