Skip to content

nonos-sdk: update to latest version 2.2.x branch, commitlog added in tree #6257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 5, 2019
Merged

nonos-sdk: update to latest version 2.2.x branch, commitlog added in tree #6257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34a424d
nonos-sdk: update to latest version 2.2.x branch, commitlog added in …
d-a-v Jul 4, 2019
820651a
Merge branch 'master' into sdk222y
d-a-v Jul 4, 2019
7e557fd
Merge branch 'master' into sdk222y
devyte Jul 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,10 @@ generic.menu.led.15=15
generic.menu.led.15.build.led=-DLED_BUILTIN=15
generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
generic.menu.sdk.nonosdk222=nonos-sdk 2.2.2-190313 (testing)
generic.menu.sdk.nonosdk222.build.sdk=NONOSDK22x
generic.menu.sdk.nonosdk222_61=nonos-sdk 2.2.1+61 (testing)
generic.menu.sdk.nonosdk222_61.build.sdk=NONOSDK22x
generic.menu.sdk.nonosdk222_100=nonos-sdk 2.2.1+100 (testing)
generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22y
generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (known issues)
generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
generic.menu.ip.lm2f=v2 Lower Memory
Expand Down
62 changes: 31 additions & 31 deletions package/package_esp8266com_index.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,50 +306,50 @@
"name": "mklittlefs",
"systems": [
{
"host": "aarch64-linux-gnu",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/aarch64-linux-gnu-mklittlefs-1c43629.tar.gz",
"archiveFileName": "aarch64-linux-gnu-mklittlefs-1c43629.tar.gz",
"checksum": "SHA-256:1d51ab0e5abc9dd243829353a411fccb76e0ce70e3d106d51fb0d3a29dc1b1a7",
"size": "44058"
"host": "aarch64-linux-gnu",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/aarch64-linux-gnu-mklittlefs-1c43629.tar.gz",
"archiveFileName": "aarch64-linux-gnu-mklittlefs-1c43629.tar.gz",
"checksum": "SHA-256:1d51ab0e5abc9dd243829353a411fccb76e0ce70e3d106d51fb0d3a29dc1b1a7",
"size": "44058"
},
{
"host": "arm-linux-gnueabihf",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/arm-linux-gnueabihf-mklittlefs-1c43629.tar.gz",
"archiveFileName": "arm-linux-gnueabihf-mklittlefs-1c43629.tar.gz",
"checksum": "SHA-256:f316d7638ae41c15d82d7f8ca0815dbdfcd5ab323a84ff0d22420e683841150a",
"size": "36566"
"host": "arm-linux-gnueabihf",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/arm-linux-gnueabihf-mklittlefs-1c43629.tar.gz",
"archiveFileName": "arm-linux-gnueabihf-mklittlefs-1c43629.tar.gz",
"checksum": "SHA-256:f316d7638ae41c15d82d7f8ca0815dbdfcd5ab323a84ff0d22420e683841150a",
"size": "36566"
},
{
"host": "i686-mingw32",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/i686-w64-mingw32-mklittlefs-1c43629.zip",
"archiveFileName": "i686-w64-mingw32-mklittlefs-1c43629.zip",
"checksum": "SHA-256:4a926f3c282aefe7895d353797f43ac988a9542f2ba7bfcd6ef98fbe1455569c",
"size": "332058"
"host": "i686-mingw32",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/i686-w64-mingw32-mklittlefs-1c43629.zip",
"archiveFileName": "i686-w64-mingw32-mklittlefs-1c43629.zip",
"checksum": "SHA-256:4a926f3c282aefe7895d353797f43ac988a9542f2ba7bfcd6ef98fbe1455569c",
"size": "332058"
},
{
"host": "x86_64-apple-darwin",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-apple-darwin14-mklittlefs-1c43629.tar.gz",
"archiveFileName": "x86_64-apple-darwin14-mklittlefs-1c43629.tar.gz",
"checksum": "SHA-256:b3e62af202f0c93a3f6ccacaaaa133afc0dd1c65a8ea492690d02345212bf535",
"size": "362016"
"host": "x86_64-apple-darwin",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-apple-darwin14-mklittlefs-1c43629.tar.gz",
"archiveFileName": "x86_64-apple-darwin14-mklittlefs-1c43629.tar.gz",
"checksum": "SHA-256:b3e62af202f0c93a3f6ccacaaaa133afc0dd1c65a8ea492690d02345212bf535",
"size": "362016"
},
{
"host": "x86_64-pc-linux-gnu",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-linux-gnu-mklittlefs-1c43629.tar.gz",
"archiveFileName": "x86_64-linux-gnu-mklittlefs-1c43629.tar.gz",
"checksum": "SHA-256:b5222d220e9396807d736d16ef63983f80dc1d8d1e02fa9736f3b4a3e224cc63",
"size": "46162"
"host": "x86_64-pc-linux-gnu",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-linux-gnu-mklittlefs-1c43629.tar.gz",
"archiveFileName": "x86_64-linux-gnu-mklittlefs-1c43629.tar.gz",
"checksum": "SHA-256:b5222d220e9396807d736d16ef63983f80dc1d8d1e02fa9736f3b4a3e224cc63",
"size": "46162"
},
{
"host": "x86_64-mingw32",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-w64-mingw32-mklittlefs-1c43629.zip",
"archiveFileName": "x86_64-w64-mingw32-mklittlefs-1c43629.zip",
"checksum": "SHA-256:175cdd13a046d6ed06d1ee9eb535100821d8f59adbe16a117d8f80c252e7e62f",
"size": "344578"
"host": "x86_64-mingw32",
"url": "https://github.com/earlephilhower/mklittlefs/releases/download/2.5.1-2/x86_64-w64-mingw32-mklittlefs-1c43629.zip",
"archiveFileName": "x86_64-w64-mingw32-mklittlefs-1c43629.zip",
"checksum": "SHA-256:175cdd13a046d6ed06d1ee9eb535100821d8f59adbe16a117d8f80c252e7e62f",
"size": "344578"
}
]
}
]
}
]
}
}
6 changes: 4 additions & 2 deletions tools/boards.txt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,8 +1344,10 @@ def sdk ():
return { 'sdk': collections.OrderedDict([
('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
('.menu.sdk.nonosdk222', 'nonos-sdk 2.2.2-190313 (testing)'),
('.menu.sdk.nonosdk222.build.sdk', 'NONOSDK22x'),
('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (testing)'),
('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x'),
('.menu.sdk.nonosdk222_100', 'nonos-sdk 2.2.1+100 (testing)'),
('.menu.sdk.nonosdk222_100.build.sdk', 'NONOSDK22y'),
('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (known issues)'),
('.menu.sdk.nonosdk3v0.build.sdk', 'NONOSDK3V0'),
])
Expand Down
7 changes: 6 additions & 1 deletion tools/platformio-build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,12 @@ def scons_patched_match_splitext(path, suffixes=None):
CPPDEFINES=[("NONOSDK22x", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x")]
)
# PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x (default)
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22y", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22y")]
)
# PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 (default)
else:
env.Append(
CPPDEFINES=[("NONOSDK221", 1)],
Expand Down
Binary file added tools/sdk/lib/NONOSDK22x/commitlog-from-221.txt.gz
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/commitlog-from-22x.txt.gz
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libairkiss.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libcrypto.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libdriver.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libespnow.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libmain.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libnet80211.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libphy.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libpp.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libsmartconfig.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libwpa.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libwpa2.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22y/libwps.a
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tools/sdk/lib/NONOSDK22y/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v2.2.1-100-g876abc5 (shows as SDK:2.2.2-dev(38a443e) in debug mode)