esp8266 · igrr · Oct 15, 2017 · May 23, 2017 · May 23, 2017 · Oct 14, 2017
diff --git a/boards.txt b/boards.txt
@@ -182,6 +182,20 @@ generic.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
 generic.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
 generic.menu.FlashSize.4M3M.upload.maximum_size=1044464
 
+generic.menu.FlashSize.8M=8M (7M SPIFFS)
+generic.menu.FlashSize.8M.build.flash_size=8M
+generic.menu.FlashSize.8M.build.flash_ld=eagle.flash.8m.ld
+generic.menu.FlashSize.8M.build.spiffs_start=0x100000
+generic.menu.FlashSize.8M.build.spiffs_end=0x800000
+generic.menu.FlashSize.8M.build.spiffs_blocksize=8192
+
+generic.menu.FlashSize.16M=16M (15M SPIFFS)
+generic.menu.FlashSize.16M.build.flash_size=16M
+generic.menu.FlashSize.16M.build.flash_ld=eagle.flash.16m.ld
+generic.menu.FlashSize.16M.build.spiffs_start=0x100000
+generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
+generic.menu.FlashSize.16M.build.spiffs_blocksize=8192
+
 generic.menu.ResetMethod.ck=ck
 generic.menu.ResetMethod.ck.upload.resetmethod=ck
 generic.menu.ResetMethod.nodemcu=nodemcu
@@ -227,19 +241,6 @@ generic.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_U
 generic.menu.DebugLevel.all_____=All
 generic.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
 
-# disabled because espressif's bootloader refuses to write above 4M
-# generic.menu.FlashSize.8M=8M (7M SPIFFS)
-# generic.menu.FlashSize.8M.build.flash_size=1M
-# generic.menu.FlashSize.8M.build.flash_ld=eagle.flash.8m.ld
-# generic.menu.FlashSize.8M.build.spiffs_start=0x100000
-# generic.menu.FlashSize.8M.build.spiffs_end=0x800000
-# generic.menu.FlashSize.8M.build.spiffs_blocksize=8192
-# generic.menu.FlashSize.16M=16M (15M SPIFFS)
-# generic.menu.FlashSize.16M.build.flash_size=1M
-# generic.menu.FlashSize.16M.build.flash_ld=eagle.flash.16m.ld
-# generic.menu.FlashSize.16M.build.spiffs_start=0x100000
-# generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
-# generic.menu.FlashSize.16M.build.spiffs_blocksize=8192
 
 ##############################################################
 # ESP8285 chip has built-in 1MB flash

diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiScan.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiScan.cpp
@@ -294,15 +294,15 @@ void ESP8266WiFiScanClass::_scanDone(void* result, int status) {
         int i = 0;
         bss_info* head = reinterpret_cast<bss_info*>(result);
 
-        for(bss_info* it = head; it; it = it->next, ++i)
+        for(bss_info* it = head; it; it = STAILQ_NEXT(it, next), ++i)
             ;
         ESP8266WiFiScanClass::_scanCount = i;
         if(i == 0) {
             ESP8266WiFiScanClass::_scanResult = 0;
         } else {
             bss_info* copied_info = new bss_info[i];
             i = 0;
-            for(bss_info* it = head; it; it = it->next, ++i) {
+            for(bss_info* it = head; it; it = STAILQ_NEXT(it, next), ++i) {
                 memcpy(copied_info + i, it, sizeof(bss_info));
             }
 

diff --git a/libraries/ESP8266WiFi/src/WiFiServer.cpp b/libraries/ESP8266WiFi/src/WiFiServer.cpp
@@ -151,7 +151,7 @@ T* slist_append_tail(T* head, T* item) {
     return head;
 }
 
-int8_t WiFiServer::_accept(tcp_pcb* apcb, int8_t err) {
+long WiFiServer::_accept(tcp_pcb* apcb, long err) {
     (void) err;
     DEBUGV("WS:ac\r\n");
     ClientContext* client = new ClientContext(apcb, &WiFiServer::_s_discard, this);
@@ -166,7 +166,7 @@ void WiFiServer::_discard(ClientContext* client) {
     DEBUGV("WS:dis\r\n");
 }
 
-int8_t WiFiServer::_s_accept(void *arg, tcp_pcb* newpcb, int8_t err) {
+long WiFiServer::_s_accept(void *arg, tcp_pcb* newpcb, long err) {
     return reinterpret_cast<WiFiServer*>(arg)->_accept(newpcb, err);
 }
 

diff --git a/libraries/ESP8266WiFi/src/WiFiServer.h b/libraries/ESP8266WiFi/src/WiFiServer.h
@@ -62,10 +62,10 @@ class WiFiServer : public Server {
   using Print::write;
 
 protected:
-  int8_t _accept(tcp_pcb* newpcb, int8_t err);
+  long _accept(tcp_pcb* newpcb, long err);
   void   _discard(ClientContext* client);
 
-  static int8_t _s_accept(void *arg, tcp_pcb* newpcb, int8_t err);
+  static long _s_accept(void *arg, tcp_pcb* newpcb, long err);
   static void _s_discard(void* server, ClientContext* ctx);
 };
 

diff --git a/libraries/ESP8266WiFi/src/include/ClientContext.h b/libraries/ESP8266WiFi/src/include/ClientContext.h
@@ -29,12 +29,6 @@ typedef void (*discard_cb_t)(void*, ClientContext*);
 extern "C" void esp_yield();
 extern "C" void esp_schedule();
 
-#ifdef LWIP_OPEN_SRC
-typedef err_t recv_ret_t;
-#else
-typedef int32_t recv_ret_t;
-#endif
-
 #include "DataSource.h"
 
 class ClientContext
@@ -45,7 +39,7 @@ class ClientContext
     {
         tcp_setprio(pcb, TCP_PRIO_MIN);
         tcp_arg(pcb, this);
-        tcp_recv(pcb, (tcp_recv_fn) &_s_recv);
+        tcp_recv(pcb, &_s_recv);
         tcp_sent(pcb, &_s_sent);
         tcp_err(pcb, &_s_error);
         tcp_poll(pcb, &_s_poll, 1);
@@ -78,7 +72,7 @@ class ClientContext
             tcp_poll(_pcb, NULL, 0);
             err = tcp_close(_pcb);
             if(err != ERR_OK) {
-                DEBUGV(":tc err %d\r\n", err);
+                DEBUGV(":tc err %d\r\n", (int) err);
                 tcp_abort(_pcb);
                 err = ERR_ABRT;
             }
@@ -126,7 +120,7 @@ class ClientContext
 
     int connect(ip_addr_t* addr, uint16_t port)
     {
-        err_t err = tcp_connect(_pcb, addr, port, reinterpret_cast<tcp_connected_fn>(&ClientContext::_s_connected));
+        err_t err = tcp_connect(_pcb, addr, port, &ClientContext::_s_connected);
         if (err != ERR_OK) {
             return 0;
         }
@@ -396,7 +390,7 @@ class ClientContext
                 break;
             }
             err_t err = tcp_write(_pcb, buf, next_chunk, TCP_WRITE_FLAG_COPY);
-            DEBUGV(":wrc %d %d %d\r\n", next_chunk, will_send, err);
+            DEBUGV(":wrc %d %d %d\r\n", next_chunk, will_send, (int) err);
             _datasource->release_buffer(buf, next_chunk);
             if (err == ERR_OK) {
                 _written += next_chunk;
@@ -456,7 +450,7 @@ class ClientContext
         }
     }
 
-    recv_ret_t _recv(tcp_pcb* pcb, pbuf* pb, err_t err)
+    err_t _recv(tcp_pcb* pcb, pbuf* pb, err_t err)
     {
         (void) pcb;
         (void) err;
@@ -481,7 +475,7 @@ class ClientContext
     void _error(err_t err)
     {
         (void) err;
-        DEBUGV(":er %d %08x\r\n", err, (uint32_t) _datasource);
+        DEBUGV(":er %d 0x%08x\r\n", (int) err, (uint32_t) _datasource);
         tcp_arg(_pcb, NULL);
         tcp_sent(_pcb, NULL);
         tcp_recv(_pcb, NULL);
@@ -490,7 +484,7 @@ class ClientContext
         _notify_error();
     }
 
-    int8_t _connected(void* pcb, int8_t err)
+    err_t _connected(struct tcp_pcb *pcb, err_t err)
     {
         (void) err;
         assert(pcb == _pcb);
@@ -505,7 +499,7 @@ class ClientContext
         return ERR_OK;
     }
 
-    static recv_ret_t _s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, err_t err)
+    static err_t _s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, err_t err)
     {
         return reinterpret_cast<ClientContext*>(arg)->_recv(tpcb, pb, err);
     }
@@ -525,7 +519,7 @@ class ClientContext
         return reinterpret_cast<ClientContext*>(arg)->_sent(tpcb, len);
     }
 
-    static int8_t _s_connected(void* arg, void* pcb, int8_t err)
+    static err_t _s_connected(void* arg, struct tcp_pcb *pcb, err_t err)
     {
         return reinterpret_cast<ClientContext*>(arg)->_connected(pcb, err);
     }

diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json
@@ -82,7 +82,7 @@
             {
               "packager": "esp8266",
               "name": "esptool",
-              "version": "0.4.9"
+              "version": "0.4.12"
             },
             {
               "packager": "esp8266",
@@ -100,49 +100,49 @@
       "tools": [
         {
           "name": "esptool",
-          "version": "0.4.9",
+          "version": "0.4.12",
           "systems": [
             {
               "host": "i686-mingw32",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-win32.zip",
-              "archiveFileName": "esptool-0.4.9-win32.zip",
-              "checksum": "SHA-256:9c4162cedf05fcb09fd829bfb90e34ae12458365980d79525a072ff5ca44751c",
-              "size": "32436"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.12/esptool-0.4.12-win32.zip",
+              "archiveFileName": "esptool-0.4.12-win32.zip",
+              "checksum": "SHA-256:f47b3bcf7c29c7a184859bbea68c9d468cf3346ca41e202ed60a0a49d987f223",
+              "size": "16537"
             },
             {
               "host": "x86_64-apple-darwin",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-osx.tar.gz",
-              "archiveFileName": "esptool-0.4.9-osx.tar.gz",
-              "checksum": "SHA-256:57938b473765723a7e6602d55973017b7719bda69bdcff4250b24fcbf7a399f5",
-              "size": "29310"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.12/esptool-0.4.12-osx.tar.gz",
+              "archiveFileName": "esptool-0.4.12-osx.tar.gz",
+              "checksum": "SHA-256:8232a70611768dca49321f488e3ada29648e28aa83a6d826fcbb871aed4a9c08",
+              "size": "31981"
             },
             {
               "host": "i386-apple-darwin",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-osx.tar.gz",
-              "archiveFileName": "esptool-0.4.9-osx.tar.gz",
-              "checksum": "SHA-256:57938b473765723a7e6602d55973017b7719bda69bdcff4250b24fcbf7a399f5",
-              "size": "29310"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.12/esptool-0.4.12-osx.tar.gz",
+              "archiveFileName": "esptool-0.4.12-osx.tar.gz",
+              "checksum": "SHA-256:8232a70611768dca49321f488e3ada29648e28aa83a6d826fcbb871aed4a9c08",
+              "size": "31981"
             },
             {
               "host": "x86_64-pc-linux-gnu",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-linux64.tar.gz",
-              "archiveFileName": "esptool-0.4.9-linux64.tar.gz",
-              "checksum": "SHA-256:fab9d1be8a648bea6728ad5c9d18ce972508187700cf90baf1897ac9cdf4db15",
-              "size": "15564"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.12/esptool-0.4.12-linux64.tar.gz",
+              "archiveFileName": "esptool-0.4.12-linux64.tar.gz",
+              "checksum": "SHA-256:f7ca7666557139bda7b2130022623a004a30d20ea47e1612b9b365783f00d8cb",
+              "size": "15542"
             },
             {
               "host": "i686-pc-linux-gnu",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-linux32.tar.gz",
-              "archiveFileName": "esptool-0.4.9-linux32.tar.gz",
-              "checksum": "SHA-256:bc4444d73d59be74608be5e1431353a0a9ae9e308e99c76a271d68a6ae145b7b",
-              "size": "15984"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.12/esptool-0.4.12-linux32.tar.gz",
+              "archiveFileName": "esptool-0.4.12-linux32.tar.gz",
+              "checksum": "SHA-256:2d9970c8574908c35656e35f433082aeb7d79c1967067d7d2cff83f5ed2acbaa",
+              "size": "14668"
             },
             {
               "host": "arm-linux-gnueabihf",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-linux-armhf.tar.gz",
-              "archiveFileName": "esptool-0.4.9-linux-armhf.tar.gz",
-              "checksum": "SHA-256:d0364492599d90b8305125f8212de5be05397e4efde2fc7d0ed3676bb7018164",
-              "size": "13763"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.12/esptool-0.4.12-linux-armhf.tar.gz",
+              "archiveFileName": "esptool-0.4.12-linux-armhf.tar.gz",
+              "checksum": "SHA-256:2ab4784c10020cdfc467175fe8885db702e7dd95fa5bdc428ec549257eae1a0e",
+              "size": "13097"
             }
           ]
         },

diff --git a/tools/sdk/License b/tools/sdk/License
@@ -1,24 +1,20 @@
-ESPRSSIF MIT License
+ESPRESSIF MIT License
 
 Copyright (c) 2015 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
 
-Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case, it is free of charge, to any person obtaining a copy of this software and associated documentation files (the ��Software��), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case, it is free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED ��AS IS��, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-���� MIT ����֤
-
-��Ȩ (c) 2015  <������Ϣ�Ƽ����Ϻ������޹�˾>
-
-������֤��Ȩ������������Ϣ�Ƽ� ESP8266 ��Ʒ��Ӧ�ÿ������ڴ�����£�������֤�����Ȩ�κλ�ø�������������ĵ���ͳ��Ϊ�������������������Ƶؾ�Ӫ�����������������Ƶ�ʹ�á����ơ��޸ġ��ϲ������淢�С�ɢ��������Ȩ������������������������Ȩ��������Ȩ����������ЩȨ����ͬʱ������������������
-
-�����������������и����ж�����������ϵİ�Ȩ��������Ȩ������
-
-�������������������ṩ��û���κ���ȷ�򰵺��ĵ������������������ڹ��������ԡ��ʺ�ĳһ�ض���;�ͷ���Ȩ�ı�֤�����ߺͰ�Ȩ���������κ�����¾�����������������ʹ��������Ժ�ͬ��ʽ��������Ȩ��������ʽ������κ����⡢�𺦻��������θ���
+乐鑫 MIT 许可证
 
+版权 (c) 2015  <乐鑫信息科技（上海）有限公司>
 
+该许可证授权仅限于乐鑫信息科技 ESP8266 产品的应用开发。在此情况下，该许可证免费授权任何获得该软件及其相关文档（统称为“软件”）的人无限制地经营该软件，包括无限制的使用、复制、修改、合并、出版发行、散布、再授权、及贩售软件及软件副本的权利。被授权人在享受这些权利的同时，需服从下面的条件：
 
+在软件和软件的所有副本中都必须包含以上的版权声明和授权声明。
 
+该软件按本来的样子提供，没有任何明确或暗含的担保，包括但不仅限于关于试销性、适合某一特定用途和非侵权的保证。作者和版权持有人在任何情况下均不就由软件或软件使用引起的以合同形式、民事侵权或其它方式提出的任何索赔、损害或其它责任负责。
diff --git a/tools/sdk/changelog.txt b/tools/sdk/changelog.txt
diff --git a/tools/sdk/include/at_custom.h b/tools/sdk/include/at_custom.h
@@ -1,21 +1,25 @@
-
 /*
- * custom_at.h
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
  *
- * This file is part of Espressif's AT+ command set program.
- * Copyright (C) 2013 - 2016, Espressif Systems
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of version 3 of the GNU General Public License as
- * published by the Free Software Foundation.
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CUSTOM_AT_H_

diff --git a/tools/sdk/include/c_types.h b/tools/sdk/include/c_types.h
@@ -1,5 +1,24 @@
 /*
- *  Copyright (c) 2010 - 2011 Espressif System
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 

diff --git a/tools/sdk/include/eagle_soc.h b/tools/sdk/include/eagle_soc.h
@@ -1,5 +1,24 @@
 /*
- *  Copyright (c) Espressif System 2010 - 2012
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
@@ -305,10 +324,11 @@
 
 #define PIN_PULLUP_DIS(PIN_NAME)                 CLEAR_PERI_REG_MASK(PIN_NAME, PERIPHS_IO_MUX_PULLUP)
 #define PIN_PULLUP_EN(PIN_NAME)                  SET_PERI_REG_MASK(PIN_NAME, PERIPHS_IO_MUX_PULLUP)
+
 #define PIN_FUNC_SELECT(PIN_NAME, FUNC)  do { \
     WRITE_PERI_REG(PIN_NAME,   \
-                                READ_PERI_REG(PIN_NAME) \
-                                     &  (~(PERIPHS_IO_MUX_FUNC<<PERIPHS_IO_MUX_FUNC_S))  \
+                                (READ_PERI_REG(PIN_NAME) \
+                                     &  (~(PERIPHS_IO_MUX_FUNC<<PERIPHS_IO_MUX_FUNC_S)))  \
                                      |( (((FUNC&BIT2)<<2)|(FUNC&0x3))<<PERIPHS_IO_MUX_FUNC_S) );  \
     } while (0)
 

diff --git a/tools/sdk/include/espconn.h b/tools/sdk/include/espconn.h
@@ -1,3 +1,27 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
 #ifndef __ESPCONN_H__
 #define __ESPCONN_H__
 
@@ -709,7 +733,14 @@ void espconn_mdns_enable(void);
  * 			      dnsserver -- IP address of the DNS server to set
  *  Returns     : none
 *******************************************************************************/
-void espconn_dns_setserver(char numdns, ip_addr_t *dnsserver);
-
+void espconn_dns_setserver(uint8 numdns, ip_addr_t *dnsserver);
+/******************************************************************************
+ * FunctionName : espconn_dns_getserver
+ * Description  : get dns server.
+ * Parameters   : numdns -- the index of the DNS server, must
+ *                be < DNS_MAX_SERVERS = 2
+ *  Returns     : dnsserver -- IP address of the DNS server to set
+*******************************************************************************/
+ip_addr_t espconn_dns_getserver(uint8 numdns);
 #endif
 
diff --git a/tools/sdk/include/espnow.h b/tools/sdk/include/espnow.h
@@ -1,5 +1,24 @@
 /*
- *  Copyright (C) 2015 -2018  Espressif System
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 

diff --git a/tools/sdk/include/ets_sys.h b/tools/sdk/include/ets_sys.h
@@ -1,7 +1,24 @@
 /*
- * copyright (c) 2008 - 2011 Espressif System
+ * ESPRESSIF MIT License
  *
- * Define user specified Event signals and Task priorities here
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
@@ -51,6 +68,14 @@ typedef void (*int_handler_t)(void*);
 #define ETS_WDT_INUM        8
 #define ETS_FRC_TIMER1_INUM 9  /* use edge*/
 
+typedef void (* ets_isr_t)(void *);
+
+void ets_intr_lock(void);
+void ets_intr_unlock(void);
+void ets_isr_attach(int i, ets_isr_t func, void *arg);
+
+void NmiTimSetFunc(void (*func)(void));
+
 #define ETS_INTR_LOCK() \
     ets_intr_lock()
 
@@ -176,7 +201,6 @@ int ets_sprintf(char *str, const char *format, ...)  __attribute__ ((format (pri
 int os_snprintf(char *str, size_t size, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
 int ets_printf(const char *format, ...)  __attribute__ ((format (printf, 1, 2)));
 void ets_install_putc1(void* routine);
-void uart_div_modify(int no, int freq);
 void ets_isr_mask(int intr);
 void ets_isr_unmask(int intr);
 void ets_isr_attach(int intr, int_handler_t handler, void *arg);

diff --git a/tools/sdk/include/gpio.h b/tools/sdk/include/gpio.h
@@ -1,5 +1,24 @@
 /*
- * copyright (c) Espressif System 2010
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 

diff --git a/tools/sdk/include/ip_addr.h b/tools/sdk/include/ip_addr.h
@@ -1,3 +1,27 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
 #ifndef __IP_ADDR_H__
 #define __IP_ADDR_H__
 
@@ -53,10 +77,11 @@ struct ip_info {
 #define IPADDR_ANY          ((uint32)0x00000000UL)
 uint32 ipaddr_addr(const char *cp);
 
-#define IP2STR(addr) (uint8_t)(addr & 0xFF), (uint8_t)((addr >> 8) & 0xFF), (uint8_t)((addr >> 16) & 0xFF), (uint8_t)((addr >> 24) & 0xFF)
-#define IPSTR "%d.%d.%d.%d"
+#define IP2STR(ipaddr) ip4_addr1_16(ipaddr), \
+    ip4_addr2_16(ipaddr), \
+    ip4_addr3_16(ipaddr), \
+    ip4_addr4_16(ipaddr)
 
-#define MAC2STR(mac) (uint8_t)mac[0], (uint8_t)mac[1], (uint8_t)mac[2], (uint8_t)mac[3], (uint8_t)mac[4], (uint8_t)mac[5]
-#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
+#define IPSTR "%d.%d.%d.%d"
 
 #endif /* __IP_ADDR_H__ */
diff --git a/tools/sdk/include/mem.h b/tools/sdk/include/mem.h
@@ -1,3 +1,27 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
 #ifndef __MEM_H__
 #define __MEM_H__
 

diff --git a/tools/sdk/include/mesh.h b/tools/sdk/include/mesh.h
@@ -1,5 +1,5 @@
 /*
- * ESPRSSIF MIT License
+ * ESPRESSIF MIT License
  *
  * Copyright (c) 2015 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
  *

diff --git a/tools/sdk/include/os_type.h b/tools/sdk/include/os_type.h
@@ -1,9 +1,27 @@
 /*
- * copyright (c) Espressif System 2010
+ * ESPRESSIF MIT License
  *
- * mapping to ETS structures
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
 #ifndef _OS_TYPES_H_
 #define _OS_TYPES_H_
 

diff --git a/tools/sdk/include/osapi.h b/tools/sdk/include/osapi.h
@@ -1,5 +1,25 @@
 /*
- * Copyright (c) 2010 Espressif System
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
  */
 
 #ifndef _OSAPI_H_
@@ -44,13 +64,13 @@
 #define os_sprintf  ets_sprintf
 #define os_update_cpu_frequency ets_update_cpu_frequency
 
+extern int os_printf_plus(const char * format, ...) __attribute__ ((format (printf, 1, 2)));
 #ifdef USE_OPTIMIZE_PRINTF
 #define os_printf(fmt, ...) do {	\
 	static const char flash_str[] ICACHE_RODATA_ATTR STORE_ATTR = fmt;	\
 	os_printf_plus(flash_str, ##__VA_ARGS__);	\
 	} while(0)
 #else
-extern int os_printf_plus(const char * format, ...) __attribute__ ((format (printf, 1, 2)));
 #define os_printf	os_printf_plus
 #endif
 

diff --git a/tools/sdk/include/ping.h b/tools/sdk/include/ping.h
@@ -1,3 +1,27 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
 #ifndef __PING_H__
 #define __PING_H__
 

diff --git a/tools/sdk/include/pwm.h b/tools/sdk/include/pwm.h
@@ -1,34 +1,58 @@
-#ifndef __PWM_H__
-#define __PWM_H__
-
-/*pwm.h: function and macro definition of PWM API , driver level */
-/*user_light.h: user interface for light API, user level*/
-/*user_light_adj: API for color changing and lighting effects, user level*/
-
-
- /*NOTE!!  : DO NOT CHANGE THIS FILE*/
-
- /*SUPPORT UP TO 8 PWM CHANNEL*/
-#define PWM_CHANNEL_NUM_MAX 8 
-
-struct pwm_param {
-    uint32 period;
-    uint32 freq;
-    uint32  duty[PWM_CHANNEL_NUM_MAX];  //PWM_CHANNEL<=8
-};
-
-
-/* pwm_init should be called only once, for now  */
-void pwm_init(uint32 period, uint32 *duty,uint32 pwm_channel_num,uint32 (*pin_info_list)[3]);
-void pwm_start(void);
-
-void pwm_set_duty(uint32 duty, uint8 channel);
-uint32 pwm_get_duty(uint8 channel);
-void pwm_set_period(uint32 period);
-uint32 pwm_get_period(void);
-
-uint32 get_pwm_version(void);
-void set_pwm_debug_en(uint8 print_en);
-
-#endif
-
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef __PWM_H__
+#define __PWM_H__
+
+/*pwm.h: function and macro definition of PWM API , driver level */
+/*user_light.h: user interface for light API, user level*/
+/*user_light_adj: API for color changing and lighting effects, user level*/
+
+
+ /*NOTE!!  : DO NOT CHANGE THIS FILE*/
+
+ /*SUPPORT UP TO 8 PWM CHANNEL*/
+#define PWM_CHANNEL_NUM_MAX 8 
+
+struct pwm_param {
+    uint32 period;
+    uint32 freq;
+    uint32  duty[PWM_CHANNEL_NUM_MAX];  //PWM_CHANNEL<=8
+};
+
+
+/* pwm_init should be called only once, for now  */
+void pwm_init(uint32 period, uint32 *duty,uint32 pwm_channel_num,uint32 (*pin_info_list)[3]);
+void pwm_start(void);
+
+void pwm_set_duty(uint32 duty, uint8 channel);
+uint32 pwm_get_duty(uint8 channel);
+void pwm_set_period(uint32 period);
+uint32 pwm_get_period(void);
+
+uint32 get_pwm_version(void);
+void set_pwm_debug_en(uint8 print_en);
+
+#endif
+
diff --git a/tools/sdk/include/queue.h b/tools/sdk/include/queue.h
@@ -1,4 +1,236 @@
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  @(#)queue.h 8.5 (Berkeley) 8/20/94
+ * $FreeBSD$
+ */
+
 #ifndef _SYS_QUEUE_H_
 #define	_SYS_QUEUE_H_
 
+#define	QMD_SAVELINK(name, link)
+#define	TRASHIT(x)
+
+/*
+ * Singly-linked List declarations.
+ */
+#define	SLIST_HEAD(name, type)						\
+struct name {								\
+	struct type *slh_first;	/* first element */			\
+}
+
+#define	SLIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+
+#define	SLIST_ENTRY(type)						\
+struct {								\
+	struct type *sle_next;	/* next element */			\
+}
+
+/*
+ * Singly-linked List functions.
+ */
+#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
+
+#define	SLIST_FIRST(head)	((head)->slh_first)
+
+#define	SLIST_FOREACH(var, head, field)					\
+	for ((var) = SLIST_FIRST((head));				\
+	    (var);							\
+	    (var) = SLIST_NEXT((var), field))
+
+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = SLIST_FIRST((head));				\
+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
+#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
+	for ((varp) = &SLIST_FIRST((head));				\
+	    ((var) = *(varp)) != NULL;					\
+	    (varp) = &SLIST_NEXT((var), field))
+
+#define	SLIST_INIT(head) do {						\
+	SLIST_FIRST((head)) = NULL;					\
+} while (0)
+
+#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
+	SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field);	\
+	SLIST_NEXT((slistelm), field) = (elm);				\
+} while (0)
+
+#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
+	SLIST_NEXT((elm), field) = SLIST_FIRST((head));			\
+	SLIST_FIRST((head)) = (elm);					\
+} while (0)
+
+#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
+
+#define	SLIST_REMOVE(head, elm, type, field) do {			\
+	QMD_SAVELINK(oldnext, (elm)->field.sle_next);			\
+	if (SLIST_FIRST((head)) == (elm)) {				\
+		SLIST_REMOVE_HEAD((head), field);			\
+	}								\
+	else {								\
+		struct type *curelm = SLIST_FIRST((head));		\
+		while (SLIST_NEXT(curelm, field) != (elm))		\
+			curelm = SLIST_NEXT(curelm, field);		\
+		SLIST_REMOVE_AFTER(curelm, field);			\
+	}								\
+	TRASHIT(*oldnext);						\
+} while (0)
+
+#define SLIST_REMOVE_AFTER(elm, field) do {				\
+	SLIST_NEXT(elm, field) =					\
+	    SLIST_NEXT(SLIST_NEXT(elm, field), field);			\
+} while (0)
+
+#define	SLIST_REMOVE_HEAD(head, field) do {				\
+	SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field);	\
+} while (0)
+
+/*
+ * Singly-linked Tail queue declarations.
+ */
+#define	STAILQ_HEAD(name, type)						\
+    struct name {								\
+        struct type *stqh_first;/* first element */			\
+        struct type **stqh_last;/* addr of last next element */		\
+    }
+
+#define	STAILQ_HEAD_INITIALIZER(head)					\
+    { NULL, &(head).stqh_first }
+
+#define	STAILQ_ENTRY(type)						\
+    struct {								\
+        struct type *stqe_next;	/* next element */			\
+    }
+
+/*
+ * Singly-linked Tail queue functions.
+ */
+#define	STAILQ_CONCAT(head1, head2) do {				\
+        if (!STAILQ_EMPTY((head2))) {					\
+            *(head1)->stqh_last = (head2)->stqh_first;		\
+            (head1)->stqh_last = (head2)->stqh_last;		\
+            STAILQ_INIT((head2));					\
+        }								\
+    } while (0)
+
+#define	STAILQ_EMPTY(head)	((head)->stqh_first == NULL)
+
+#define	STAILQ_FIRST(head)	((head)->stqh_first)
+
+#define	STAILQ_FOREACH(var, head, field)				\
+    for((var) = STAILQ_FIRST((head));				\
+            (var);							\
+            (var) = STAILQ_NEXT((var), field))
+
+
+#define	STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
+    for ((var) = STAILQ_FIRST((head));				\
+            (var) && ((tvar) = STAILQ_NEXT((var), field), 1);		\
+            (var) = (tvar))
+
+#define	STAILQ_INIT(head) do {						\
+        STAILQ_FIRST((head)) = NULL;					\
+        (head)->stqh_last = &STAILQ_FIRST((head));			\
+    } while (0)
+
+#define	STAILQ_INSERT_AFTER(head, tqelm, elm, field) do {		\
+        if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
+            (head)->stqh_last = &STAILQ_NEXT((elm), field);		\
+        STAILQ_NEXT((tqelm), field) = (elm);				\
+    } while (0)
+
+#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
+        if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL)	\
+            (head)->stqh_last = &STAILQ_NEXT((elm), field);		\
+        STAILQ_FIRST((head)) = (elm);					\
+    } while (0)
+
+#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
+        STAILQ_NEXT((elm), field) = NULL;				\
+        *(head)->stqh_last = (elm);					\
+        (head)->stqh_last = &STAILQ_NEXT((elm), field);			\
+    } while (0)
+
+#define	STAILQ_LAST(head, type, field)					\
+    (STAILQ_EMPTY((head)) ?						\
+     NULL :							\
+     ((struct type *)(void *)				\
+      ((char *)((head)->stqh_last) - __offsetof(struct type, field))))
+
+#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
+
+#define	STAILQ_REMOVE(head, elm, type, field) do {			\
+        QMD_SAVELINK(oldnext, (elm)->field.stqe_next);			\
+        if (STAILQ_FIRST((head)) == (elm)) {				\
+            STAILQ_REMOVE_HEAD((head), field);			\
+        }								\
+        else {								\
+            struct type *curelm = STAILQ_FIRST((head));		\
+            while (STAILQ_NEXT(curelm, field) != (elm))		\
+                curelm = STAILQ_NEXT(curelm, field);		\
+            STAILQ_REMOVE_AFTER(head, curelm, field);		\
+        }								\
+        TRASHIT(*oldnext);						\
+    } while (0)
+
+#define	STAILQ_REMOVE_HEAD(head, field) do {				\
+        if ((STAILQ_FIRST((head)) =					\
+                STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL)		\
+            (head)->stqh_last = &STAILQ_FIRST((head));		\
+    } while (0)
+
+#define STAILQ_REMOVE_AFTER(head, elm, field) do {			\
+        if ((STAILQ_NEXT(elm, field) =					\
+                STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL)	\
+            (head)->stqh_last = &STAILQ_NEXT((elm), field);		\
+    } while (0)
+
+#define STAILQ_SWAP(head1, head2, type) do {				\
+        struct type *swap_first = STAILQ_FIRST(head1);			\
+        struct type **swap_last = (head1)->stqh_last;			\
+        STAILQ_FIRST(head1) = STAILQ_FIRST(head2);			\
+        (head1)->stqh_last = (head2)->stqh_last;			\
+        STAILQ_FIRST(head2) = swap_first;				\
+        (head2)->stqh_last = swap_last;					\
+        if (STAILQ_EMPTY(head1))					\
+            (head1)->stqh_last = &STAILQ_FIRST(head1);		\
+        if (STAILQ_EMPTY(head2))					\
+            (head2)->stqh_last = &STAILQ_FIRST(head2);		\
+    } while (0)
+
+#define STAILQ_INSERT_CHAIN_HEAD(head, elm_chead, elm_ctail, field) do {   \
+        if ((STAILQ_NEXT(elm_ctail, field) = STAILQ_FIRST(head)) == NULL ) { \
+            (head)->stqh_last = &STAILQ_NEXT(elm_ctail, field);            \
+        }                                                                      \
+        STAILQ_FIRST(head) = (elm_chead);                                    \
+    } while (0)
+
 #endif /* !_SYS_QUEUE_H_ */
