Skip to content

sdk:22x-191122 #6879

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.

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 2 commits into from
Dec 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,8 @@ generic.menu.led.16=16
generic.menu.led.16.build.led=-DLED_BUILTIN=16
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_191122=nonos-sdk 2.2.1+119 (191122)
generic.menu.sdk.nonosdk_191122.build.sdk=NONOSDK22x_191122
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)
Expand Down
2 changes: 2 additions & 0 deletions tools/boards.txt.py
Original file line number Diff line number Diff line change
Expand Up @@ -1459,6 +1459,8 @@ def sdk ():
return { 'sdk': collections.OrderedDict([
('.menu.sdk.nonosdk_190703', 'nonos-sdk 2.2.1+100 (190703)'),
('.menu.sdk.nonosdk_190703.build.sdk', 'NONOSDK22x_190703'),
('.menu.sdk.nonosdk_191122', 'nonos-sdk 2.2.1+119 (191122)'),
('.menu.sdk.nonosdk_191122.build.sdk', 'NONOSDK22x_191122'),
('.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)'),
Expand Down
5 changes: 5 additions & 0 deletions tools/platformio-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ def scons_patched_match_splitext(path, suffixes=None):
CPPDEFINES=[("NONOSDK22x_191105", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191105")]
)
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191122" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22x_191122", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191122")]
)
else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22x_190703", 1)],
Expand Down
60 changes: 60 additions & 0 deletions tools/sdk/lib/NONOSDK22x_191122/commitlog-from-22x-191122.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
commit a0b131126ba803d0069014698a07e9f2fd3decd6
Merge: a8d1fcb 1e61d28
Author: Xu Chun Guang <[email protected]>
Date: Fri Nov 22 15:13:18 2019 +0800

Merge branch 'feature/add_broadcast_support_for_smartconfig' into 'release/v2.2.x'

feat(sc): add broadcast support for smartconfig

See merge request sdk/ESP8266_NONOS_SDK!246

commit 1e61d284b621527193303828612c3058be137230
Author: Chen Wen <[email protected]>
Date: Thu Nov 21 16:54:46 2019 +0800

feat(sc): add broadcast support for smartconfig

commit a8d1fcbebda3055a89d7378c3fc3591df4420966
Merge: 173440a 089fe93
Author: Xu Chun Guang <[email protected]>
Date: Tue Nov 19 16:55:11 2019 +0800

Merge branch 'cherry-pick-4bfd0469-2' into 'release/v2.2.x'

feat: Update phy to 1155

See merge request sdk/ESP8266_NONOS_SDK!243

commit 173440a5c3ab3763230748010d753e4508db15e9
Merge: 1848ef1 3c337a0
Author: Xu Chun Guang <[email protected]>
Date: Tue Nov 19 16:53:34 2019 +0800

Merge branch 'feature/update_core' into 'release/v2.2.x'

feat: Update at core to fix bugs

See merge request sdk/ESP8266_NONOS_SDK!240

commit 089fe93b5059588bf0da598644f0a16a5f7b3058
Author: Xu Chun Guang <[email protected]>
Date: Tue Nov 19 08:48:39 2019 +0000

Merge branch 'feature/update_phy' into 'master'

feat: Update phy to 1155

See merge request sdk/ESP8266_NONOS_SDK!241

(cherry picked from commit 4bfd046942c7162678f9545bb4aa0d6f46f47ea5)

56dc26ed feat: Update phy to 1155

commit 3c337a008b1e881d0945464dce2b6efdbddf097c
Author: Xu Chun Guang <[email protected]>
Date: Tue Nov 19 16:39:00 2019 +0800

feat: Update at core to fix bugs

- fix: TCP data lost when link is disconnect
Binary file added tools/sdk/lib/NONOSDK22x_191122/libairkiss.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191122/libcrypto.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191122/libespnow.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191122/libmain.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191122/libnet80211.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191122/libphy.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191122/libpp.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191122/libsmartconfig.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191122/libwpa.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191122/libwpa2.a
Binary file not shown.
Binary file added tools/sdk/lib/NONOSDK22x_191122/libwps.a
Binary file not shown.
1 change: 1 addition & 0 deletions tools/sdk/lib/NONOSDK22x_191122/version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v2.2.1-119-ga0b1311 (shows as SDK:2.2.2-dev(a58da79) in debug mode)