8000 Added NONOS SDK 3.0.0 ~ 3.0.5 (again) by metarutaiga · Pull Request #8736 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

Added NONOS SDK 3.0.0 ~ 3.0.5 (again) #8736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Dec 6, 2022
Merged

Added NONOS SDK 3.0.0 ~ 3.0.5 (again) #8736

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
69764e7
Added NONOS SDK 3.0.0 ~ 3.0.5
Nov 18, 2022
a07c735
Added user_pre_init
Nov 18, 2022
e155513
rf_cal[0] !=0x05,is 0x00
Nov 19, 2022
f916c75
# Remove mem_manager.o from libmain.a to use custom heap implementati…
Nov 25, 2022
fe5a82f
user_rf_pre_init
Dec 1, 2022
f4cf576
Add system_func1() called by system_restart_local()
Dec 1, 2022
0350ce5
Add commit log text
Dec 1, 2022
069b5fa
Fixed user_rf_pre_init
Dec 1, 2022
c3c8018
Style
Dec 1, 2022
f2397e7
pio sdks
mcspr Dec 4, 2022
3e8a713
Merge remote-tracking branch 'origin/master' into pr8736
mcspr Dec 6, 2022
599d5b9
Merge remote-tracking branch 'origin/master' into pr8736
mcspr Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pio sdks
  • Loading branch information
@mcspr
mcspr committed Dec 6, 2022
commit f2397e7b5ccf04ac6a2ec14622dc728bd8f43da7
74 changes: 36 additions & 38 deletions tools/platformio-build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,51 +173,49 @@ def scons_patched_match_splitext(path, suffixes=None):
)
)

flatten_cppdefines = env.Flatten(env['CPPDEFINES'])

#
# SDK
#
if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK3V0", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK3V0")]
)
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221" in flatten_cppdefines:
#(previous default)
env.Append(
CPPDEFINES=[("NONOSDK221", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK221")]
)
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22x_190313", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190313")]
)
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22x_191024", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191024")]
)
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22x_191105", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191105")]
)
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191122" in flatten_cppdefines:
env.Append(
C B26C PPDEFINES=[("NONOSDK22x_191122", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191122")]
)
else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22x_190703", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190703")]
)
NONOSDK_VERSIONS = (
("SDK22x_190703", "NONOSDK22x_190703"),
("SDK221", "NONOSDK221"),
("SDK22x_190313", "NONOSDK22x_190313"),
("SDK22x_191024", "NONOSDK22x_191024"),
("SDK22x_191105", "NONOSDK22x_191105"),
("SDK22x_191122", "NONOSDK22x_191122"),
("SDK3", "NONOSDK3V0"),
("SDK300", "NONOSDK300"),
("SDK301", "NONOSDK301"),
("SDK302", "NONOSDK302"),
("SDK303", "NONOSDK303"),
("SDK304", "NONOSDK304"),
("SDK305", "NONOSDK305"),
)
nonosdk_version = NONOSDK_VERSIONS[0]

NONOSDK_PREFIX = "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_"
for define in env["CPPDEFINES"]:
if isinstance(define, (tuple, list)):
define, _ = define
if define.startswith(NONOSDK_PREFIX):
for version in NONOSDK_VERSIONS:
name, _ = version
if define.endswith(name):
nonosdk_version = version

NONOSDK_LIBPATH=join(FRAMEWORK_DIR, "tools", "sdk", "lib", nonosdk_version[1])
assert(isdir(NONOSDK_LIBPATH))

env.Append(
CPPDEFINES=[(nonosdk_version[1], 1)],
LIBPATH=[NONOSDK_LIBPATH],
)

#
# lwIP
#
flatten_cppdefines = env.Flatten(env["CPPDEFINES"])

lwip_lib = None
if "PIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_LOW_MEMORY" in flatten_cppdefines:
env.Append(
Expand Down
0