Skip to content

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

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
Oct 27, 2019
Merged

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

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
2fca5f1
sdk: testing branch update (v2.2.x), tidy up fw names in menus, add d…
d-a-v Oct 26, 2019
53acc83
Merge branch 'master' into sdk191024
d-a-v Oct 26, 2019
313ca50
Merge branch 'master' into sdk191024
d-a-v Oct 27, 2019
b2ec520
Keep current FW as default until next release
d-a-v Oct 27, 2019
4f255d5
Merge branch 'sdk191024' of github.com:d-a-v/Arduino into sdk191024
d-a-v Oct 27, 2019
c7426f8
update for PIO
d-a-v Oct 27, 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
8 changes: 5 additions & 3 deletions boards.txt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
0 .../lib/NONOSDK22x/commitlog-from-221.txt.gz → ...NOSDK22x_190313/commitlog-from-221.txt.gz
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/libairkiss.a → tools/sdk/lib/NONOSDK22x_190313/libairkiss.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/libcrypto.a → tools/sdk/lib/NONOSDK22x_190313/libcrypto.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/libespnow.a → tools/sdk/lib/NONOSDK22x_190313/libespnow.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/libmain.a → tools/sdk/lib/NONOSDK22x_190313/libmain.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/libnet80211.a → ...s/sdk/lib/NONOSDK22x_190313/libnet80211.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/libphy.a → tools/sdk/lib/NONOSDK22x_190313/libphy.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/libpp.a → tools/sdk/lib/NONOSDK22x_190313/libpp.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/libsmartconfig.a → ...dk/lib/NONOSDK22x_190313/libsmartconfig.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/libwpa.a → tools/sdk/lib/NONOSDK22x_190313/libwpa.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/libwpa2.a → tools/sdk/lib/NONOSDK22x_190313/libwpa2.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/libwps.a → tools/sdk/lib/NONOSDK22x_190313/libwps.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22x/version → tools/sdk/lib/NONOSDK22x_190313/version
View file
Open in desktop
File renamed without changes.
0 .../lib/NONOSDK22y/commitlog-from-22x.txt.gz → ...x_190703/commitlog-from-22x-190313.txt.gz
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/libairkiss.a → tools/sdk/lib/NONOSDK22x_190703/libairkiss.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/libcrypto.a → tools/sdk/lib/NONOSDK22x_190703/libcrypto.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/libespnow.a → tools/sdk/lib/NONOSDK22x_190703/libespnow.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/libmain.a → tools/sdk/lib/NONOSDK22x_190703/libmain.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/libnet80211.a → ...s/sdk/lib/NONOSDK22x_190703/libnet80211.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/libphy.a → tools/sdk/lib/NONOSDK22x_190703/libphy.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/libpp.a → tools/sdk/lib/NONOSDK22x_190703/libpp.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/libsmartconfig.a → ...dk/lib/NONOSDK22x_190703/libsmartconfig.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/libwpa.a → tools/sdk/lib/NONOSDK22x_190703/libwpa.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/libwpa2.a → tools/sdk/lib/NONOSDK22x_190703/libwpa2.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/libwps.a → tools/sdk/lib/NONOSDK22x_190703/libwps.a
View file
Open in desktop
File renamed without changes.
0 tools/sdk/lib/NONOSDK22y/version → tools/sdk/lib/NONOSDK22x_190703/version
View file
Open in desktop
File renamed without changes.
Binary file added tools/sdk/lib/NONOSDK22x_191024/commitlog-from-22x-190703.txt.gz
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libairkiss.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libcrypto.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libespnow.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libmain.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libnet80211.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libphy.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libpp.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libsmartconfig.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libwpa.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libwpa2.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191024/libwps.a
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tools/sdk/lib/NONOSDK22x_191024/version
View file
Open in desktop
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)