Skip to content

FW: use NONOS-SDK branch 2.2.x from 2019-10-24 by default #6724

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 6 commits into from
Nov 8, 2019
Merged

FW: use NONOS-SDK branch 2.2.x from 2019-10-24 by default #6724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c738b4
FW: use NONOS-SDK branch 2.2.x from 2019-10-24 by default
d-a-v Nov 7, 2019
1cd9bad
tv qvoqve, Platform-ii
d-a-v Nov 7, 2019
bcd9ecb
nonos-sdk v2.2.x from 2019-11-05 by default for all boards
d-a-v Nov 7, 2019
7b1e42b
(w/ fw files)
d-a-v Nov 7, 2019
6eb5c6b
191024 by default, 191105 is an option
d-a-v Nov 7, 2019
d9b740b
Merge branch 'master' into defaultfw101024
d-a-v Nov 7, 2019
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
10 changes: 6 additions & 4 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,10 +372,12 @@ generic.menu.led.15=15
generic.menu.led.15.build.led=-DLED_BUILTIN=15
generic.menu.led.16=16
generic.menu.led.16.build.led=-DLED_BUILTIN=16
generic.menu.sdk.nonosdk222_100=nonos-sdk 2.2.1+100 (190703 approved)
generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22x_190703
generic.menu.sdk.nonosdk222_111=nonos-sdk 2.2.1+111 (191024 testing)
generic.menu.sdk.nonosdk222_111.build.sdk=NONOSDK22x_191024
generic.menu.sdk.nonosdk_191024=nonos-sdk 2.2.1+111 (191024)
generic.menu.sdk.nonosdk_191024.build.sdk=NONOSDK22x_191024
generic.menu.sdk.nonosdk_191105=nonos-sdk 2.2.1+113 (191105)
generic.menu.sdk.nonosdk_191105.build.sdk=NONOSDK22x_191105
generic.menu.sdk.nonosdk_190703=nonos-sdk 2.2.1+100 (190703)
generic.menu.sdk.nonosdk_190703.build.sdk=NONOSDK22x_190703
generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
Expand Down
7 changes: 6 additions & 1 deletion platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ build.stdcpp_level=-std=gnu++11

build.float=-u _printf_float -u _scanf_float
build.led=
build.sdk=NONOSDK22x_190703

# default SDK for all boards
# (generic board overrides this variable)
#build.sdk=NONOSDK22x_190703
build.sdk=NONOSDK22x_191024
#build.sdk=NONOSDK22x_191105

compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
compiler.sdk.path={runtime.platform.path}/tools/sdk
Expand Down
14 changes: 8 additions & 6 deletions tools/boards.txt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,12 +1382,14 @@ def led (default,max):

def sdk ():
return { 'sdk': collections.OrderedDict([
('.menu.sdk.nonosdk222_100', 'nonos-sdk 2.2.1+100 (190703 approved)'),
('.menu.sdk.nonosdk222_100.build.sdk', 'NONOSDK22x_190703'),
('.menu.sdk.nonosdk222_111', 'nonos-sdk 2.2.1+111 (191024 testing)'),
('.menu.sdk.nonosdk222_111.build.sdk', 'NONOSDK22x_191024'),
# ('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (190313 testing)'),
# ('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x_190313'),
('.menu.sdk.nonosdk_191024', 'nonos-sdk 2.2.1+111 (191024)'),
('.menu.sdk.nonosdk_191024.build.sdk', 'NONOSDK22x_191024'),
('.menu.sdk.nonosdk_191105', 'nonos-sdk 2.2.1+113 (191105)'),
('.menu.sdk.nonosdk_191105.build.sdk', 'NONOSDK22x_191105'),
('.menu.sdk.nonosdk_190703', 'nonos-sdk 2.2.1+100 (190703)'),
('.menu.sdk.nonosdk_190703.build.sdk', 'NONOSDK22x_190703'),
# ('.menu.sdk.nonosdk_190313', 'nonos-sdk 2.2.1+61 (190313 testing)'),
# ('.menu.sdk.nonosdk_190313.build.sdk', 'NONOSDK22x_190313'),
('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (180626 known issues)'),
Expand Down
17 changes: 11 additions & 6 deletions tools/platformio-build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,16 +175,21 @@ def scons_patched_match_splitext(path, suffixes=None):
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")]
)
else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22x_190703", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190703")]
)
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")]
)
else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22x_191024", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191024")]
)

#
# lwIP
Expand Down
Binary file added tools/sdk/lib/NONOSDK22x_191105/commitlog-from-22x-191024.txt.gz
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191105/libairkiss.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191105/libcrypto.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191105/libespnow.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191105/libmain.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191105/libnet80211.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191105/libphy.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191105/libpp.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191105/libsmartconfig.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191105/libwpa.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191105/libwpa2.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191105/libwps.a
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tools/sdk/lib/NONOSDK22x_191105/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v2.2.1-113-g1848ef1 (shows as SDK:2.2.2-dev(bb83b9b) in debug mode)