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

switch to firmware 2.2.x-190703 by default (#6826)

Browse Source
This commit is contained in:
david gauchard 2019-11-24 01:00:18 +01:00 committed by GitHub
parent 8ec93dcd26
commit 8b3b60056a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boards.txt
View File

@ -372,12 +372,12 @@ generic.menu.led.15=15
generic.menu.led.15.build.led=-DLED_BUILTIN=15 generic.menu.led.15.build.led=-DLED_BUILTIN=15
generic.menu.led.16=16 generic.menu.led.16=16
generic.menu.led.16.build.led=-DLED_BUILTIN=16 generic.menu.led.16.build.led=-DLED_BUILTIN=16
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=nonos-sdk 2.2.1+100 (190703)
generic.menu.sdk.nonosdk_190703.build.sdk=NONOSDK22x_190703 generic.menu.sdk.nonosdk_190703.build.sdk=NONOSDK22x_190703
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_191024=nonos-sdk 2.2.1+111 (191024)
generic.menu.sdk.nonosdk_191024.build.sdk=NONOSDK22x_191024
generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy) generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221 generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues) generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)

4
platform.txt
View File

@ -42,8 +42,8 @@ build.led=
# default SDK for all boards # default SDK for all boards
# (generic board overrides this variable) # (generic board overrides this variable)
#build.sdk=NONOSDK22x_190703 build.sdk=NONOSDK22x_190703
build.sdk=NONOSDK22x_191024 #build.sdk=NONOSDK22x_191024
#build.sdk=NONOSDK22x_191105 #build.sdk=NONOSDK22x_191105
compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/ compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/

8
tools/boards.txt.py
View File

@ -1457,12 +1457,12 @@ def led (name, default, ledList):
def sdk (): def sdk ():
return { 'sdk': collections.OrderedDict([ return { 'sdk': collections.OrderedDict([
('.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', 'nonos-sdk 2.2.1+100 (190703)'),
('.menu.sdk.nonosdk_190703.build.sdk', 'NONOSDK22x_190703'), ('.menu.sdk.nonosdk_190703.build.sdk', 'NONOSDK22x_190703'),
('.menu.sdk.nonosdk_191105', 'nonos-sdk 2.2.1+113 (191105)'),
('.menu.sdk.nonosdk_191105.build.sdk', 'NONOSDK22x_191105'),
('.menu.sdk.nonosdk_191024', 'nonos-sdk 2.2.1+111 (191024)'),
('.menu.sdk.nonosdk_191024.build.sdk', 'NONOSDK22x_191024'),
# ('.menu.sdk.nonosdk_190313', 'nonos-sdk 2.2.1+61 (190313 testing)'), # ('.menu.sdk.nonosdk_190313', 'nonos-sdk 2.2.1+61 (190313 testing)'),
# ('.menu.sdk.nonosdk_190313.build.sdk', 'NONOSDK22x_190313'), # ('.menu.sdk.nonosdk_190313.build.sdk', 'NONOSDK22x_190313'),
('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'), ('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),

12
tools/platformio-build.py
View File

@ -175,20 +175,20 @@ elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313" in flatten_cppdefines:
CPPDEFINES=[("NONOSDK22x_190313", 1)], CPPDEFINES=[("NONOSDK22x_190313", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190313")] LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190313")]
) )
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines: elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024" in flatten_cppdefines:
env.Append( env.Append(
CPPDEFINES=[("NONOSDK22x_190703", 1)], CPPDEFINES=[("NONOSDK22x_191024", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190703")] LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191024")]
) )
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105" in flatten_cppdefines: elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105" in flatten_cppdefines:
env.Append( env.Append(
CPPDEFINES=[("NONOSDK22x_191105", 1)], CPPDEFINES=[("NONOSDK22x_191105", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191105")] LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191105")]
) )
else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024" in flatten_cppdefines: else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:
env.Append( env.Append(
CPPDEFINES=[("NONOSDK22x_191024", 1)], CPPDEFINES=[("NONOSDK22x_190703", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191024")] LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190703")]
) )
# #