Merge branch 'master' of https://github.com/esp8266/Arduino

Author: earlephilhower

boards.txt

@@ -180,37 +180,37 @@ generic.menu.FlashSize.16M15M.build.spiffs_start=0x100000
 generic.menu.FlashSize.16M15M.build.spiffs_end=0xFFB000
 generic.menu.FlashSize.16M15M.build.spiffs_blocksize=8192
 generic.menu.led.2=2
-generic.menu.led.2.build.led=-DUSERLED=2
+generic.menu.led.2.build.led=-DLED_BUILTIN=2
 generic.menu.led.0=0
-generic.menu.led.0.build.led=-DUSERLED=0
+generic.menu.led.0.build.led=-DLED_BUILTIN=0
 generic.menu.led.1=1
-generic.menu.led.1.build.led=-DUSERLED=1
+generic.menu.led.1.build.led=-DLED_BUILTIN=1
 generic.menu.led.3=3
-generic.menu.led.3.build.led=-DUSERLED=3
+generic.menu.led.3.build.led=-DLED_BUILTIN=3
 generic.menu.led.4=4
-generic.menu.led.4.build.led=-DUSERLED=4
+generic.menu.led.4.build.led=-DLED_BUILTIN=4
 generic.menu.led.5=5
-generic.menu.led.5.build.led=-DUSERLED=5
+generic.menu.led.5.build.led=-DLED_BUILTIN=5
 generic.menu.led.6=6
-generic.menu.led.6.build.led=-DUSERLED=6
+generic.menu.led.6.build.led=-DLED_BUILTIN=6
 generic.menu.led.7=7
-generic.menu.led.7.build.led=-DUSERLED=7
+generic.menu.led.7.build.led=-DLED_BUILTIN=7
 generic.menu.led.8=8
-generic.menu.led.8.build.led=-DUSERLED=8
+generic.menu.led.8.build.led=-DLED_BUILTIN=8
 generic.menu.led.9=9
-generic.menu.led.9.build.led=-DUSERLED=9
+generic.menu.led.9.build.led=-DLED_BUILTIN=9
 generic.menu.led.10=10
-generic.menu.led.10.build.led=-DUSERLED=10
+generic.menu.led.10.build.led=-DLED_BUILTIN=10
 generic.menu.led.11=11
-generic.menu.led.11.build.led=-DUSERLED=11
+generic.menu.led.11.build.led=-DLED_BUILTIN=11
 generic.menu.led.12=12
-generic.menu.led.12.build.led=-DUSERLED=12
+generic.menu.led.12.build.led=-DLED_BUILTIN=12
 generic.menu.led.13=13
-generic.menu.led.13.build.led=-DUSERLED=13
+generic.menu.led.13.build.led=-DLED_BUILTIN=13
 generic.menu.led.14=14
-generic.menu.led.14.build.led=-DUSERLED=14
+generic.menu.led.14.build.led=-DLED_BUILTIN=14
 generic.menu.led.15=15
-generic.menu.led.15.build.led=-DUSERLED=15
+generic.menu.led.15.build.led=-DLED_BUILTIN=15
 generic.menu.LwIPVariant.v2mss536=v2 Lower Memory
 generic.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
 generic.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
@@ -394,37 +394,37 @@ esp8285.menu.FlashSize.1M512.build.spiffs_start=0x7B000
 esp8285.menu.FlashSize.1M512.build.spiffs_end=0xFB000
 esp8285.menu.FlashSize.1M512.build.spiffs_blocksize=8192
 esp8285.menu.led.2=2
-esp8285.menu.led.2.build.led=-DUSERLED=2
+esp8285.menu.led.2.build.led=-DLED_BUILTIN=2
 esp8285.menu.led.0=0
-esp8285.menu.led.0.build.led=-DUSERLED=0
+esp8285.menu.led.0.build.led=-DLED_BUILTIN=0
 esp8285.menu.led.1=1
-esp8285.menu.led.1.build.led=-DUSERLED=1
+esp8285.menu.led.1.build.led=-DLED_BUILTIN=1
 esp8285.menu.led.3=3
-esp8285.menu.led.3.build.led=-DUSERLED=3
+esp8285.menu.led.3.build.led=-DLED_BUILTIN=3
 esp8285.menu.led.4=4