diff --git a/tools/sdk/include/simple_pair.h b/tools/sdk/include/simple_pair.h
@@ -1,5 +1,24 @@
 /*
- *  Copyright (C) 2015 -2018  Espressif System
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 

diff --git a/tools/sdk/include/smartconfig.h b/tools/sdk/include/smartconfig.h
@@ -1,5 +1,24 @@
 /*
- *  Copyright (C) 2015 -2018  Espressif System
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 

diff --git a/tools/sdk/include/spi_flash.h b/tools/sdk/include/spi_flash.h
@@ -1,6 +1,25 @@
-/* 
- * copyright (c) Espressif System 2010
- * 
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
  */
 
 #ifndef SPI_FLASH_H
@@ -38,4 +57,7 @@ typedef SpiFlashOpResult (* user_spi_flash_read)(
 
 void spi_flash_set_read_func(user_spi_flash_read read);
 
+bool spi_flash_erase_protect_enable(void);
+bool spi_flash_erase_protect_disable(void);
+
 #endif
diff --git a/tools/sdk/include/upgrade.h b/tools/sdk/include/upgrade.h
@@ -1,3 +1,27 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
 #ifndef __UPGRADE_H__
 #define __UPGRADE_H__
 

diff --git a/tools/sdk/include/user_interface.h b/tools/sdk/include/user_interface.h
@@ -1,5 +1,24 @@
 /*
- *  Copyright (C) 2013 -2014  Espressif System
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
@@ -52,7 +71,8 @@ void system_restore(void);
 void system_restart(void);
 
 bool system_deep_sleep_set_option(uint8 option);
-void system_deep_sleep(uint32 time_in_us);
+bool system_deep_sleep(uint64 time_in_us);
+bool system_deep_sleep_instant(uint64 time_in_us);
 
 uint8 system_upgrade_userbin_check(void);
 void system_upgrade_reboot(void);
@@ -120,13 +140,17 @@ bool system_update_cpu_freq(uint8 freq);
 uint8 system_get_cpu_freq(void);
 
 enum flash_size_map {
-    FLASH_SIZE_4M_MAP_256_256 = 0,
-    FLASH_SIZE_2M,
-    FLASH_SIZE_8M_MAP_512_512,
-    FLASH_SIZE_16M_MAP_512_512,
-    FLASH_SIZE_32M_MAP_512_512,
-    FLASH_SIZE_16M_MAP_1024_1024,
-    FLASH_SIZE_32M_MAP_1024_1024
+    FLASH_SIZE_4M_MAP_256_256 = 0,  /**<  Flash size : 4Mbits. Map : 256KBytes + 256KBytes */
+    FLASH_SIZE_2M,                  /**<  Flash size : 2Mbits. Map : 256KBytes */
+    FLASH_SIZE_8M_MAP_512_512,      /**<  Flash size : 8Mbits. Map : 512KBytes + 512KBytes */
+    FLASH_SIZE_16M_MAP_512_512,     /**<  Flash size : 16Mbits. Map : 512KBytes + 512KBytes */
+    FLASH_SIZE_32M_MAP_512_512,     /**<  Flash size : 32Mbits. Map : 512KBytes + 512KBytes */
+    FLASH_SIZE_16M_MAP_1024_1024,   /**<  Flash size : 16Mbits. Map : 1024KBytes + 1024KBytes */
+    FLASH_SIZE_32M_MAP_1024_1024,    /**<  Flash size : 32Mbits. Map : 1024KBytes + 1024KBytes */
+    FLASH_SIZE_32M_MAP_2048_2048,    /**<  attention: don't support now ,just compatible for nodemcu;
+                                           Flash size : 32Mbits. Map : 2048KBytes + 2048KBytes */
+    FLASH_SIZE_64M_MAP_1024_1024,     /**<  Flash size : 64Mbits. Map : 1024KBytes + 1024KBytes */
+    FLASH_SIZE_128M_MAP_1024_1024     /**<  Flash size : 128Mbits. Map : 1024KBytes + 1024KBytes */
 };
 
 enum flash_size_map system_get_flash_size_map(void);
