Skip to content

Commit e08b22c

Browse files
authored
sdk:22x-191122 (#6879)
* sdk:22x191122 another firmware to test not default: v2.2.1-119-ga0b1311 (shows as SDK:2.2.2-dev(a58da79) in debug mode) default unchanged * and the obj files
1 parent 3260830 commit e08b22c

16 files changed

+70
-0
lines changed

boards.txt

+2
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@ generic.menu.led.16=16
374374
generic.menu.led.16.build.led=-DLED_BUILTIN=16
375375
generic.menu.sdk.nonosdk_190703=nonos-sdk 2.2.1+100 (190703)
376376
generic.menu.sdk.nonosdk_190703.build.sdk=NONOSDK22x_190703
377+
generic.menu.sdk.nonosdk_191122=nonos-sdk 2.2.1+119 (191122)
378+
generic.menu.sdk.nonosdk_191122.build.sdk=NONOSDK22x_191122
377379
generic.menu.sdk.nonosdk_191105=nonos-sdk 2.2.1+113 (191105)
378380
generic.menu.sdk.nonosdk_191105.build.sdk=NONOSDK22x_191105
379381
generic.menu.sdk.nonosdk_191024=nonos-sdk 2.2.1+111 (191024)

tools/boards.txt.py

+2
Original file line numberDiff line numberDiff line change
@@ -1459,6 +1459,8 @@ def sdk ():
14591459
return { 'sdk': collections.OrderedDict([
14601460
('.menu.sdk.nonosdk_190703', 'nonos-sdk 2.2.1+100 (190703)'),
14611461
('.menu.sdk.nonosdk_190703.build.sdk', 'NONOSDK22x_190703'),
1462+
('.menu.sdk.nonosdk_191122', 'nonos-sdk 2.2.1+119 (191122)'),
1463+
('.menu.sdk.nonosdk_191122.build.sdk', 'NONOSDK22x_191122'),
14621464
('.menu.sdk.nonosdk_191105', 'nonos-sdk 2.2.1+113 (191105)'),
14631465
('.menu.sdk.nonosdk_191105.build.sdk', 'NONOSDK22x_191105'),
14641466
('.menu.sdk.nonosdk_191024', 'nonos-sdk 2.2.1+111 (191024)'),

tools/platformio-build.py

+5
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ def scons_patched_match_splitext(path, suffixes=None):
185185
CPPDEFINES=[("NONOSDK22x_191105", 1)],
186186
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191105")]
187187
)
188+
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191122" in flatten_cppdefines:
189+
env.Append(
190+
CPPDEFINES=[("NONOSDK22x_191122", 1)],
191+
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x_191122")]
192+
)
188193
else: #(default) if "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703" in flatten_cppdefines:
189194
env.Append(
190195
CPPDEFINES=[("NONOSDK22x_190703", 1)],
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
commit a0b131126ba803d0069014698a07e9f2fd3decd6
2+
Merge: a8d1fcb 1e61d28
3+
Author: Xu Chun Guang <[email protected]>
4+
Date: Fri Nov 22 15:13:18 2019 +0800
5+
6+
Merge branch 'feature/add_broadcast_support_for_smartconfig' into 'release/v2.2.x'
7+
8+
feat(sc): add broadcast support for smartconfig
9+
10+
See merge request sdk/ESP8266_NONOS_SDK!246
11+
12+
commit 1e61d284b621527193303828612c3058be137230
13+
Author: Chen Wen <[email protected]>
14+
Date: Thu Nov 21 16:54:46 2019 +0800
15+
16+
feat(sc): add broadcast support for smartconfig
17+
18+
commit a8d1fcbebda3055a89d7378c3fc3591df4420966
19+
Merge: 173440a 089fe93
20+
Author: Xu Chun Guang <[email protected]>
21+
Date: Tue Nov 19 16:55:11 2019 +0800
22+
23+
Merge branch 'cherry-pick-4bfd0469-2' into 'release/v2.2.x'
24+
25+
feat: Update phy to 1155
26+
27+
See merge request sdk/ESP8266_NONOS_SDK!243
28+
29+
commit 173440a5c3ab3763230748010d753e4508db15e9
30+
Merge: 1848ef1 3c337a0
31+
Author: Xu Chun Guang <[email protected]>
32+
Date: Tue Nov 19 16:53:34 2019 +0800
33+
34+
Merge branch 'feature/update_core' into 'release/v2.2.x'
35+
36+
feat: Update at core to fix bugs
37+
38+
See merge request sdk/ESP8266_NONOS_SDK!240
39+
40+
commit 089fe93b5059588bf0da598644f0a16a5f7b3058
41+
Author: Xu Chun Guang <[email protected]>
42+
Date: Tue Nov 19 08:48:39 2019 +0000
43+
44+
Merge branch 'feature/update_phy' into 'master'
45+
46+
feat: Update phy to 1155
47+
48+
See merge request sdk/ESP8266_NONOS_SDK!241
49+
50+
(cherry picked from commit 4bfd046942c7162678f9545bb4aa0d6f46f47ea5)
51+
52+
56dc26ed feat: Update phy to 1155
53+
54+
commit 3c337a008b1e881d0945464dce2b6efdbddf097c
55+
Author: Xu Chun Guang <[email protected]>
56+
Date: Tue Nov 19 16:39:00 2019 +0800
57+
58+
feat: Update at core to fix bugs
59+
60+
- fix: TCP data lost when link is disconnect
11 KB
Binary file not shown.
132 KB
Binary file not shown.
70.4 KB
Binary file not shown.
213 KB
Binary file not shown.
329 KB
Binary file not shown.
170 KB
Binary file not shown.
260 KB
Binary file not shown.
Binary file not shown.
169 KB
Binary file not shown.
464 KB
Binary file not shown.
315 KB
Binary file not shown.
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v2.2.1-119-ga0b1311 (shows as SDK:2.2.2-dev(a58da79) in debug mode)

0 commit comments

Comments
 (0)