-esp8285.menu.led.4.build.led=-DUSERLED=4
+esp8285.menu.led.4.build.led=-DLED_BUILTIN=4
 esp8285.menu.led.5=5
-esp8285.menu.led.5.build.led=-DUSERLED=5
+esp8285.menu.led.5.build.led=-DLED_BUILTIN=5
 esp8285.menu.led.6=6
-esp8285.menu.led.6.build.led=-DUSERLED=6
+esp8285.menu.led.6.build.led=-DLED_BUILTIN=6
 esp8285.menu.led.7=7
-esp8285.menu.led.7.build.led=-DUSERLED=7
+esp8285.menu.led.7.build.led=-DLED_BUILTIN=7
 esp8285.menu.led.8=8
-esp8285.menu.led.8.build.led=-DUSERLED=8
+esp8285.menu.led.8.build.led=-DLED_BUILTIN=8
 esp8285.menu.led.9=9
-esp8285.menu.led.9.build.led=-DUSERLED=9
+esp8285.menu.led.9.build.led=-DLED_BUILTIN=9
 esp8285.menu.led.10=10
-esp8285.menu.led.10.build.led=-DUSERLED=10
+esp8285.menu.led.10.build.led=-DLED_BUILTIN=10
 esp8285.menu.led.11=11
-esp8285.menu.led.11.build.led=-DUSERLED=11
+esp8285.menu.led.11.build.led=-DLED_BUILTIN=11
 esp8285.menu.led.12=12
-esp8285.menu.led.12.build.led=-DUSERLED=12
+esp8285.menu.led.12.build.led=-DLED_BUILTIN=12
 esp8285.menu.led.13=13
-esp8285.menu.led.13.build.led=-DUSERLED=13
+esp8285.menu.led.13.build.led=-DLED_BUILTIN=13
 esp8285.menu.led.14=14
-esp8285.menu.led.14.build.led=-DUSERLED=14
+esp8285.menu.led.14.build.led=-DLED_BUILTIN=14
 esp8285.menu.led.15=15
-esp8285.menu.led.15.build.led=-DUSERLED=15
+esp8285.menu.led.15.build.led=-DLED_BUILTIN=15
 esp8285.menu.LwIPVariant.v2mss536=v2 Lower Memory
 esp8285.menu.LwIPVariant.v2mss536.build.lwip_include=lwip2/include
 esp8285.menu.LwIPVariant.v2mss536.build.lwip_lib=-llwip2
@@ -2481,7 +2481,7 @@ d1_mini_lite.menu.UploadSpeed.512000.upload.speed=512000
 
 ##############################################################
 d1.name=WeMos D1 R1
-d1.build.board=ESP8266_WEMOS_D1MINI
+d1.build.board=ESP8266_WEMOS_D1R1
 d1.build.variant=d1
 d1.upload.tool=esptool
 d1.upload.maximum_data_size=81920

cores/esp8266/Arduino.h

@@ -85,9 +85,13 @@ extern "C" {
 #define EXTERNAL 0
 
 //timer dividers
-#define TIM_DIV1 	0 //80MHz (80 ticks/us - 104857.588 us max)
-#define TIM_DIV16	1 //5MHz (5 ticks/us - 1677721.4 us max)
-#define TIM_DIV265	3 //312.5Khz (1 tick = 3.2us - 26843542.4 us max)
+enum TIM_DIV_ENUM {
+  TIM_DIV1 = 0,   //80MHz (80 ticks/us - 104857.588 us max)
+  TIM_DIV16 = 1,  //5MHz (5 ticks/us - 1677721.4 us max)
+  TIM_DIV256 = 3 //312.5Khz (1 tick = 3.2us - 26843542.4 us max)
+};
+
+
 //timer int_types
 #define TIM_EDGE	0
 #define TIM_LEVEL	1
@@ -236,7 +240,17 @@ void optimistic_yield(uint32_t interval_us);
 } // extern "C"
 #endif
 
+
+//for compatibility, below 4 lines to be removed in release 3.0.0
 #ifdef __cplusplus
+extern "C"
+#endif
+const int TIM_DIV265 __attribute__((deprecated, weak)) = TIM_DIV256;
+
+
+
+#ifdef __cplusplus
+
 #include <algorithm>
 #include "pgmspace.h"
 

