Skip to content

Commit 403001e

Browse files
d-a-vdevyte
d-a-v
authored and
devyte
committed
nonos-sdk: update to latest version 2.2.x branch, commitlog added in tree (#6257)
1 parent a0634a7 commit 403001e

19 files changed

+46
-36
lines changed

‎boards.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,10 @@ generic.menu.led.15=15
357357
generic.menu.led.15.build.led=-DLED_BUILTIN=15
358358
generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
359359
generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
360-
generic.menu.sdk.nonosdk222=nonos-sdk 2.2.2-190313 (testing)
361-
generic.menu.sdk.nonosdk222.build.sdk=NONOSDK22x
360+
generic.menu.sdk.nonosdk222_61=nonos-sdk 2.2.1+61 (testing)
361+
generic.menu.sdk.nonosdk222_61.build.sdk=NONOSDK22x
362+
generic.menu.sdk.nonosdk222_100=nonos-sdk 2.2.1+100 (testing)
363+
generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22y
362364
generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (known issues)
363365
generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
364366
generic.menu.ip.lm2f=v2 Lower Memory

‎package/package_esp8266com_index.template.json

+31-31
Original file line numberDiff line numberDiff line change
@@ -306,50 +306,50 @@
306306
"name": "mklittlefs",
307307
"systems": [
308308
{
309-
"host": "aarch64-linux-gnu",
310-
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/aarch64-linux-gnu-mklittlefs-1c43629.tar.gz",
311-
"archiveFileName": "aarch64-linux-gnu-mklittlefs-1c43629.tar.gz",
312-
"checksum": "SHA-256:1d51ab0e5abc9dd243829353a411fccb76e0ce70e3d106d51fb0d3a29dc1b1a7",
313-
"size": "44058"
309+
"host": "aarch64-linux-gnu",
310+
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/aarch64-linux-gnu-mklittlefs-1c43629.tar.gz",
311+
"archiveFileName": "aarch64-linux-gnu-mklittlefs-1c43629.tar.gz",
312+
"checksum": "SHA-256:1d51ab0e5abc9dd243829353a411fccb76e0ce70e3d106d51fb0d3a29dc1b1a7",
313+
"size": "44058"
314314
},
315315
{
316-
"host": "arm-linux-gnueabihf",
317-
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/arm-linux-gnueabihf-mklittlefs-1c43629.tar.gz",
318-
"archiveFileName": "arm-linux-gnueabihf-mklittlefs-1c43629.tar.gz",
319-
"checksum": "SHA-256:f316d7638ae41c15d82d7f8ca0815dbdfcd5ab323a84ff0d22420e683841150a",
320-
"size": "36566"
316+
"host": "arm-linux-gnueabihf",
317+
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/arm-linux-gnueabihf-mklittlefs-1c43629.tar.gz",
318+
"archiveFileName": "arm-linux-gnueabihf-mklittlefs-1c43629.tar.gz",
319+
"checksum": "SHA-256:f316d7638ae41c15d82d7f8ca0815dbdfcd5ab323a84ff0d22420e683841150a",
320+
"size": "36566"
321321
},
322322
{
323-
"host": "i686-mingw32",
324-
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/i686-w64-mingw32-mklittlefs-1c43629.zip",
325-
"archiveFileName": "i686-w64-mingw32-mklittlefs-1c43629.zip",
326-
"checksum": "SHA-256:4a926f3c282aefe7895d353797f43ac988a9542f2ba7bfcd6ef98fbe1455569c",
327-
"size": "332058"
323+
"host": "i686-mingw32",
324+
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/i686-w64-mingw32-mklittlefs-1c43629.zip",
325+
"archiveFileName": "i686-w64-mingw32-mklittlefs-1c43629.zip",
326+
"checksum": "SHA-256:4a926f3c282aefe7895d353797f43ac988a9542f2ba7bfcd6ef98fbe1455569c",
327+
"size": "332058"
328328
},
329329
{
330-
"host": "x86_64-apple-darwin",
331-
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-apple-darwin14-mklittlefs-1c43629.tar.gz",
332-
"archiveFileName": "x86_64-apple-darwin14-mklittlefs-1c43629.tar.gz",
333-
"checksum": "SHA-256:b3e62af202f0c93a3f6ccacaaaa133afc0dd1c65a8ea492690d02345212bf535",
334-
"size": "362016"
330+
"host": "x86_64-apple-darwin",
331+
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-apple-darwin14-mklittlefs-1c43629.tar.gz",
332+
"archiveFileName": "x86_64-apple-darwin14-mklittlefs-1c43629.tar.gz",
333+
"checksum": "SHA-256:b3e62af202f0c93a3f6ccacaaaa133afc0dd1c65a8ea492690d02345212bf535",
334+
"size": "362016"
335335
},
336336
{
337-
"host": "x86_64-pc-linux-gnu",
338-
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-linux-gnu-mklittlefs-1c43629.tar.gz",
339-
"archiveFileName": "x86_64-linux-gnu-mklittlefs-1c43629.tar.gz",
340-
"checksum": "SHA-256:b5222d220e9396807d736d16ef63983f80dc1d8d1e02fa9736f3b4a3e224cc63",
341-
"size": "46162"
337+
"host": "x86_64-pc-linux-gnu",
338+
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-linux-gnu-mklittlefs-1c43629.tar.gz",
339+
"archiveFileName": "x86_64-linux-gnu-mklittlefs-1c43629.tar.gz",
340+
"checksum": "SHA-256:b5222d220e9396807d736d16ef63983f80dc1d8d1e02fa9736f3b4a3e224cc63",
341+
"size": "46162"
342342
},
343343
{
344-
"host": "x86_64-mingw32",
345-
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-w64-mingw32-mklittlefs-1c43629.zip",
346-
"archiveFileName": "x86_64-w64-mingw32-mklittlefs-1c43629.zip",
347-
"checksum": "SHA-256:175cdd13a046d6ed06d1ee9eb535100821d8f59adbe16a117d8f80c252e7e62f",
348-
"size": "344578"
344+
"host": "x86_64-mingw32",
345+
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-w64-mingw32-mklittlefs-1c43629.zip",
346+
"archiveFileName": "x86_64-w64-mingw32-mklittlefs-1c43629.zip",
347+
"checksum": "SHA-256:175cdd13a046d6ed06d1ee9eb535100821d8f59adbe16a117d8f80c252e7e62f",
348+
"size": "344578"
349349
}
350350
]
351351
}
352352
]
353353
}
354354
]
355-
}
355+
}

