Skip to content

Commit 1b3ac4f

Browse files
d-a-vd-a-v
authored
Switch default FW to "2.2.2-dev(38a443e)" (menu:2.2.1+100) (#6272)
* enable by default latest 2.2.x firmware, including fixed espnow * LittleFS: avoid crash when FS size is 0 * flash size defaults: 1M for generic board, not empty FS for all
1 parent 828857d commit 1b3ac4f

File tree

7 files changed

+557
-526
lines changed

7 files changed

+557
-526
lines changed

‎boards.txt‎

Lines changed: 503 additions & 475 deletions
Large diffs are not rendered by default.

‎cores/esp8266/FS.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,12 @@ bool FS::setConfig(const FSConfig &cfg) {
251251

252252
bool FS::begin() {
253253
if (!_impl) {
254+
DEBUGV("#error: FS: no implementation");
254255
return false;
255256
}
256-
return _impl->begin();
257+
bool ret = _impl->begin();
258+
DEBUGV("%s\n", ret? "": "#error: FS could not start");
259+
return ret;
257260
}
258261

259262
void FS::end() {

‎doc/boards.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ Parameters in Arduino IDE:
341341
- Card: "WEMOS D1 Mini Lite"
342342
- Flash Size: "1M (512K SPIFFS)"
343343
- CPU Frequency: "80 Mhz"
344-
- Upload Speed: "230400"
345344

346345
Power:
347346
~~~~~~

‎libraries/LittleFS/src/LittleFS.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ class LittleFSImpl : public FSImpl
7070
_lfs_cfg.read_size = 64;
7171
_lfs_cfg.prog_size = 64;
7272
_lfs_cfg.block_size = _blockSize;
73-
_lfs_cfg.block_count = _size / _blockSize;
74-
_lfs_cfg.block_cycles = 16; // TODO - need better explanation
75-
_lfs_cfg.cache_size = 64;
73+
_lfs_cfg.block_count =_blockSize? _size / _blockSize: 0;
74+
_lfs_cfg.block_cycles = 16; // TODO - need better explanation
75+
_lfs_cfg.cache_size = 64;
7676
_lfs_cfg.lookahead_size = 64;
7777
_lfs_cfg.read_buffer = nullptr;
7878
_lfs_cfg.prog_buffer = nullptr;

‎platform.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ build.stdcpp_lib=-lstdc++
3737

3838
build.float=-u _printf_float -u _scanf_float
3939
build.led=
40-
build.sdk=NONOSDK221
40+
build.sdk=NONOSDK22y
4141

4242
compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
4343
compiler.sdk.path={runtime.platform.path}/tools/sdk

‎tools/boards.txt.py‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
'crystalfreq_menu',
6969
'flashfreq_menu',
7070
'flashmode_menu',
71-
'512K', '1M', '2M', '4M', '8M', '16M',
71+
'1M', '2M', '4M', '8M', '16M', '512K',
7272
'led',
7373
'sdk',
7474
],
@@ -328,7 +328,7 @@
328328
'Product page: https://www.adafruit.com/product/2821'
329329
],
330330
}),
331-
( 'inventone', {
331+
( 'inventone', {
332332
'name': 'Invent One',
333333
'opts': {
334334
'.build.board': 'ESP8266_GENERIC',
@@ -589,28 +589,28 @@
589589
],
590590
'serial': '921',
591591
'desc': [
592-
'Parameters in Arduino IDE:',
593-
'~~~~~~~~~~~~~~~~~~~~~~~~~~',
594-
'',
595-
'- Card: "WEMOS D1 Mini Lite"',
596-
'- Flash Size: "1M (512K SPIFFS)"',
597-
'- CPU Frequency: "80 Mhz"',
598-
'- Upload Speed: "230400"',
599-
'',
600-
'Power:',
601-
'~~~~~~',
602-
'',
603-
'- 5V pin : 4.7V 500mA output when the board is powered by USB ; 3.5V-6V input',
604-
'- 3V3 pin : 3.3V 500mA regulated output',
605-
'- Digital pins : 3.3V 30mA.',
606-
'',
607-
'links:',
608-
'~~~~~~',
609-
'',
610-
'- Product page: https://www.wemos.cc/',
611-
'- Board schematic: https://wiki.wemos.cc/_media/products:d1:sch_d1_mini_lite_v1.0.0.pdf',
612-
'- ESP8285 datasheet: https://www.espressif.com/sites/default/files/0a-esp8285_datasheet_en_v1.0_20160422.pdf',
613-
'- Voltage regulator datasheet: http://pdf-datasheet.datasheet.netdna-cdn.com/pdf-down/M/E/6/ME6211-Microne.pdf',
592+
'Parameters in Arduino IDE:',
593+
'~~~~~~~~~~~~~~~~~~~~~~~~~~',
594+
'',
595+
'- Card: "WEMOS D1 Mini Lite"',
596+
'- Flash Size: "1M (512K SPIFFS)"',
597+
'- CPU Frequency: "80 Mhz"',
598+
# '- Upload Speed: "230400"',
599+
'',
600+
'Power:',
601+
'~~~~~~',
602+
'',
603+
'- 5V pin : 4.7V 500mA output when the board is powered by USB ; 3.5V-6V input',
604+
'- 3V3 pin : 3.3V 500mA regulated output',
605+
'- Digital pins : 3.3V 30mA.',
606+
'',
607+
'links:',
608+
'~~~~~~',
609+
'',
610+
'- Product page: https://www.wemos.cc/',
611+
'- Board schematic: https://wiki.wemos.cc/_media/products:d1:sch_d1_mini_lite_v1.0.0.pdf',
612+
'- ESP8285 datasheet: https://www.espressif.com/sites/default/files/0a-esp8285_datasheet_en_v1.0_20160422.pdf',
613+
'- Voltage regulator datasheet: http://pdf-datasheet.datasheet.netdna-cdn.com/pdf-down/M/E/6/ME6211-Microne.pdf',
614614
],
615615
}),
616616
( 'd1', {
@@ -1197,7 +1197,7 @@ def flash_map (flashsize_kb, fs_kb = 0):
11971197
ld = 'eagle.flash.' + strsize.lower() + strfs_strip.lower() + '.ld'
11981198
menu = '.menu.eesz.' + strsize + strfs_strip
11991199
menub = menu + '.build.'
1200-
desc = 'no' if (fs_kb == 0) else strfs + 'B'
1200+
desc = 'none' if (fs_kb == 0) else strfs + 'B'
12011201
d = collections.OrderedDict([
12021202
( menu, strsize + 'B (FS:' + desc + ' OTA:~%iKB)' % (max_ota_size / 1024)),
12031203
( menub + 'flash_size', strsize ),
@@ -1276,37 +1276,38 @@ def all_flash_map ():
12761276

12771277
# flash(KB) spiffs(KB)
12781278

1279-
f512.update(flash_map( 512))
1280-
f512.update(flash_map( 512, 32 ))
1281-
f512.update(flash_map( 512, 64 ))
1282-
f512.update(flash_map( 512, 128 ))
1283-
1284-
f1m.update( flash_map( 1024))
12851279
f1m.update( flash_map( 1024, 64 ))
12861280
f1m.update( flash_map( 1024, 128 ))
12871281
f1m.update( flash_map( 1024, 144 ))
12881282
f1m.update( flash_map( 1024, 160 ))
12891283
f1m.update( flash_map( 1024, 192 ))
12901284
f1m.update( flash_map( 1024, 256 ))
12911285
f1m.update( flash_map( 1024, 512 ))
1286+
f1m.update( flash_map( 1024))
12921287

1293-
f2m.update( flash_map( 2*1024))
1288+
f2m.update( flash_map( 2*1024, 64 ))
12941289
f2m.update( flash_map( 2*1024, 128 ))
12951290
f2m.update( flash_map( 2*1024, 256 ))
12961291
f2m.update( flash_map( 2*1024, 512 ))
12971292
f2m.update( flash_map( 2*1024, 1024 ))
1293+
f2m.update( flash_map( 2*1024))
12981294

1299-
f4m.update( flash_map( 4*1024))
1300-
f4m.update( flash_map( 4*1024, 1024 ))
13011295
f4m.update( flash_map( 4*1024, 2*1024 ))
13021296
f4m.update( flash_map( 4*1024, 3*1024 ))
1297+
f4m.update( flash_map( 4*1024, 1024 ))
1298+
f4m.update( flash_map( 4*1024))
13031299

13041300
f8m.update( flash_map( 8*1024, 6*1024 ))
13051301
f8m.update( flash_map( 8*1024, 7*1024 ))
13061302

13071303
f16m.update(flash_map( 16*1024, 14*1024 ))
13081304
f16m.update(flash_map( 16*1024, 15*1024 ))
13091305

1306+
f512.update(flash_map( 512, 32 ))
1307+
f512.update(flash_map( 512, 64 ))
1308+
f512.update(flash_map( 512, 128 ))
1309+
f512.update(flash_map( 512))
1310+
13101311
if ldgen:
13111312
print("generated: ldscripts (in %s)" % lddir)
13121313

@@ -1341,12 +1342,12 @@ def led (default,max):
13411342

13421343
def sdk ():
13431344
return { 'sdk': collections.OrderedDict([
1344-
('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
1345-
('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
1346-
('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (testing)'),
1347-
('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x'),
13481345
('.menu.sdk.nonosdk222_100', 'nonos-sdk 2.2.1+100 (testing)'),
13491346
('.menu.sdk.nonosdk222_100.build.sdk', 'NONOSDK22y'),
1347+
('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
1348+
('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
1349+
# ('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (testing)'),
1350+
# ('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x'),
13501351
('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (known issues)'),
13511352
('.menu.sdk.nonosdk3v0.build.sdk', 'NONOSDK3V0'),
13521353
])

‎tools/platformio-build.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,17 @@ def scons_patched_match_splitext(path, suffixes=None):
169169
CPPDEFINES=[("NONOSDK22x", 1)],
170170
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x")]
171171
)
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)
178-
else:
172+
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221" in flatten_cppdefines:
173+
#(previous default)
179174
env.Append(
180175
CPPDEFINES=[("NONOSDK221", 1)],
181176
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK221")]
182177
)
178+
else: #(default) elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y" in flatten_cppdefines:
179+
env.Append(
180+
CPPDEFINES=[("NONOSDK22y", 1)],
181+
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22y")]
182+
)
183183

184184
#
185185
# lwIP

0 commit comments

Comments
 (0)