doc/esp8266wifi/readme.rst

@@ -302,7 +302,7 @@ The same sketch without ``Serial.setDebugOutput(true)`` will print out only the
 Enable Debugging in IDE
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-Arduino IDE provides convenient method to `enable debugging <https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/debugging.rst>`__ for specific libraries.
+Arduino IDE provides convenient method to `enable debugging <../Troubleshooting/debugging.rst>`__ for specific libraries.
 
 What's Inside?
 --------------

doc/faq/a02-my-esp-crashes.rst

@@ -83,7 +83,7 @@ is wrong, it restarts itself to tell you about it.
 There are two typical scenarios that trigger ESP restarts:
 
 -  **Exception** - when code is performing `illegal
-   operation <https://github.com/esp8266/Arduino/blob/master/doc/exception_causes.rst>`__,
+   operation <../exception_causes.rst>`__,
    like trying to write to non-existent memory location.
 -  **Watchdog** - if code is `locked
    up <https://en.wikipedia.org/wiki/Watchdog_timer>`__ staying too long
@@ -104,7 +104,7 @@ Typical restart because of exception looks like follows:
    Exception cause decoding
 
 Start with looking up exception code in the `Exception Causes
-(EXCCAUSE) <https://github.com/esp8266/Arduino/blob/master/doc/exception_causes.rst>`__
+(EXCCAUSE) <../exception_causes.rst>`__
 table to understand what kind of issue it is. If you have no clues what
 it's about and where it happens, then use `Arduino ESP8266/ESP32
 Exception Stack Trace

doc/faq/a04-board-generic-is-unknown.rst

@@ -54,15 +54,15 @@ follows:
     Error compiling for board Generic ESP8266 Module.
 
 Below is an example messages for
-`WeMos <https://github.com/esp8266/Arduino/blob/master/doc/boards.rst#wemos-d1>`__:
+`WeMos <../boards.rst#wemos-d1-r2-mini>`__:
 
 ::
 
     Board d1_mini (platform esp8266, package esp8266) is unknown
     Error compiling for board WeMos D1 R2 & mini.
 
-... and another one for `Adafruit
-HUZZAH <https://github.com/esp8266/Arduino/blob/master/doc/boards.rst#adafruit-huzzah-esp8266-esp-12>`__:
+... and another one for `Adafruit Feather
+HUZZAH <../boards.rst#adafruit-feather-huzzah-esp8266>`__:
 
 ::
 

doc/faq/readme.rst

@@ -88,3 +88,31 @@ This error may pop up after switching between
 `stable <https://github.com/esp8266/Arduino#stable-version->`__ esp8266
 / Arduino package installations, or after upgrading the package version
 :doc:`Read more <a04-board-generic-is-unknown>`.
+
+
+How to clear TCP PCBs in time-wait state ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This is needed with lwIP-v1.4, less needed with lwIP-v2 but timeout is still
+too high.
+
+Time-wait PCB state helps TCP not confusing two consecutive connections with the
+same (s-ip,s-port,d-ip,d-port) when the first is already closed but still
+having duplicate packets lost in internet arriving later during the second. 
+Artificially clearing them is a workaround to help saving precious heap.
+
+The following lines are compatible with both lwIP versions:
+
+.. code:: cpp
+
+    // no need for #include
+    struct tcp_pcb;
+    extern struct tcp_pcb* tcp_tw_pcbs;
+    extern "C" void tcp_abort (struct tcp_pcb* pcb);
+    
+    void tcpCleanup (void) {
+      while (tcp_tw_pcbs)
+        tcp_abort(tcp_tw_pcbs);
+    }
+
+Ref.  `#1923 <https://github.com/esp8266/Arduino/issues/1923>`__

doc/reference.rst

@@ -149,7 +149,7 @@ current speed. For example
 | ``Serial`` and ``Serial1`` objects are both instances of the
   ``HardwareSerial`` class.
 | I've done this also for official ESP8266 `Software
-  Serial <https://github.com/esp8266/Arduino/blob/master/doc/libraries.rst#softwareserial>`__
+  Serial <libraries.rst#softwareserial>`__
   library, see this `pull
   request <https://github.com/plerup/espsoftwareserial/pull/22>`__.
 | Note that this implementation is **only for ESP8266 based boards**,