@@ -135,6 +159,7 @@ void system_phy_set_max_tpw(uint8 max_tpw);
 void system_phy_set_tpw_via_vdd33(uint16 vdd33);
 void system_phy_set_rfoption(uint8 option);
 void system_phy_set_powerup_option(uint8 option);
+void system_phy_freq_trace_enable(bool enable);
 
 bool system_param_save_with_protect(uint16 start_sec, void *param, uint16 len);
 bool system_param_load(uint16 start_sec, uint16 offset, void *param, uint16 len);
@@ -166,8 +191,9 @@ bool wifi_set_opmode_current(uint8 opmode);
 uint8 wifi_get_broadcast_if(void);
 bool wifi_set_broadcast_if(uint8 interface);
 
-typedef struct bss_info {
-    struct bss_info* next;
+struct bss_info {
+    STAILQ_ENTRY(bss_info)     next;
+
     uint8 bssid[6];
     uint8 ssid[32];
     uint8 ssid_len;
@@ -177,16 +203,12 @@ typedef struct bss_info {
     uint8 is_hidden;
     sint16 freq_offset;
     sint16 freqcal_val;
-	uint8 *esp_mesh_ie;
-	uint8 simple_pair;
-} bss_info_t;
-
-typedef struct {
-    struct bss_info* first;
-} bss_info_head_t;
+    uint8 *esp_mesh_ie;
+    uint8 simple_pair;
+};
 
 typedef struct _scaninfo {
-	bss_info_head_t *pbss;
+    STAILQ_HEAD(, bss_info) *pbss;
     struct espconn *pespconn;
     uint8 totalpage;
     uint8 pagenum;
@@ -214,11 +236,17 @@ bool wifi_station_disconnect(void);
 
 sint8 wifi_station_get_rssi(void);
 
+typedef enum {
+    WIFI_SCAN_TYPE_ACTIVE = 0,  /**< active scan */
+    WIFI_SCAN_TYPE_PASSIVE,     /**< passive scan */
+} wifi_scan_type_t;
+
 struct scan_config {
-    uint8 *ssid;	// Note: ssid == NULL, don't filter ssid.
-    uint8 *bssid;	// Note: bssid == NULL, don't filter bssid.
-    uint8 channel;	// Note: channel == 0, scan all channels, otherwise scan set channel.
-    uint8 show_hidden;	// Note: show_hidden == 1, can get hidden ssid routers' info.
+    uint8 *ssid;    // Note: ssid == NULL, don't filter ssid.
+    uint8 *bssid;    // Note: bssid == NULL, don't filter bssid.
+    uint8 channel;    // Note: channel == 0, scan all channels, otherwise scan set channel.
+    uint8 show_hidden;    // Note: show_hidden == 1, can get hidden ssid routers' info.
+    wifi_scan_type_t scan_type; // scan type, active or passive
 };
 
 bool wifi_station_scan(struct scan_config *config, scan_done_cb_t cb);
@@ -281,21 +309,22 @@ bool wifi_softap_set_config(struct softap_config *config);
 bool wifi_softap_set_config_current(struct softap_config *config);
 
 struct station_info {
-	struct station_info* next;
-	uint8 bssid[6];
-	struct ip_addr ip;
+    STAILQ_ENTRY(station_info)    next;
+
+    uint8 bssid[6];
+    struct ip_addr ip;
 };
 
 struct dhcps_lease {
-	bool enable;
-	struct ip_addr start_ip;
-	struct ip_addr end_ip;
+    bool enable;
+    struct ip_addr start_ip;
+    struct ip_addr end_ip;
 };
 
 enum dhcps_offer_option{
-	OFFER_START = 0x00,
-	OFFER_ROUTER = 0x01,
-	OFFER_END
+    OFFER_START = 0x00,
+    OFFER_ROUTER = 0x01,
+    OFFER_END
 };
 
 uint8 wifi_softap_get_station_num(void);
@@ -378,6 +407,7 @@ enum {
     EVENT_SOFTAPMODE_STACONNECTED,
 	EVENT_SOFTAPMODE_STADISCONNECTED,
 	EVENT_SOFTAPMODE_PROBEREQRECVED,
+    EVENT_OPMODE_CHANGED,
     EVENT_MAX
 };
 
@@ -453,6 +483,11 @@ typedef struct {
 	uint8 mac[6];
 } Event_SoftAPMode_ProbeReqRecved_t;
 
+typedef struct {
+    uint8 old_opmode;
+    uint8 new_opmode;
+} Event_OpMode_Change_t;
+
 typedef union {
 	Event_StaMode_Connected_t			connected;
 	Event_StaMode_Disconnected_t		disconnected;
@@ -461,6 +496,7 @@ typedef union {
 	Event_SoftAPMode_StaConnected_t		sta_connected;
 	Event_SoftAPMode_StaDisconnected_t	sta_disconnected;
 	Event_SoftAPMode_ProbeReqRecved_t   ap_probereqrecved;
+    Event_OpMode_Change_t               opmode_changed;
 } Event_Info_u;
 
 typedef struct _esp_event {
@@ -613,4 +649,6 @@ void wifi_unregister_user_ie_manufacturer_recv_cb(void);
 void wifi_enable_gpio_wakeup(uint32 i, GPIO_INT_TYPE intr_status);
 void wifi_disable_gpio_wakeup(void);
 
+void uart_div_modify(uint8 uart_no, uint32 DivLatchValue);
+
 #endif
diff --git a/tools/sdk/include/wpa2_enterprise.h b/tools/sdk/include/wpa2_enterprise.h
@@ -1,3 +1,27 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2016 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
 #ifndef __WPA2_ENTERPRISE_H__
 #define __WPA2_ENTERPRISE_H__
 
@@ -20,6 +44,9 @@ void  wifi_station_clear_enterprise_cert_key(void);
 int  wifi_station_set_enterprise_ca_cert(u8 *ca_cert, int ca_cert_len);
 void  wifi_station_clear_enterprise_ca_cert(void);
 
+int wifi_station_set_enterprise_identity(u8 *identity, int len);
+void wifi_station_clear_enterprise_identity(void);
+
 int  wifi_station_set_enterprise_username(u8 *username, int len);
 void  wifi_station_clear_enterprise_username(void);
 

diff --git a/tools/sdk/ld/eagle.app.v6.common.ld b/tools/sdk/ld/eagle.app.v6.common.ld
@@ -178,6 +178,19 @@ SECTIONS
     *liblwip_gcc.a:(.literal .text .literal.* .text.*)
     *liblwip_src.a:(.literal .text .literal.* .text.*)
     *libaxtls.a:(.literal .text .literal.* .text.*)
+    *libat.a:(.literal.* .text.*)
+    *libcrypto.a:(.literal.* .text.*)
+    *libespnow.a:(.literal.* .text.*)
+    *libjson.a:(.literal.* .text.*)
+    *liblwip.a:(.literal.* .text.*)
+    *libmesh.a:(.literal.* .text.*)
+    *libnet80211.a:(.literal.* .text.*)
+    *libsmartconfig.a:(.literal.* .text.*)
+    *libssl.a:(.literal.* .text.*)
+    *libupgrade.a:(.literal.* .text.*)
+    *libwpa.a:(.literal.* .text.*)
+    *libwpa2.a:(.literal.* .text.*)
+    *libwps.a:(.literal.* .text.*)
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text .irom.text.*)
     _irom0_text_end = ABSOLUTE(.);
     _flash_code_end = ABSOLUTE(.);

diff --git a/tools/sdk/ld/eagle.flash.16m.ld b/tools/sdk/ld/eagle.flash.16m.ld
@@ -1,7 +1,7 @@
 /* Flash Split for 16M chips */
 /* sketch 1019KB */
+/* spiffs 15340KB */
 /* eeprom 20KB */
-/* spiffs 15MB */
 
 MEMORY
 {

diff --git a/tools/sdk/ld/eagle.flash.8m.ld b/tools/sdk/ld/eagle.flash.8m.ld
@@ -1,7 +1,7 @@
 /* Flash Split for 8M chips */
 /* sketch 1019KB */
+/* spiffs 7148KB */
 /* eeprom 20KB */
-/* spiffs 7MB */
 
 MEMORY
 {

diff --git a/tools/sdk/ld/eagle.rom.addr.v6.ld b/tools/sdk/ld/eagle.rom.addr.v6.ld
@@ -322,7 +322,6 @@ PROVIDE ( timer_insert = 0x40002c64 );
 PROVIDE ( uartAttach = 0x4000383c );
 PROVIDE ( uart_baudrate_detect = 0x40003924 );
 PROVIDE ( uart_buff_switch = 0x400038a4 );
-PROVIDE ( uart_div_modify = 0x400039d8 );
 PROVIDE ( uart_rx_intr_handler = 0x40003bbc );
 PROVIDE ( uart_rx_one_char = 0x40003b8c );
 PROVIDE ( uart_rx_one_char_block = 0x40003b64 );

diff --git a/tools/sdk/lib/libat.a b/tools/sdk/lib/libat.a
diff --git a/tools/sdk/lib/libcrypto.a b/tools/sdk/lib/libcrypto.a
diff --git a/tools/sdk/lib/libdriver.a b/tools/sdk/lib/libdriver.a
diff --git a/tools/sdk/lib/libespnow.a b/tools/sdk/lib/libespnow.a
diff --git a/tools/sdk/lib/libjson.a b/tools/sdk/lib/libjson.a
diff --git a/tools/sdk/lib/liblwip.a b/tools/sdk/lib/liblwip.a
diff --git a/tools/sdk/lib/liblwip_536.a b/tools/sdk/lib/liblwip_536.a
diff --git a/tools/sdk/lib/libmain.a b/tools/sdk/lib/libmain.a
diff --git a/tools/sdk/lib/libmesh.a b/tools/sdk/lib/libmesh.a
diff --git a/tools/sdk/lib/libnet80211.a b/tools/sdk/lib/libnet80211.a
diff --git a/tools/sdk/lib/libphy.a b/tools/sdk/lib/libphy.a
diff --git a/tools/sdk/lib/libpp.a b/tools/sdk/lib/libpp.a
diff --git a/tools/sdk/lib/libsmartconfig.a b/tools/sdk/lib/libsmartconfig.a
diff --git a/tools/sdk/lib/libssl.a b/tools/sdk/lib/libssl.a
diff --git a/tools/sdk/lib/libupgrade.a b/tools/sdk/lib/libupgrade.a
diff --git a/tools/sdk/lib/libwpa.a b/tools/sdk/lib/libwpa.a
diff --git a/tools/sdk/lib/libwpa2.a b/tools/sdk/lib/libwpa2.a
diff --git a/tools/sdk/lib/libwps.a b/tools/sdk/lib/libwps.a
diff --git a/tools/sdk/lwip/include/arch/cc.h b/tools/sdk/lwip/include/arch/cc.h
@@ -40,9 +40,6 @@
 #include "osapi.h"
 #define EFAULT 14
 
-#undef ICACHE_FLASH_ATTR
-#define ICACHE_FLASH_ATTR
-
 //#define LWIP_PROVIDE_ERRNO
 
 #if (1)
@@ -68,7 +65,7 @@ typedef unsigned long   mem_ptr_t;
 #define U32_F "d"
 #define X32_F "x"
 
-
+#define LWIP_ERR_T s32_t
 
 //#define PACK_STRUCT_FIELD(x) x __attribute__((packed))
 #define PACK_STRUCT_FIELD(x) x

diff --git a/tools/sdk/version b/tools/sdk/version
@@ -1 +1 @@
-2.0.0_16_08_09
+v2.1.0-10-g509eae8