arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

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

Browse Source 
* FW: use NONOS-SDK branch 2.2.x from 2019-10-24 by default
former one is available when using generic board configuration

* tv qvoqve, Platform-ii

* nonos-sdk v2.2.x from 2019-11-05 by default for all boards
(previous ones can be selected with the generic board)

* (w/ fw files)

* 191024 by default, 191105 is an option
This commit is contained in:
david gauchard 2019-11-08 11:41:22 +01:00 committed by GitHub
parent 453eb2d064
commit 1ec3683ca0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boards.txt
View File

@ -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)

7
platform.txt
View File

@ -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

14
tools/boards.txt.py
View File

@ -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)'),

17
tools/platformio-build.py
View File

@ -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

BIN
tools/sdk/lib/NONOSDK22x_191105/commitlog-from-22x-191024.txt.gz Normal file
View File

Binary file not shown.

BIN
tools/sdk/lib/NONOSDK22x_191105/libairkiss.a Normal file
View File

Binary file not shown.

BIN
tools/sdk/lib/NONOSDK22x_191105/libcrypto.a Normal file
View File

Binary file not shown.

BIN
tools/sdk/lib/NONOSDK22x_191105/libespnow.a Normal file
View File

Binary file not shown.

BIN
tools/sdk/lib/NONOSDK22x_191105/libmain.a Normal file
View File

Binary file not shown.

BIN
tools/sdk/lib/NONOSDK22x_191105/libnet80211.a Normal file
View File

Binary file not shown.

BIN
tools/sdk/lib/NONOSDK22x_191105/libphy.a Normal file
View File

Binary file not shown.

BIN
tools/sdk/lib/NONOSDK22x_191105/libpp.a Normal file
View File

Binary file not shown.

BIN
tools/sdk/lib/NONOSDK22x_191105/libsmartconfig.a Normal file
View File

Binary file not shown.

BIN
tools/sdk/lib/NONOSDK22x_191105/libwpa.a Normal file
View File

Binary file not shown.

BIN
tools/sdk/lib/NONOSDK22x_191105/libwpa2.a Normal file
View File

Binary file not shown.

BIN
tools/sdk/lib/NONOSDK22x_191105/libwps.a Normal file
View File

Binary file not shown.

1
tools/sdk/lib/NONOSDK22x_191105/version Normal file
View File

@ -0,0 +1 @@
v2.2.1-113-g1848ef1 (shows as SDK:2.2.2-dev(bb83b9b) in debug mode)