diff --git a/boards.txt b/boards.txt index d1564d24b6..da0bf54d3f 100644 --- a/boards.txt +++ b/boards.txt @@ -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) diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 350dde559f..8fbffceb4f 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -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)'), diff --git a/tools/platformio-build.py b/tools/platformio-build.py index bad95e8e35..7efcfb90e1 100644 --- a/tools/platformio-build.py +++ b/tools/platformio-build.py @@ -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)], diff --git a/tools/sdk/lib/NONOSDK22x_191122/commitlog-from-22x-191122.txt b/tools/sdk/lib/NONOSDK22x_191122/commitlog-from-22x-191122.txt new file mode 100644 index 0000000000..39dd282d5f --- /dev/null +++ b/tools/sdk/lib/NONOSDK22x_191122/commitlog-from-22x-191122.txt @@ -0,0 +1,60 @@ +commit a0b131126ba803d0069014698a07e9f2fd3decd6 +Merge: a8d1fcb 1e61d28 +Author: Xu Chun Guang +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 +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 +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 +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 +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 +Date: Tue Nov 19 16:39:00 2019 +0800 + + feat: Update at core to fix bugs + + - fix: TCP data lost when link is disconnect diff --git a/tools/sdk/lib/NONOSDK22x_191122/libairkiss.a b/tools/sdk/lib/NONOSDK22x_191122/libairkiss.a new file mode 100644 index 0000000000..cfdcc84234 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191122/libairkiss.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191122/libcrypto.a b/tools/sdk/lib/NONOSDK22x_191122/libcrypto.a new file mode 100644 index 0000000000..8a43cb7279 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191122/libcrypto.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191122/libespnow.a b/tools/sdk/lib/NONOSDK22x_191122/libespnow.a new file mode 100644 index 0000000000..92f6c9ab1a Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191122/libespnow.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191122/libmain.a b/tools/sdk/lib/NONOSDK22x_191122/libmain.a new file mode 100644 index 0000000000..77b7de1b96 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191122/libmain.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191122/libnet80211.a b/tools/sdk/lib/NONOSDK22x_191122/libnet80211.a new file mode 100644 index 0000000000..2d49d922ea Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191122/libnet80211.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191122/libphy.a b/tools/sdk/lib/NONOSDK22x_191122/libphy.a new file mode 100644 index 0000000000..d01d97c683 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191122/libphy.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191122/libpp.a b/tools/sdk/lib/NONOSDK22x_191122/libpp.a new file mode 100644 index 0000000000..2abbe7a3e9 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191122/libpp.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191122/libsmartconfig.a b/tools/sdk/lib/NONOSDK22x_191122/libsmartconfig.a new file mode 100644 index 0000000000..200925e3e1 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191122/libsmartconfig.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191122/libwpa.a b/tools/sdk/lib/NONOSDK22x_191122/libwpa.a new file mode 100644 index 0000000000..41ad4876fc Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191122/libwpa.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191122/libwpa2.a b/tools/sdk/lib/NONOSDK22x_191122/libwpa2.a new file mode 100644 index 0000000000..07420c5bf0 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191122/libwpa2.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191122/libwps.a b/tools/sdk/lib/NONOSDK22x_191122/libwps.a new file mode 100644 index 0000000000..ef0be1c350 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x_191122/libwps.a differ diff --git a/tools/sdk/lib/NONOSDK22x_191122/version b/tools/sdk/lib/NONOSDK22x_191122/version new file mode 100644 index 0000000000..e79bf535a0 --- /dev/null +++ b/tools/sdk/lib/NONOSDK22x_191122/version @@ -0,0 +1 @@ +v2.2.1-119-ga0b1311 (shows as SDK:2.2.2-dev(a58da79) in debug mode)