Skip to content

Commit ba50bd5

Browse files
d-a-vearlephilhower
d-a-v
authored and
earlephilhower
committed
sdk: testing branch update (v2.2.x), tidy up fw names in menus, add dates (#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
1 parent 36c369b commit ba50bd5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+27
-17
lines changed

‎boards.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,13 @@ generic.menu.led.15=15
374374
generic.menu.led.15.build.led=-DLED_BUILTIN=15
375375
generic.menu.led.16=16
376376
generic.menu.led.16.build.led=-DLED_BUILTIN=16
377-
generic.menu.sdk.nonosdk222_100=nonos-sdk 2.2.1+100 (testing)
378-
generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22y
377+
generic.menu.sdk.nonosdk222_100=nonos-sdk 2.2.1+100 (190703 approved)
378+
generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22x_190703
379+
generic.menu.sdk.nonosdk222_111=nonos-sdk 2.2.1+111 (191024 testing)
380+
generic.menu.sdk.nonosdk222_111.build.sdk=NONOSDK22x_191024
379381
generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
380382
generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
381-
generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (known issues)
383+
generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
382384
generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
383385
generic.menu.ip.lm2f=v2 Lower Memory
384386
generic.menu.ip.lm2f.build.lwip_include=lwip2/include

‎platform.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ build.stdcpp_level=-std=gnu++11
3939

4040
build.float=-u _printf_float -u _scanf_float
4141
build.led=
42-
build.sdk=NONOSDK22y
42+
build.sdk=NONOSDK22x_190703
4343

4444
compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
4545
compiler.sdk.path={runtime.platform.path}/tools/sdk

‎tools/boards.txt.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,13 +1366,15 @@ def led (default,max):
13661366

13671367
def sdk ():
13681368
return { 'sdk': collections.OrderedDict([
1369-
('.menu.sdk.nonosdk222_100', 'nonos-sdk 2.2.1+100 (testing)'),
1370-
('.menu.sdk.nonosdk222_100.build.sdk', 'NONOSDK22y'),
1369+
('.menu.sdk.nonosdk222_100', 'nonos-sdk 2.2.1+100 (190703 approved)'),
1370+
('.menu.sdk.nonosdk222_100.build.sdk', 'NONOSDK22x_190703'),
1371+
('.menu.sdk.nonosdk222_111', 'nonos-sdk 2.2.1+111 (191024 testing)'),
1372+
('.menu.sdk.nonosdk222_111.build.sdk', 'NONOSDK22x_191024'),
1373+
# ('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (190313 testing)'),
1374+
# ('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x_190313'),
13711375
('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
13721376
('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
1373-
# ('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (testing)'),
1374-
# ('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x'),
1375-
('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (known issues)'),
1377+
('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (180626 known issues)'),
13761378
('.menu.sdk.nonosdk3v0.build.sdk', 'NONOSDK3V0'),
13771379
])
13781380
}

‎tools/platformio-build.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,21 +164,26 @@ def scons_patched_match_splitext(path, suffixes=None):
164164
CPPDEFINES=[("NONOSDK3V0", 1)],
165165
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK3V0")]
166166
)
167-
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x" in flatten_cppdefines:
168-
env.Append(
169-
CPPDEFINES=[("NONOSDK22x", 1)],
170-
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x")]
171-
)
172167
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221" in flatten_cppdefines:
173168
#(previous default)
174169
env.Append(
175170
CPPDEFINES=[("NONOSDK221", 1)],
176171
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK221")]
177172
)
178-
else: #(default) elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y" in flatten_cppdefines:
173+
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313" in flatten_cppdefines:
174+
env.Append(
175+
CPPDEFINES=[("NONOSDK22x_190313", 1)],
176+
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190313")]
177+
)
178+
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024" in flatten_cppdefines:
179+
env.Append(
180+
CPPDEFINES=[("NONOSDK22x_191024", 1)],
181+
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191024")]
182+
)
183+
else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:
179184
env.Append(
180-
CPPDEFINES=[("NONOSDK22y", 1)],
181-
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22y")]
185+
CPPDEFINES=[("NONOSDK22x_190703", 1)],
186+
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_190703")]
182187
)
183188

184189
#

tools/sdk/lib/NONOSDK22x/commitlog-from-221.txt.gz renamed to tools/sdk/lib/NONOSDK22x_190313/commitlog-from-221.txt.gz

File renamed without changes.

tools/sdk/lib/NONOSDK22x/libairkiss.a renamed to tools/sdk/lib/NONOSDK22x_190313/libairkiss.a

File renamed without changes.

tools/sdk/lib/NONOSDK22x/libcrypto.a renamed to tools/sdk/lib/NONOSDK22x_190313/libcrypto.a

File renamed without changes.

tools/sdk/lib/NONOSDK22x/libespnow.a renamed to tools/sdk/lib/NONOSDK22x_190313/libespnow.a

File renamed without changes.

tools/sdk/lib/NONOSDK22x/libmain.a renamed to tools/sdk/lib/NONOSDK22x_190313/libmain.a

File renamed without changes.

tools/sdk/lib/NONOSDK22x/libnet80211.a renamed to tools/sdk/lib/NONOSDK22x_190313/libnet80211.a

File renamed without changes.

0 commit comments

Comments
 (0)