arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-13 13:01:55 +03:00
Code Activity

Fix CPPDEFINES loop (#8744)

Browse Source 
Expect that (key, value) can be (key,)
This commit is contained in:
Max Prokhorov
2022-12-06 17:33:58 +03:00
committed by GitHub
parent 93537f94a8
commit 3c6253109d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/platformio-build.py
View File

@ -196,7 +196,7 @@ nonosdk_version = NONOSDK_VERSIONS[0]
NONOSDK_PREFIX = "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_" NONOSDK_PREFIX = "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_"
for define in env["CPPDEFINES"]: for define in env["CPPDEFINES"]:
if isinstance(define, (tuple, list)): if isinstance(define, (tuple, list)):
define, _ = define define, *_ = define
if define.startswith(NONOSDK_PREFIX): if define.startswith(NONOSDK_PREFIX):
for version in NONOSDK_VERSIONS: for version in NONOSDK_VERSIONS:
name, _ = version name, _ = version
@ -204,7 +204,7 @@ for define in env["CPPDEFINES"]:
nonosdk_version = version nonosdk_version = version
NONOSDK_LIBPATH=join(FRAMEWORK_DIR, "tools", "sdk", "lib", nonosdk_version[1]) NONOSDK_LIBPATH=join(FRAMEWORK_DIR, "tools", "sdk", "lib", nonosdk_version[1])
assert(isdir(NONOSDK_LIBPATH)) assert isdir(NONOSDK_LIBPATH)
env.Append( env.Append(
CPPDEFINES=[(nonosdk_version[1], 1)], CPPDEFINES=[(nonosdk_version[1], 1)],
@ -336,7 +336,7 @@ elif "PIO_FRAMEWORK_ARDUINO_MMU_CUSTOM" in flatten_cppdefines:
for flag in env["CPPDEFINES"]: for flag in env["CPPDEFINES"]:
define = flag define = flag
if isinstance(flag, (tuple, list)): if isinstance(flag, (tuple, list)):
define, _ = flag define, *_ = flag
if define.startswith("MMU_"): if define.startswith("MMU_"):
mmu_flags.append(flag) mmu_flags.append(flag)
# PIO_FRAMEWORK_ARDUINO_MMU_CACHE32_IRAM32 (default) # PIO_FRAMEWORK_ARDUINO_MMU_CACHE32_IRAM32 (default)