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

cores/esp8266/FS.cpp

@@ -251,9 +251,12 @@ bool FS::setConfig(const FSConfig &cfg) {
 
 bool FS::begin() {
     if (!_impl) {
+        DEBUGV("#error: FS: no implementation");
         return false;
     }
-    return _impl->begin();
+    bool ret = _impl->begin();
+    DEBUGV("%s\n", ret? "": "#error: FS could not start");
+    return ret;
 }
 
 void FS::end() {

doc/boards.rst

@@ -341,7 +341,6 @@ Parameters in Arduino IDE:
 - Card: "WEMOS D1 Mini Lite"
 - Flash Size: "1M (512K SPIFFS)"
 - CPU Frequency: "80 Mhz"
-- Upload Speed: "230400"
 
 Power:
 ~~~~~~

libraries/LittleFS/src/LittleFS.h

@@ -70,7 +70,7 @@ public:
         _lfs_cfg.read_size = 64;
         _lfs_cfg.prog_size = 64;
         _lfs_cfg.block_size =  _blockSize;
-        _lfs_cfg.block_count = _size / _blockSize;
+        _lfs_cfg.block_count =_blockSize? _size / _blockSize: 0;
         _lfs_cfg.block_cycles = 16; // TODO - need better explanation
         _lfs_cfg.cache_size = 64;
         _lfs_cfg.lookahead_size = 64;

platform.txt

@@ -37,7 +37,7 @@ build.stdcpp_lib=-lstdc++
 
 build.float=-u _printf_float -u _scanf_float
 build.led=
-build.sdk=NONOSDK221
+build.sdk=NONOSDK22y
 
 compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
 compiler.sdk.path={runtime.platform.path}/tools/sdk

tools/boards.txt.py

@@ -68,7 +68,7 @@ boards = collections.OrderedDict([
             'crystalfreq_menu',
             'flashfreq_menu',
             'flashmode_menu',
-            '512K', '1M', '2M', '4M', '8M', '16M',
+            '1M', '2M', '4M', '8M', '16M', '512K',
             'led',
             'sdk',
             ],
@@ -595,7 +595,7 @@ boards = collections.OrderedDict([
             '- Card: "WEMOS D1 Mini Lite"',
             '- Flash Size: "1M (512K SPIFFS)"',
             '- CPU Frequency: "80 Mhz"',
-			'- Upload Speed: "230400"',
+          # '- Upload Speed: "230400"',
             '',
             'Power:',
             '~~~~~~',
@@ -1197,7 +1197,7 @@ def flash_map (flashsize_kb, fs_kb = 0):
     ld = 'eagle.flash.' + strsize.lower() + strfs_strip.lower() + '.ld'
     menu = '.menu.eesz.' + strsize + strfs_strip
     menub = menu + '.build.'
-    desc = 'no' if (fs_kb == 0) else strfs + 'B'
+    desc = 'none' if (fs_kb == 0) else strfs + 'B'
     d = collections.OrderedDict([
         ( menu, strsize + 'B (FS:' + desc + ' OTA:~%iKB)' % (max_ota_size / 1024)),
         ( menub + 'flash_size', strsize ),
@@ -1276,12 +1276,6 @@ def all_flash_map ():
 
     #                      flash(KB) spiffs(KB)
 
-    f512.update(flash_map(     512))
-    f512.update(flash_map(     512,      32 ))
-    f512.update(flash_map(     512,      64 ))
-    f512.update(flash_map(     512,     128 ))
-
-    f1m.update( flash_map(    1024))
     f1m.update( flash_map(    1024,      64 ))
     f1m.update( flash_map(    1024,     128 ))
     f1m.update( flash_map(    1024,     144 ))
@@ -1289,17 +1283,19 @@ def all_flash_map ():
     f1m.update( flash_map(    1024,     192 ))
     f1m.update( flash_map(    1024,     256 ))
     f1m.update( flash_map(    1024,     512 ))
+    f1m.update( flash_map(    1024))
 
-    f2m.update( flash_map(  2*1024))
+    f2m.update( flash_map(  2*1024,      64 ))
     f2m.update( flash_map(  2*1024,     128 ))
     f2m.update( flash_map(  2*1024,     256 ))
     f2m.update( flash_map(  2*1024,     512 ))
     f2m.update( flash_map(  2*1024,    1024 ))
+    f2m.update( flash_map(  2*1024))
 
-    f4m.update( flash_map(  4*1024))
-    f4m.update( flash_map(  4*1024,    1024 ))
     f4m.update( flash_map(  4*1024,  2*1024 ))
     f4m.update( flash_map(  4*1024,  3*1024 ))
+    f4m.update( flash_map(  4*1024,    1024 ))
+    f4m.update( flash_map(  4*1024))
 
     f8m.update( flash_map(  8*1024,  6*1024 ))
     f8m.update( flash_map(  8*1024,  7*1024 ))
@@ -1307,6 +1303,11 @@ def all_flash_map ():
     f16m.update(flash_map( 16*1024, 14*1024 ))
     f16m.update(flash_map( 16*1024, 15*1024 ))
 
+    f512.update(flash_map(     512,      32 ))
+    f512.update(flash_map(     512,      64 ))
+    f512.update(flash_map(     512,     128 ))
+    f512.update(flash_map(     512))
+
     if ldgen:
         print("generated: ldscripts (in %s)" % lddir)
 
@@ -1341,12 +1342,12 @@ def led (default,max):
 
 def sdk ():
     return { 'sdk': collections.OrderedDict([
-                        ('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
-                        ('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
-                        ('.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.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
+                        ('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
+                     #  ('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (testing)'),
+                     #  ('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x'),
                         ('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (known issues)'),
                         ('.menu.sdk.nonosdk3v0.build.sdk', 'NONOSDK3V0'),
                     ])

tools/platformio-build.py

@@ -169,17 +169,17 @@ elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x" in flatten_cppdefines:
         CPPDEFINES=[("NONOSDK22x", 1)],
         LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x")]
     )
-elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y" in flatten_cppdefines:
+elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221" in flatten_cppdefines:
-    env.Append(
+    #(previous default)
-        CPPDEFINES=[("NONOSDK22y", 1)],
-        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22y")]
-    )
-# PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 (default)
-else:
     env.Append(
         CPPDEFINES=[("NONOSDK221", 1)],
         LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK221")]
     )
+else: #(default) elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y" in flatten_cppdefines:
+    env.Append(
+        CPPDEFINES=[("NONOSDK22y", 1)],
+        LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22y")]
+    )
 
 #
 # lwIP