diff --git a/boards.txt b/boards.txt index e362408c4..c6e34b3f8 100644 --- a/boards.txt +++ b/boards.txt @@ -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) diff --git a/platform.txt b/platform.txt index 37512c1d1..9ac2dc2cc 100644 --- a/platform.txt +++ b/platform.txt @@ -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 diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 16414352e..36cf2f01f 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -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)'), diff --git a/tools/platformio-build.py b/tools/platformio-build.py index 6c52fd670..8a7fdf923 100644 --- a/tools/platformio-build.py +++ b/tools/platformio-build.py @@ -175,16 +175,21 @@ elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313" in flatten_cppdefines: 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 diff --git a/tools/sdk/lib/NONOSDK22x_191105/commitlog-from-22x-191024.txt.gz b/tools/sdk/lib/NONOSDK22x_191105/commitlog-from-22x-191024.txt.gz new file mode 100644 index 000000000..c6e287781 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/commitlog-from-22x-191024.txt.gz differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/libairkiss.a b/tools/sdk/lib/NONOSDK22x_191105/libairkiss.a new file mode 100644 index 000000000..cfdcc8423 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/libairkiss.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/libcrypto.a b/tools/sdk/lib/NONOSDK22x_191105/libcrypto.a new file mode 100644 index 000000000..8a43cb727 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/libcrypto.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/libespnow.a b/tools/sdk/lib/NONOSDK22x_191105/libespnow.a new file mode 100644 index 000000000..92f6c9ab1 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/libespnow.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/libmain.a b/tools/sdk/lib/NONOSDK22x_191105/libmain.a new file mode 100644 index 000000000..2bc985793 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/libmain.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/libnet80211.a b/tools/sdk/lib/NONOSDK22x_191105/libnet80211.a new file mode 100644 index 000000000..2d49d922e Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/libnet80211.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/libphy.a b/tools/sdk/lib/NONOSDK22x_191105/libphy.a new file mode 100644 index 000000000..cab912d28 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/libphy.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/libpp.a b/tools/sdk/lib/NONOSDK22x_191105/libpp.a new file mode 100644 index 000000000..2abbe7a3e Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/libpp.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/libsmartconfig.a b/tools/sdk/lib/NONOSDK22x_191105/libsmartconfig.a new file mode 100644 index 000000000..95aec76c6 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/libsmartconfig.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/libwpa.a b/tools/sdk/lib/NONOSDK22x_191105/libwpa.a new file mode 100644 index 000000000..41ad4876f Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/libwpa.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/libwpa2.a b/tools/sdk/lib/NONOSDK22x_191105/libwpa2.a new file mode 100644 index 000000000..07420c5bf Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/libwpa2.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/libwps.a b/tools/sdk/lib/NONOSDK22x_191105/libwps.a new file mode 100644 index 000000000..ef0be1c35 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191105/libwps.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191105/version b/tools/sdk/lib/NONOSDK22x_191105/version new file mode 100644 index 000000000..06b3bba6f --- /dev/null +++ b/tools/sdk/lib/NONOSDK22x_191105/version @@ -0,0 +1 @@ +v2.2.1-113-g1848ef1 (shows as SDK:2.2.2-dev(bb83b9b) in debug mode)