‎tools/boards.txt.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1344,8 +1344,10 @@ def sdk ():
13441344
return { 'sdk': collections.OrderedDict([
13451345
('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
13461346
('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
1347-
('.menu.sdk.nonosdk222', 'nonos-sdk 2.2.2-190313 (testing)'),
1348-
('.menu.sdk.nonosdk222.build.sdk', 'NONOSDK22x'),
1347+
('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (testing)'),
1348+
('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x'),
1349+
('.menu.sdk.nonosdk222_100', 'nonos-sdk 2.2.1+100 (testing)'),
1350+
('.menu.sdk.nonosdk222_100.build.sdk', 'NONOSDK22y'),
13491351
('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (known issues)'),
13501352
('.menu.sdk.nonosdk3v0.build.sdk', 'NONOSDK3V0'),
13511353
])

‎tools/platformio-build.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,12 @@ def scons_patched_match_splitext(path, suffixes=None):
169169
CPPDEFINES=[("NONOSDK22x", 1)],
170170
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x")]
171171
)
172-
# PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x (default)
172+
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y" in flatten_cppdefines:
173+
env.Append(
174+
CPPDEFINES=[("NONOSDK22y", 1)],
175+
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22y")]
176+
)
177+
# PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 (default)
173178
else:
174179
env.Append(
175180
CPPDEFINES=[("NONOSDK221", 1)],

‎tools/sdk/lib/NONOSDK22x/commitlog-from-221.txt.gz

10.4 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/commitlog-from-22x.txt.gz

3.09 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libairkiss.a

11 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libcrypto.a

132 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libdriver.a

66.1 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libespnow.a

70.4 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libmain.a

212 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libnet80211.a

329 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libphy.a

159 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libpp.a

260 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libsmartconfig.a

116 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libwpa.a

169 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libwpa2.a

464 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/libwps.a

315 KB
Binary file not shown.

‎tools/sdk/lib/NONOSDK22y/version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v2.2.1-100-g876abc5 (shows as SDK:2.2.2-dev(38a443e) in debug mode)

0 commit comments

Comments
 (0)