Merge branch 'master' into wifi_mesh_update_2.2

Author: earlephilhower

README.md

@@ -114,7 +114,7 @@ Please provide as much context as possible, as well as the information requested
 
 ### Contributing
 
-For minor fixes of code and documentation, please go ahead and submit a pull request.
+For minor fixes of code and documentation, please go ahead and submit a pull request.  A gentle introduction to the process can be found [here](https://www.freecodecamp.org/news/a-simple-git-guide-and-cheat-sheet-for-open-source-contributors/).
 
 Check out the list of issues that are easy to fix — [easy issues pending](https://github.com/esp8266/Arduino/issues?q=is%3Aopen+is%3Aissue+label%3A%22level%3A+easy%22). Working on them is a great way to move the project forward.
 

boards.txt

@@ -365,6 +365,8 @@ generic.menu.led.14=14
 generic.menu.led.14.build.led=-DLED_BUILTIN=14
 generic.menu.led.15=15
 generic.menu.led.15.build.led=-DLED_BUILTIN=15
+generic.menu.led.16=16
+generic.menu.led.16.build.led=-DLED_BUILTIN=16
 generic.menu.sdk.nonosdk222_100=nonos-sdk 2.2.1+100 (testing)
 generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22y
 generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
@@ -466,8 +468,6 @@ generic.menu.wipe.all=All Flash Contents
 generic.menu.wipe.all.upload.erase_cmd=erase_flash
 generic.menu.baud.115200=115200
 generic.menu.baud.115200.upload.speed=115200
-generic.menu.baud.9600=9600
-generic.menu.baud.9600.upload.speed=9600
 generic.menu.baud.57600=57600
 generic.menu.baud.57600.upload.speed=57600
 generic.menu.baud.230400.linux=230400
@@ -641,6 +641,8 @@ esp8285.menu.led.14=14
 esp8285.menu.led.14.build.led=-DLED_BUILTIN=14
 esp8285.menu.led.15=15
 esp8285.menu.led.15.build.led=-DLED_BUILTIN=15
+esp8285.menu.led.16=16
+esp8285.menu.led.16.build.led=-DLED_BUILTIN=16
 esp8285.menu.ip.lm2f=v2 Lower Memory
 esp8285.menu.ip.lm2f.build.lwip_include=lwip2/include
 esp8285.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -736,8 +738,6 @@ esp8285.menu.wipe.all=All Flash Contents
 esp8285.menu.wipe.all.upload.erase_cmd=erase_flash
 esp8285.menu.baud.115200=115200
 esp8285.menu.baud.115200.upload.speed=115200
-esp8285.menu.baud.9600=9600
-esp8285.menu.baud.9600.upload.speed=9600
 esp8285.menu.baud.57600=57600
 esp8285.menu.baud.57600.upload.speed=57600
 esp8285.menu.baud.230400.linux=230400
@@ -932,8 +932,6 @@ espduino.menu.wipe.all=All Flash Contents
 espduino.menu.wipe.all.upload.erase_cmd=erase_flash
 espduino.menu.baud.115200=115200
 espduino.menu.baud.115200.upload.speed=115200
-espduino.menu.baud.9600=9600
-espduino.menu.baud.9600.upload.speed=9600
 espduino.menu.baud.57600=57600
 espduino.menu.baud.57600.upload.speed=57600
 espduino.menu.baud.230400.linux=230400
@@ -1120,8 +1118,6 @@ huzzah.menu.wipe.all=All Flash Contents
 huzzah.menu.wipe.all.upload.erase_cmd=erase_flash
 huzzah.menu.baud.115200=115200
 huzzah.menu.baud.115200.upload.speed=115200
-huzzah.menu.baud.9600=9600
-huzzah.menu.baud.9600.upload.speed=9600
 huzzah.menu.baud.57600=57600
 huzzah.menu.baud.57600.upload.speed=57600
 huzzah.menu.baud.230400.linux=230400
@@ -1308,8 +1304,6 @@ inventone.menu.wipe.all=All Flash Contents
 inventone.menu.wipe.all.upload.erase_cmd=erase_flash
 inventone.menu.baud.115200=115200
 inventone.menu.baud.115200.upload.speed=115200
-inventone.menu.baud.9600=9600
-inventone.menu.baud.9600.upload.speed=9600
 inventone.menu.baud.57600=57600
 inventone.menu.baud.57600.upload.speed=57600
 inventone.menu.baud.230400.linux=230400
@@ -1499,8 +1493,6 @@ cw01.menu.wipe.all=All Flash Contents
 cw01.menu.wipe.all.upload.erase_cmd=erase_flash
 cw01.menu.baud.115200=115200
 cw01.menu.baud.115200.upload.speed=115200
-cw01.menu.baud.9600=9600
-cw01.menu.baud.9600.upload.speed=9600
 cw01.menu.baud.57600=57600
 cw01.menu.baud.57600.upload.speed=57600
 cw01.menu.baud.230400.linux=230400
@@ -1690,8 +1682,6 @@ espresso_lite_v1.menu.wipe.all=All Flash Contents
 espresso_lite_v1.menu.wipe.all.upload.erase_cmd=erase_flash
 espresso_lite_v1.menu.baud.115200=115200
 espresso_lite_v1.menu.baud.115200.upload.speed=115200
-espresso_lite_v1.menu.baud.9600=9600
-espresso_lite_v1.menu.baud.9600.upload.speed=9600
 espresso_lite_v1.menu.baud.57600=57600
 espresso_lite_v1.menu.baud.57600.upload.speed=57600
 espresso_lite_v1.menu.baud.230400.linux=230400
@@ -1881,8 +1871,6 @@ espresso_lite_v2.menu.wipe.all=All Flash Contents
 espresso_lite_v2.menu.wipe.all.upload.erase_cmd=erase_flash
 espresso_lite_v2.menu.baud.115200=115200
 espresso_lite_v2.menu.baud.115200.upload.speed=115200
-espresso_lite_v2.menu.baud.9600=9600
-espresso_lite_v2.menu.baud.9600.upload.speed=9600
 espresso_lite_v2.menu.baud.57600=57600
 espresso_lite_v2.menu.baud.57600.upload.speed=57600
 espresso_lite_v2.menu.baud.230400.linux=230400
@@ -2072,8 +2060,6 @@ phoenix_v1.menu.wipe.all=All Flash Contents
 phoenix_v1.menu.wipe.all.upload.erase_cmd=erase_flash
 phoenix_v1.menu.baud.115200=115200
 phoenix_v1.menu.baud.115200.upload.speed=115200
-phoenix_v1.menu.baud.9600=9600
-phoenix_v1.menu.baud.9600.upload.speed=9600
 phoenix_v1.menu.baud.57600=57600
 phoenix_v1.menu.baud.57600.upload.speed=57600
 phoenix_v1.menu.baud.230400.linux=230400
@@ -2263,8 +2249,6 @@ phoenix_v2.menu.wipe.all=All Flash Contents
 phoenix_v2.menu.wipe.all.upload.erase_cmd=erase_flash
 phoenix_v2.menu.baud.115200=115200
 phoenix_v2.menu.baud.115200.upload.speed=115200
-phoenix_v2.menu.baud.9600=9600
-phoenix_v2.menu.baud.9600.upload.speed=9600
 phoenix_v2.menu.baud.57600=57600
 phoenix_v2.menu.baud.57600.upload.speed=57600
 phoenix_v2.menu.baud.230400.linux=230400
@@ -2451,8 +2435,6 @@ nodemcu.menu.wipe.all=All Flash Contents
 nodemcu.menu.wipe.all.upload.erase_cmd=erase_flash
 nodemcu.menu.baud.115200=115200
 nodemcu.menu.baud.115200.upload.speed=115200
-nodemcu.menu.baud.9600=9600
-nodemcu.menu.baud.9600.upload.speed=9600
 nodemcu.menu.baud.57600=57600
 nodemcu.menu.baud.57600.upload.speed=57600
 nodemcu.menu.baud.230400.linux=230400
@@ -2639,8 +2621,6 @@ nodemcuv2.menu.wipe.all=All Flash Contents
 nodemcuv2.menu.wipe.all.upload.erase_cmd=erase_flash
 nodemcuv2.menu.baud.115200=115200
 nodemcuv2.menu.baud.115200.upload.speed=115200
-nodemcuv2.menu.baud.9600=9600
-nodemcuv2.menu.baud.9600.upload.speed=9600
 nodemcuv2.menu.baud.57600=57600
 nodemcuv2.menu.baud.57600.upload.speed=57600
 nodemcuv2.menu.baud.230400.linux=230400
@@ -2847,8 +2827,6 @@ modwifi.menu.wipe.all=All Flash Contents
 modwifi.menu.wipe.all.upload.erase_cmd=erase_flash
 modwifi.menu.baud.115200=115200
 modwifi.menu.baud.115200.upload.speed=115200
-modwifi.menu.baud.9600=9600
-modwifi.menu.baud.9600.upload.speed=9600
 modwifi.menu.baud.57600=57600
 modwifi.menu.baud.57600.upload.speed=57600
 modwifi.menu.baud.230400.linux=230400
@@ -3035,8 +3013,6 @@ thing.menu.wipe.all=All Flash Contents
 thing.menu.wipe.all.upload.erase_cmd=erase_flash
 thing.menu.baud.115200=115200
 thing.menu.baud.115200.upload.speed=115200
-thing.menu.baud.9600=9600
-thing.menu.baud.9600.upload.speed=9600
 thing.menu.baud.57600=57600
 thing.menu.baud.57600.upload.speed=57600
 thing.menu.baud.230400.linux=230400
@@ -3223,8 +3199,6 @@ thingdev.menu.wipe.all=All Flash Contents
 thingdev.menu.wipe.all.upload.erase_cmd=erase_flash
 thingdev.menu.baud.115200=115200
 thingdev.menu.baud.115200.upload.speed=115200
-thingdev.menu.baud.9600=9600
-thingdev.menu.baud.9600.upload.speed=9600
 thingdev.menu.baud.57600=57600
 thingdev.menu.baud.57600.upload.speed=57600
 thingdev.menu.baud.230400.linux=230400
@@ -3411,8 +3385,6 @@ esp210.menu.wipe.all=All Flash Contents
 esp210.menu.wipe.all.upload.erase_cmd=erase_flash
 esp210.menu.baud.57600=57600
 esp210.menu.baud.57600.upload.speed=57600
-esp210.menu.baud.9600=9600
-esp210.menu.baud.9600.upload.speed=9600
 esp210.menu.baud.115200=115200
 esp210.menu.baud.115200.upload.speed=115200
 esp210.menu.baud.230400.linux=230400
@@ -3599,8 +3571,6 @@ d1_mini.menu.wipe.all=All Flash Contents
 d1_mini.menu.wipe.all.upload.erase_cmd=erase_flash
 d1_mini.menu.baud.921600=921600
 d1_mini.menu.baud.921600.upload.speed=921600
-d1_mini.menu.baud.9600=9600
-d1_mini.menu.baud.9600.upload.speed=9600
 d1_mini.menu.baud.57600=57600
 d1_mini.menu.baud.57600.upload.speed=57600
 d1_mini.menu.baud.115200=115200
@@ -3770,8 +3740,6 @@ d1_mini_pro.menu.wipe.all=All Flash Contents
 d1_mini_pro.menu.wipe.all.upload.erase_cmd=erase_flash
 d1_mini_pro.menu.baud.921600=921600
 d1_mini_pro.menu.baud.921600.upload.speed=921600
-d1_mini_pro.menu.baud.9600=9600
-d1_mini_pro.menu.baud.9600.upload.speed=9600
 d1_mini_pro.menu.baud.57600=57600
 d1_mini_pro.menu.baud.57600.upload.speed=57600
 d1_mini_pro.menu.baud.115200=115200
@@ -3998,8 +3966,6 @@ d1_mini_lite.menu.wipe.all=All Flash Contents
 d1_mini_lite.menu.wipe.all.upload.erase_cmd=erase_flash
 d1_mini_lite.menu.baud.921600=921600
 d1_mini_lite.menu.baud.921600.upload.speed=921600
-d1_mini_lite.menu.baud.9600=9600
-d1_mini_lite.menu.baud.9600.upload.speed=9600
 d1_mini_lite.menu.baud.57600=57600
 d1_mini_lite.menu.baud.57600.upload.speed=57600
 d1_mini_lite.menu.baud.115200=115200
@@ -4186,8 +4152,6 @@ d1.menu.wipe.all=All Flash Contents
 d1.menu.wipe.all.upload.erase_cmd=erase_flash
 d1.menu.baud.921600=921600
 d1.menu.baud.921600.upload.speed=921600
-d1.menu.baud.9600=9600
-d1.menu.baud.9600.upload.speed=9600
 d1.menu.baud.57600=57600
 d1.menu.baud.57600.upload.speed=57600
 d1.menu.baud.115200=115200
@@ -4377,8 +4341,6 @@ espino.menu.wipe.all=All Flash Contents
 espino.menu.wipe.all.upload.erase_cmd=erase_flash
 espino.menu.baud.115200=115200
 espino.menu.baud.115200.upload.speed=115200
-espino.menu.baud.9600=9600
-espino.menu.baud.9600.upload.speed=9600
 espino.menu.baud.57600=57600
 espino.menu.baud.57600.upload.speed=57600
 espino.menu.baud.230400.linux=230400
@@ -4565,8 +4527,6 @@ espinotee.menu.wipe.all=All Flash Contents
 espinotee.menu.wipe.all.upload.erase_cmd=erase_flash
 espinotee.menu.baud.115200=115200
 espinotee.menu.baud.115200.upload.speed=115200
-espinotee.menu.baud.9600=9600
-espinotee.menu.baud.9600.upload.speed=9600
 espinotee.menu.baud.57600=57600
 espinotee.menu.baud.57600.upload.speed=57600
 espinotee.menu.baud.230400.linux=230400
@@ -4813,8 +4773,6 @@ wifinfo.menu.wipe.all=All Flash Contents
 wifinfo.menu.wipe.all.upload.erase_cmd=erase_flash
 wifinfo.menu.baud.115200=115200
 wifinfo.menu.baud.115200.upload.speed=115200
-wifinfo.menu.baud.9600=9600
-wifinfo.menu.baud.9600.upload.speed=9600
 wifinfo.menu.baud.57600=57600
 wifinfo.menu.baud.57600.upload.speed=57600
 wifinfo.menu.baud.230400.linux=230400
@@ -5013,8 +4971,6 @@ arduino-esp8266.menu.wipe.all=All Flash Contents
 arduino-esp8266.menu.wipe.all.upload.erase_cmd=erase_flash
 arduino-esp8266.menu.baud.115200=115200
 arduino-esp8266.menu.baud.115200.upload.speed=115200
-arduino-esp8266.menu.baud.9600=9600
-arduino-esp8266.menu.baud.9600.upload.speed=9600
 arduino-esp8266.menu.baud.57600=57600
 arduino-esp8266.menu.baud.57600.upload.speed=57600
 arduino-esp8266.menu.baud.230400.linux=230400
@@ -5202,8 +5158,6 @@ gen4iod.menu.wipe.all=All Flash Contents
 gen4iod.menu.wipe.all.upload.erase_cmd=erase_flash
 gen4iod.menu.baud.115200=115200
 gen4iod.menu.baud.115200.upload.speed=115200
-gen4iod.menu.baud.9600=9600
-gen4iod.menu.baud.9600.upload.speed=9600
 gen4iod.menu.baud.57600=57600
 gen4iod.menu.baud.57600.upload.speed=57600
 gen4iod.menu.baud.230400.linux=230400
@@ -5391,8 +5345,6 @@ oak.menu.wipe.all=All Flash Contents
 oak.menu.wipe.all.upload.erase_cmd=erase_flash
 oak.menu.baud.921600=921600
 oak.menu.baud.921600.upload.speed=921600
-oak.menu.baud.9600=9600
-oak.menu.baud.9600.upload.speed=9600
 oak.menu.baud.57600=57600
 oak.menu.baud.57600.upload.speed=57600
 oak.menu.baud.115200=115200
@@ -5579,8 +5531,6 @@ wifiduino.menu.wipe.all=All Flash Contents
 wifiduino.menu.wipe.all.upload.erase_cmd=erase_flash
 wifiduino.menu.baud.921600=921600
 wifiduino.menu.baud.921600.upload.speed=921600
-wifiduino.menu.baud.9600=9600
-wifiduino.menu.baud.9600.upload.speed=9600
 wifiduino.menu.baud.57600=57600
 wifiduino.menu.baud.57600.upload.speed=57600
 wifiduino.menu.baud.115200=115200
@@ -5877,8 +5827,6 @@ wifi_slot.menu.wipe.all=All Flash Contents
 wifi_slot.menu.wipe.all.upload.erase_cmd=erase_flash
 wifi_slot.menu.baud.115200=115200
 wifi_slot.menu.baud.115200.upload.speed=115200
-wifi_slot.menu.baud.9600=9600
-wifi_slot.menu.baud.9600.upload.speed=9600
 wifi_slot.menu.baud.57600=57600
 wifi_slot.menu.baud.57600.upload.speed=57600
 wifi_slot.menu.baud.230400.linux=230400
@@ -6065,8 +6013,6 @@ wiolink.menu.wipe.all=All Flash Contents
 wiolink.menu.wipe.all.upload.erase_cmd=erase_flash
 wiolink.menu.baud.115200=115200
 wiolink.menu.baud.115200.upload.speed=115200
-wiolink.menu.baud.9600=9600
-wiolink.menu.baud.9600.upload.speed=9600
 wiolink.menu.baud.57600=57600
 wiolink.menu.baud.57600.upload.speed=57600
 wiolink.menu.baud.230400.linux=230400
@@ -6253,8 +6199,6 @@ espectro.menu.wipe.all=All Flash Contents
 espectro.menu.wipe.all.upload.erase_cmd=erase_flash
 espectro.menu.baud.115200=115200
 espectro.menu.baud.115200.upload.speed=115200
-espectro.menu.baud.9600=9600
-espectro.menu.baud.9600.upload.speed=9600
 espectro.menu.baud.57600=57600
 espectro.menu.baud.57600.upload.speed=57600
 espectro.menu.baud.230400.linux=230400

cores/esp8266/AddrList.h

@@ -167,8 +167,6 @@ class AddressListIterator
     bool operator== (AddressListIterator& o) { return netIf.equal(*o); }
     bool operator!= (AddressListIterator& o) { return !netIf.equal(*o); }
 
-    AddressListIterator& operator= (const AddressListIterator& o) { netIf = o.netIf; return *this; }
-
     AddressListIterator operator++ (int)
     {
         AddressListIterator ret = *this;

cores/esp8266/Arduino.h

@@ -159,7 +159,7 @@ void ets_intr_unlock();
 // level 15 will disable ALL interrupts,
 // level 0 will enable ALL interrupts,
 //
-#define xt_rsil(level) (__extension__({uint32_t state; __asm__ __volatile__("rsil %0," __STRINGIFY(level) : "=a" (state)); state;}))
+#define xt_rsil(level) (__extension__({uint32_t state; __asm__ __volatile__("rsil %0," __STRINGIFY(level) : "=a" (state) :: "memory"); state;}))
 #define xt_wsr_ps(state)  __asm__ __volatile__("wsr %0,ps; isync" :: "a" (state) : "memory")
 
 #define interrupts() xt_rsil(0)

cores/esp8266/FS.cpp

@@ -272,6 +272,13 @@ bool FS::gc() {
     return _impl->gc();
 }
 
+bool FS::check() {
+    if (!_impl) {
+        return false;
+    }
+    return _impl->check();
+}
+
 bool FS::format() {
     if (!_impl) {
         return false;

cores/esp8266/FS.h

@@ -221,7 +221,9 @@ class FS
     bool rmdir(const char* path);
     bool rmdir(const String& path);
 
+    // Low-level FS routines, not needed by most applications
     bool gc();
+    bool check();
 
     friend class ::SDClass; // More of a frenemy, but SD needs internal implementation to get private FAT bits
 protected:
@@ -241,6 +243,7 @@ using fs::SeekCur;
 using fs::SeekEnd;
 using fs::FSInfo;
 using fs::FSConfig;
+using fs::SPIFFSConfig;
 #endif //FS_NO_GLOBALS
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SPIFFS)

cores/esp8266/FSImpl.h

@@ -85,6 +85,7 @@ class FSImpl {
     virtual bool mkdir(const char* path) = 0;
     virtual bool rmdir(const char* path) = 0;
     virtual bool gc() { return true; } // May not be implemented in all file systems.
+    virtual bool check() { return true; } // May not be implemented in all file systems.
 };
 
 } // namespace fs

cores/esp8266/IPAddress.h

@@ -36,7 +36,7 @@
 #define IP_SET_TYPE_VAL(x,y) do { (void)0; } while (0)
 #define IP_ANY_TYPE (&ip_addr_any)
 #define IP4_ADDR_ANY IPADDR_ANY
-#define IP4_ADDR_ANY4 IPADDR_ANY
+#define IP4_ADDR_ANY4 IP_ADDR_ANY
 #define IPADDR4_INIT(x) { x }
 #define CONST /* nothing: lwIP-v1 does not use const */
 #define ip4_addr_netcmp ip_addr_netcmp
@@ -136,6 +136,7 @@ class IPAddress: public Printable {
         // Overloaded copy operators to allow initialisation of IPAddress objects from other types
         IPAddress& operator=(const uint8_t *address);
         IPAddress& operator=(uint32_t address);
+        IPAddress& operator=(const IPAddress&) = default;
 
         virtual size_t printTo(Print& p) const;
         String toString() const;