Skip to content

Commit

Permalink
sdk: testing branch update (v2.2.x), tidy up fw names in menus, add d…
Browse files Browse the repository at this point in the history
…ates (#6672)

* sdk: testing branch update (v2.2.x), tidy up fw names in menus, add dates

Former default SDK (22y, renamed to 22x-190703) is still available
Changelog is included in sdk directory

* Keep current FW as default until next release

* update for PIO
  • Loading branch information
d-a-v authored and earlephilhower committed Oct 27, 2019
1 parent 36c369b commit ba50bd5
Show file tree
Hide file tree
Showing 43 changed files with 27 additions and 17 deletions.
8 changes: 5 additions & 3 deletions boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,13 @@ 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 (testing)
generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22y
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.nonosdk221=nonos-sdk 2.2.1 (legacy)
generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (known issues)
generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
generic.menu.ip.lm2f=v2 Lower Memory
generic.menu.ip.lm2f.build.lwip_include=lwip2/include
Expand Down
2 changes: 1 addition & 1 deletion platform.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ build.stdcpp_level=-std=gnu++11

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

compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
compiler.sdk.path={runtime.platform.path}/tools/sdk
Expand Down
12 changes: 7 additions & 5 deletions tools/boards.txt.py
Original file line number Diff line number Diff line change
Expand Up @@ -1366,13 +1366,15 @@ def led (default,max):

def sdk ():
return { 'sdk': collections.OrderedDict([
('.menu.sdk.nonosdk222_100', 'nonos-sdk 2.2.1+100 (testing)'),
('.menu.sdk.nonosdk222_100.build.sdk', 'NONOSDK22y'),
('.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.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
# ('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (testing)'),
# ('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x'),
('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (known issues)'),
('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (180626 known issues)'),
('.menu.sdk.nonosdk3v0.build.sdk', 'NONOSDK3V0'),
])
}
Expand Down
21 changes: 13 additions & 8 deletions tools/platformio-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,21 +164,26 @@ def scons_patched_match_splitext(path, suffixes=None):
CPPDEFINES=[("NONOSDK3V0", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK3V0")]
)
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22x", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x")]
)
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221" in flatten_cppdefines:
#(previous default)
env.Append(
CPPDEFINES=[("NONOSDK221", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK221")]
)
else: #(default) elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y" in flatten_cppdefines:
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")]
)
else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22y", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22y")]
CPPDEFINES=[("NONOSDK22x_190703", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190703")]
)

#
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libairkiss.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libcrypto.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libespnow.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libmain.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libnet80211.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libphy.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libpp.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libsmartconfig.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libwpa.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libwpa2.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libwps.a
Binary file not shown.
1 change: 1 addition & 0 deletions tools/sdk/lib/NONOSDK22x_191024/version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v2.2.1-111-gef6d0ed (shows as SDK:2.2.2-dev(5ab15d1) in debug mode)

0 comments on commit ba50bd5

Please sign in to comment.