Merge remote-tracking branch 'esp8266/master'

2025-07-20 10:24:18 +03:00 · 2016-01-03 14:33:05 +02:00
parent b28be23601 1581a8f4ce
commit 7b297d2992
48 changed files with 2773 additions and 1536 deletions
--- a/boards.txt
+++ b/boards.txt
@ -6,6 +6,8 @@ menu.FlashFreq=Flash Frequency
 menu.UploadTool=Upload Using
 menu.ResetMethod=Reset Method
 menu.ESPModule=Module
+menu.Debug=Debug port
+menu.DebugLevel=Debug Level

 ##############################################################
 generic.name=Generic ESP8266 Module
@ -26,6 +28,8 @@ generic.build.core=esp8266
 generic.build.variant=generic
 generic.build.flash_mode=qio
 generic.build.spiffs_pagesize=256
+generic.build.debug_port=
+generic.build.debug_level=

 generic.menu.UploadTool.esptool=Serial
 generic.menu.UploadTool.esptool.upload.tool=esptool
@ -166,6 +170,42 @@ generic.menu.ResetMethod.ck.upload.resetmethod=ck
 generic.menu.ResetMethod.nodemcu=nodemcu
 generic.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu

+generic.menu.Debug.Disabled=Disabled
+generic.menu.Debug.Disabled.build.debug_port=
+generic.menu.Debug.Serial=Serial
+generic.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+generic.menu.Debug.Serial1=Serial1
+generic.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+
+generic.menu.DebugLevel.None=None
+generic.menu.DebugLevel.None.build.debug_level=
+generic.menu.DebugLevel.Core=Core
+generic.menu.DebugLevel.Core.build.debug_level=-DDEBUG_ESP_CORE
+generic.menu.DebugLevel.SSL=Core + SSL
+generic.menu.DebugLevel.SSL.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
+generic.menu.DebugLevel.WiFic=Core + WiFi
+generic.menu.DebugLevel.WiFic.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
+generic.menu.DebugLevel.WiFi=WiFi
+generic.menu.DebugLevel.WiFi.build.debug_level=-DDEBUG_ESP_WIFI
+generic.menu.DebugLevel.HTTPClient=HTTPClient
+generic.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
+generic.menu.DebugLevel.HTTPUpdate=HTTPUpdate
+generic.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
+generic.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
+generic.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
+generic.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
+generic.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
+generic.menu.DebugLevel.HTTPServer=HTTPServer
+generic.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
+generic.menu.DebugLevel.UPDATER=Updater
+generic.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
+generic.menu.DebugLevel.OTA=OTA
+generic.menu.DebugLevel.OTA.build.debug_level=-DDEBUG_ESP_OTA
+generic.menu.DebugLevel.OTA2=OTA + Updater
+generic.menu.DebugLevel.OTA2.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
+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
+
 # 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
@ -180,6 +220,75 @@ generic.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
 # generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
 # generic.menu.FlashSize.16M.build.spiffs_blocksize=8192

+##############################################################
+espduino.name=ESPDuino (ESP-13 Module)
+
+espduino.upload.tool=esptool
+espduino.upload.speed=115200
+espduino.upload.resetmethod=ck
+espduino.upload.maximum_size=1044464
+espduino.upload.maximum_data_size=81920
+espduino.upload.wait_for_upload_port=true
+espduino.serial.disableDTR=true
+espduino.serial.disableRTS=true
+
+espduino.build.mcu=esp8266
+espduino.build.f_cpu=80000000L
+espduino.build.board=ESP8266_ESP13
+espduino.build.core=esp8266
+espduino.build.variant=espduino
+espduino.build.flash_mode=dio
+espduino.build.flash_size=4M
+espduino.build.flash_freq=40
+espduino.build.debug_port=
+espduino.build.debug_level=
+
+espduino.menu.CpuFrequency.80=80 MHz
+espduino.menu.CpuFrequency.80.build.f_cpu=80000000L
+espduino.menu.CpuFrequency.160=160 MHz
+espduino.menu.CpuFrequency.160.build.f_cpu=160000000L
+
+espduino.menu.UploadTool.esptool=Serial
+espduino.menu.UploadTool.esptool.upload.tool=esptool
+espduino.menu.UploadTool.esptool.upload.verbose=-vv
+espduino.menu.UploadTool.espota=OTA
+espduino.menu.UploadTool.espota.upload.tool=espota
+
+espduino.menu.UploadSpeed.115200=115200
+espduino.menu.UploadSpeed.115200.upload.speed=115200
+espduino.menu.UploadSpeed.9600=9600
+espduino.menu.UploadSpeed.9600.upload.speed=9600
+espduino.menu.UploadSpeed.57600=57600
+espduino.menu.UploadSpeed.57600.upload.speed=57600
+espduino.menu.UploadSpeed.256000.windows=256000
+espduino.menu.UploadSpeed.256000.upload.speed=256000
+espduino.menu.UploadSpeed.230400.linux=230400
+espduino.menu.UploadSpeed.230400.macosx=230400
+espduino.menu.UploadSpeed.230400.macosx=230400
+espduino.menu.UploadSpeed.230400.upload.speed=230400
+espduino.menu.UploadSpeed.460800.linux=460800
+espduino.menu.UploadSpeed.460800.macosx=460800
+espduino.menu.UploadSpeed.460800.upload.speed=460800
+espduino.menu.UploadSpeed.512000.windows=512000
+espduino.menu.UploadSpeed.512000.upload.speed=512000
+espduino.menu.UploadSpeed.921600=921600
+espduino.menu.UploadSpeed.921600.upload.speed=921600
+
+espduino.menu.FlashSize.4M3M=4M (3M SPIFFS)
+espduino.menu.FlashSize.4M3M.build.flash_size=4M
+espduino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+espduino.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+espduino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+espduino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+espduino.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+
+espduino.menu.FlashSize.4M1M=4M (1M SPIFFS)
+espduino.menu.FlashSize.4M1M.build.flash_size=4M
+espduino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+espduino.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+espduino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+espduino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+espduino.menu.FlashSize.4M1M.build.spiffs_pagesize=256
 ##############################################################
 huzzah.name=Adafruit HUZZAH ESP8266

@ -200,6 +309,8 @@ huzzah.build.variant=adafruit
 huzzah.build.flash_mode=qio
 huzzah.build.flash_size=4M
 huzzah.build.flash_freq=40
+huzzah.build.debug_port=
+huzzah.build.debug_level=

 huzzah.menu.CpuFrequency.80=80 MHz
 huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
@ -257,6 +368,8 @@ nodemcu.build.variant=nodemcu
 nodemcu.build.flash_mode=qio
 nodemcu.build.flash_size=4M
 nodemcu.build.flash_freq=40
+nodemcu.build.debug_port=
+nodemcu.build.debug_level=

 nodemcu.menu.CpuFrequency.80=80 MHz
 nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L
@ -323,6 +436,8 @@ nodemcuv2.build.variant=nodemcu
 nodemcuv2.build.flash_mode=dio
 nodemcuv2.build.flash_size=4M
 nodemcuv2.build.flash_freq=40
+nodemcuv2.build.debug_port=
+nodemcuv2.build.debug_level=

 nodemcuv2.menu.CpuFrequency.80=80 MHz
 nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
@ -398,6 +513,8 @@ modwifi.build.spiffs_start=0x100000
 modwifi.build.spiffs_end=0x1FB000
 modwifi.build.spiffs_pagesize=256
 modwifi.build.spiffs_blocksize=8192
+modwifi.build.debug_port=
+modwifi.build.debug_level=

 modwifi.menu.CpuFrequency.80=80 MHz
 modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
@ -454,6 +571,8 @@ thing.build.spiffs_start=0x6B000
 thing.build.spiffs_end=0x7B000
 thing.build.spiffs_blocksize=4096
 thing.build.spiffs_pagesize=256
+thing.build.debug_port=
+thing.build.debug_level=

 thing.menu.CpuFrequency.80=80 MHz
 thing.menu.CpuFrequency.80.build.f_cpu=80000000L
@ -503,6 +622,8 @@ esp210.build.variant=generic
 esp210.build.flash_mode=qio
 esp210.build.flash_size=4M
 esp210.build.flash_freq=40
+esp210.build.debug_port=
+esp210.build.debug_level=

 esp210.menu.CpuFrequency.80=80 MHz
 esp210.menu.CpuFrequency.80.build.f_cpu=80000000L
@ -596,6 +717,8 @@ d1_mini.build.variant=d1_mini
 d1_mini.build.flash_mode=dio
 d1_mini.build.flash_size=4M
 d1_mini.build.flash_freq=40
+d1_mini.build.debug_port=
+d1_mini.build.debug_level=

 d1_mini.menu.CpuFrequency.80=80 MHz
 d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L
@ -667,6 +790,8 @@ d1.build.variant=d1
 d1.build.flash_mode=dio
 d1.build.flash_size=4M
 d1.build.flash_freq=40
+d1.build.debug_port=
+d1.build.debug_level=

 d1.menu.CpuFrequency.80=80 MHz
 d1.menu.CpuFrequency.80.build.f_cpu=80000000L
@ -740,6 +865,8 @@ espino.build.flash_mode=qio
 espino.build.flash_size=4M
 espino.build.flash_freq=40
 espino.build.spiffs_pagesize=256
+espino.build.debug_port=
+espino.build.debug_level=

 espino.menu.UploadTool.esptool=Serial
 espino.menu.UploadTool.esptool.upload.tool=esptool
@ -817,6 +944,8 @@ wifinfo.build.variant=wifinfo
 wifinfo.build.flash_mode=qio
 wifinfo.build.board=ESP8266_ESP12
 wifinfo.build.spiffs_pagesize=256
+wifinfo.build.debug_port=
+wifinfo.build.debug_level=

 #wifinfo.menu.ESPModule.ESP07512=ESP07 (1M/512K SPIFFS)
 #wifinfo.menu.ESPModule.ESP07512.build.board=ESP8266_ESP07
--- a/cores/esp8266/Arduino.h
+++ b/cores/esp8266/Arduino.h
@ -37,6 +37,7 @@ extern "C" {
 #include "binary.h"
 #include "esp8266_peri.h"
 #include "twi.h"
+#include "core_esp8266_features.h"

 #define HIGH 0x1
 #define LOW  0x0
@ -247,8 +248,12 @@ void optimistic_yield(uint32_t interval_us);
 #include "Updater.h"
 #include "debug.h"

+#ifndef _GLIBCXX_VECTOR
+// arduino is not compatible with std::vector
 #define min(a,b) ((a)<(b)?(a):(b))
 #define max(a,b) ((a)>(b)?(a):(b))
+#endif
+
 #define _min(a,b) ((a)<(b)?(a):(b))
 #define _max(a,b) ((a)>(b)?(a):(b))

--- a/cores/esp8266/IPAddress.h
+++ b/cores/esp8266/IPAddress.h
@ -56,6 +56,9 @@ class IPAddress: public Printable {
        bool operator==(const IPAddress& addr) const {
            return _address.dword == addr._address.dword;
        }
+        bool operator==(uint32_t addr) const {
+            return _address.dword == addr;
+        }
        bool operator==(const uint8_t* addr) const;

        // Overloaded index operator to allow getting and setting individual octets of the address
--- a/cores/esp8266/Updater.h
+++ b/cores/esp8266/Updater.h
@ -22,7 +22,11 @@
 #define U_SPIFFS  100
 #define U_AUTH    200

-//#define DEBUG_UPDATER Serial
+#ifdef DEBUG_ESP_UPDATER
+#ifdef DEBUG_ESP_PORT
+#define DEBUG_UPDATER DEBUG_ESP_PORT
+#endif
+#endif

 class UpdaterClass {
  public:
--- a/cores/esp8266/core_esp8266_features.h
+++ b/cores/esp8266/core_esp8266_features.h
@ -28,6 +28,8 @@
 #define CORE_HAS_LIBB64
 #define CORE_HAS_BASE64_CLASS

+#define WIFI_HAS_EVENT_CALLBACK
+

 #endif

--- a/cores/esp8266/core_esp8266_main.cpp
+++ b/cores/esp8266/core_esp8266_main.cpp
@ -101,6 +101,9 @@ static void loop_wrapper() {
    preloop_update_frequency();
    if(!setup_done) {
        setup();
+#ifdef DEBUG_ESP_PORT
+        DEBUG_ESP_PORT.setDebugOutput(true);
+#endif
        setup_done = true;
    }
    loop();
--- a/cores/esp8266/debug.h
+++ b/cores/esp8266/debug.h
@ -4,7 +4,9 @@
 #include <stddef.h>
 #include <stdint.h>

-//#define DEBUGV(...) ets_printf(__VA_ARGS__)
+#ifdef DEBUG_ESP_CORE
+#define DEBUGV(...) ets_printf(__VA_ARGS__)
+#endif

 #ifndef DEBUGV
 #define DEBUGV(...)
--- a/doc/filesystem.md
+++ b/doc/filesystem.md
@ -49,6 +49,7 @@ Olimex MOD-WIFI-ESP8266(-DEV)| 2M | 1M
 SparkFun Thing | 512k | 64k
 SweetPea ESP-210 | 4M | 1M, 3M
 WeMos D1 & D1 mini | 4M | 1M, 3M
+ESPDuino | 4M | 1M, 3M

 **Note:** to use any of file system functions in the sketch, add the following include to the sketch:

--- a/doc/ota_updates/a-ota-external-serial-terminal-output.png
+++ b/doc/ota_updates/a-ota-external-serial-terminal-output.png
--- a/doc/ota_updates/a-ota-ota-port-selection.png
+++ b/doc/ota_updates/a-ota-ota-port-selection.png
--- a/doc/ota_updates/a-ota-ota-upload-complete.png
+++ b/doc/ota_updates/a-ota-ota-upload-complete.png
--- a/doc/ota_updates/a-ota-ota-upload-configuration.png
+++ b/doc/ota_updates/a-ota-ota-upload-configuration.png
--- a/doc/ota_updates/a-ota-serial-upload-configuration.png
+++ b/doc/ota_updates/a-ota-serial-upload-configuration.png
--- a/doc/ota_updates/a-ota-sketch-selection.png
+++ b/doc/ota_updates/a-ota-sketch-selection.png
--- a/doc/ota_updates/a-ota-ssid-pass-entry.png
+++ b/doc/ota_updates/a-ota-ssid-pass-entry.png
--- a/doc/ota_updates/a-ota-upload-complete-and-joined-wifi.png
+++ b/doc/ota_updates/a-ota-upload-complete-and-joined-wifi.png
--- a/doc/ota_updates/ota_updates.md
+++ b/doc/ota_updates/ota_updates.md
@ -11,8 +11,8 @@ title: OTA Update
    * [Requirements](#requirements)
    * [Application Example](#application-example)
      * [Classic OTA](#classic-ota)
-      * [Troubleshooting](#troubleshooting)
      * [ArduinoOTA](#arduinoota)
+      * [Troubleshooting](#troubleshooting)
  * [Web Browser](#web-browser)
    * [Requirements](#requirements-1)
    * [Implementation Overview](#implementation-overview)
@ -87,7 +87,7 @@ ESP.getFreeSketchSpace();
 ```
 can be used for checking the free space for the new sketch.

-For overview of memory layout, where new sketch is stored and how it is copied during OTA process see [Update process - memory view]( https://github.com/esp8266/Arduino/blob/master/doc/ota_updates/ota_updates.md#update-process---memory-view).
+For overview of memory layout, where new sketch is stored and how it is copied during OTA process see [Update process - memory view](#update-process---memory-view).


 The following chapters provide more details and specific methods of doing OTA.
@ -109,34 +109,35 @@ Uploading modules wirelessly from Arduino IDE is intended for the following typi

 Currently there are two software configurations that support OTA updates.

- [Classic OTA](#classic-ota-configuration): Arduino IDE 1.6.5 and 1.6.5-947-g39819f0 (of July 23, 2015) or 1.6.5-1160-gef26c5f (of Sep 30, 2015) version of platform package that provides first OTA implementation, yet without support for [ArduinoOTA](https://github.com/esp8266/Arduino/tree/master/libraries/ArduinoOTA) library. This particular configuration is easier to configure in Arduino IDE and therefore suggested for less experienced users. It soon will be depreciated once implementation below is fully released.
+- [Classic OTA](#classic-ota-configuration): Arduino IDE 1.6.5 and 1.6.5-947-g39819f0 (of July 23, 2015) version of ESP8266 board support platform package that provides first OTA implementation, yet without support for [ArduinoOTA](https://github.com/esp8266/Arduino/tree/master/libraries/ArduinoOTA) library. This particular configuration soon will be depreciated in favor of new implementation described below.

- [ArduinoOTA](#arduinoota-configuration): Arduino-PR-4107-BUILD-421 and latest git version of platform package that includes [ArduinoOTA](https://github.com/esp8266/Arduino/tree/master/libraries/ArduinoOTA) library. This configuration features preliminary build of Arduino IDE and is intended for more experienced users. Please mid your step.
+- [ArduinoOTA](#arduinoota-configuration): Arduino IDE 1.6.7 and 2.0.0 version of platform package. Arduino IDE 1.6.7 is the first release that provides support for [ArduinoOTA](https://github.com/esp8266/Arduino/tree/master/libraries/ArduinoOTA) library.

-Instructions below demonstrate how to configure both [Classic OTA](#classic-ota-configuration) and [ArduinoOTA](#arduinoota-configuration) using NodeMCU 1.0 (ESP-12E Module) board.
+For information how to install ESP8266 board support in Arduino IDE please refer to https://github.com/esp8266/Arduino#installing-with-boards-manager. Once installed, it is possible to switch between available versions of platform package using Boards Manager:
+
+![Selecion of ESP8266 package version](selection-of-package-version.png)
+
+Instructions below demonstrate how to configure both [Classic OTA](#classic-ota-configuration) and [ArduinoOTA](#arduinoota-configuration) using NodeMCU 1.0 (ESP-12E Module) board. You can use other boards assuming that they meet [requirements](#basic-requirements) described above.


 #### Classic OTA

 1. Before you begin, please make sure that you have the following installed:
-    - Arduino IDE and ESP8266 board support as described under https://github.com/esp8266/Arduino#installing-with-boards-manager
-    - [Python](https://www.python.org/) 2.7 (do not install Python 3.5 that is not supported):
-
-        **Note:** Windows users should select “Add python.exe to Path” (see below – this option is not selected by default).
-
-        ![Python installation set up](ota-ide-python-configuration.png)
+    - Arduino IDE 1.6.5 and 1.6.5-947-g39819f0 version of platform package,
+    - [Python](https://www.python.org/) 2.7 (do not install Python 3.5 that is not supported).

 2. Now prepare the sketch and configuration for the upload over a serial port.
    - Start Arduino IDE and load sketch DNS_SD_Arduino_OTA.ino available under File >  Examples > ESP8266mDNS
        ![OTA sketch selection](ota-ide-sketch-selection.png)

-         **Note:** This sketch is available only for 1.6.5-947-g39819f0 (of July 23, 2015) and 1.6.5-1160-gef26c5f (of Sep 30, 2015) versions of platform packages installed in Arduino IDE using https://github.com/esp8266/Arduino#installing-with-boards-manager. It was removed in [#980](https://github.com/esp8266/Arduino/pull/980) from GitHub repository.
+         **Note:** This sketch is available only for 1.6.5-947-g39819f0 (of July 23, 2015) platform package. It was removed in [#980](https://github.com/esp8266/Arduino/pull/980) from GitHub repository.
    - Update SSID and password in the sketch so the module can join your Wi-Fi network
-        ![ssid and pass entry](ota-ide-ssid-pass-entry.png)
+        ![SSID and password entry](ota-ide-ssid-pass-entry.png)
+        
    - Configure upload parameters as below (you may need to adjust configuration if you are using a different module):
        ![configuration of serial upload](ota-ide-serial-upload-configuration.png)

-3. Upload the sketch (Ctrl+U). Once done open Serial Monitor (Ctrl+Shift+M) and check if module has joined your Wi-Fi network.
+3. Upload the sketch (Ctrl+U). Once done, open Serial Monitor (Ctrl+Shift+M) and check if module has joined your Wi-Fi network.

    ![check if module joined network](ota-ide-module-joined-wifi.png)

@ -156,22 +157,7 @@ Instructions below demonstrate how to configure both [Classic OTA](#classic-ota-

 **Note:** To be able to upload your sketch over and over again using OTA, you need to embed OTA routines inside. Please use DNS_SD_Arduino_OTA.ino as an example.

-
-#### Troubleshooting
-
-If OTA update fails, first step is to check for error messages that may be shown in upload window of Arduino IDE. If this is not providing any useful hints try to upload again while checking what is shown by ESP on serial port. Serial Monitor from IDE will not be useful in that case. When attempting to open it, you will likely see the following:
-
-![Arduino IDE network terminal window](ota-ide-network-terminal.png)
-   
-This window is for Arduino Yún and not yet implemented for esp8266/Arduino. It shows up because IDE is attempting to open Serial Monitor using network port you have selected for OTA upload.
-
-Instead you need an external serial monitor. If you are a Windows user check out [Termite](http://www.compuphase.com/software_termite.htm). This is handy, slick and simple RS232 terminal that does not impose RTS or DTR flow control. Such flow control may cause issues if you are using respective lines to toggle GPIO0 and RESET pins on ESP for upload. 
-
-Select COM port and baud rate on external terminal program as if you were using Arduino Serial Monitor. Please see typical settings for [Termite](http://www.compuphase.com/software_termite.htm) below:
-
-![Termite settings](termite-configuration.png)
-
-Then run OTA from IDE and look what is displayed on terminal. Successful OTA process looks like below (sketch and free memory sizes as well as IP addresses depend on your particular s/w and h/w configuration):
+In case of issues please refer to information provided in section [Troubleshooting](#troubleshooting). Successful OTA process looks like below on serial terminal:

 ```
 Arduino OTA Test
@ -196,6 +182,69 @@ Sketch size: 346664
 Free size: 700416
 IP address: 192.168.1.100
 ```
+**Note:** Sketch and free memory sizes as well as IP addresses depend on your particular s/w and h/w configuration.
+
+
+#### ArduinoOTA
+
+1. Before you begin, please make sure that you have the following installed:
+    - Arduino IDE 1.6.7 and 2.0.0 version of platform package following the process described under https://github.com/esp8266/Arduino#installing-with-boards-manager
+    - [Python](https://www.python.org/) 2.7 (do not install Python 3.5 that is not supported):
+
+        **Note:** Windows users should select “Add python.exe to Path” (see below – this option is not selected by default).
+
+        ![Python installation set up](ota-ide-python-configuration.png)
+
+2. Now prepare the sketch and configuration for the upload over a serial port.
+    - Start Arduino IDE and load sketch BasicOTA.ino available under File >  Examples > ArduinoOTA
+        ![selection of example OTA sketch](a-ota-sketch-selection.png)
+
+    - Update SSID and password in the sketch so the module can join your Wi-Fi network
+        ![SSID and password entry](a-ota-ssid-pass-entry.png)
+        
+    - Configure upload parameters as below (you may need to adjust configuration if you are using a different module):
+        ![configuration of serial upload](a-ota-serial-upload-configuration.png)
+
+3. Upload the sketch (Ctrl+U). Once done, open Serial Monitor (Ctrl+Shift+M) and check if module has joined your Wi-Fi network:
+
+    ![check if module joined network](a-ota-upload-complete-and-joined-wifi.png)
+
+4. Only if module is connected to network, after a couple of seconds, the esp8266-ota port will show up in Arduino IDE:
+
+    ![selection of OTA port](a-ota-ota-port-selection.png)
+    
+    **Note:** If OTA port does not show up, try to exit Arduino IDE, open it again and check if port is there.
+
+5. Now get ready for your first OTA upload by selecting the OTA port:
+
+    ![configuration of OTA upload](a-ota-ota-upload-configuration.png)
+    
+    There is no need to change ``` Upload Using: ``` or ``` Upload Speed: ```.
+
+6. If you have successfully completed all the above steps, you can upload (Ctrl+U) the same (or any other) sketch over OTA:
+
+    ![OTA upload complete](a-ota-ota-upload-complete.png)
+
+**Note:** To be able to upload your sketch over and over again using OTA, you need to embed OTA routines inside. Please use BasicOTA.ino as an example.
+
+
+#### Troubleshooting
+
+If OTA update fails, first step is to check for error messages that may be shown in upload window of Arduino IDE. If this is not providing any useful hints try to upload again while checking what is shown by ESP on serial port. Serial Monitor from IDE will not be useful in that case. When attempting to open it, you will likely see the following:
+
+![Arduino IDE network terminal window](ota-ide-network-terminal.png)
+   
+This window is for Arduino Yún and not yet implemented for esp8266/Arduino. It shows up because IDE is attempting to open Serial Monitor using network port you have selected for OTA upload.
+
+Instead you need an external serial monitor. If you are a Windows user check out [Termite](http://www.compuphase.com/software_termite.htm). This is handy, slick and simple RS232 terminal that does not impose RTS or DTR flow control. Such flow control may cause issues if you are using respective lines to toggle GPIO0 and RESET pins on ESP for upload. 
+
+Select COM port and baud rate on external terminal program as if you were using Arduino Serial Monitor. Please see typical settings for [Termite](http://www.compuphase.com/software_termite.htm) below:
+
+![Termite settings](termite-configuration.png)
+
+Then run OTA from IDE and look what is displayed on terminal. Successful [ArduinoOTA](#arduinoota) process using BasicOTA.ino sketch looks like below (IP address depends on your network configuration):
+
+![OTA upload successful - output on an external serial terminal](a-ota-external-serial-terminal-output.png)

 If upload fails you will likely see errors caught by the uploader, exception and the stack dump, or both. 

@ -208,18 +257,6 @@ For more details regarding flash memory layout please check [File system]( https
 For overview where new sketch is stored, how it is copied and how memory is organized for the purpose of OTA see [Update process - memory view]( https://github.com/esp8266/Arduino/blob/master/doc/ota_updates/ota_updates.md#update-process---memory-view).


-#### ArduinoOTA
-
-1. Upload and install the following software:
-  - Arduino-PR-4107-BUILD-421 - https://github.com/esp8266/Arduino/pull/984#issuecomment-155905800
-  - Latest git version of platform package - https://github.com/esp8266/Arduino#using-git-version-
-  - Python 2.7
-
-2. Proceed to step 2 under [Classic OTA Configuration](#classic-ota-configuration) using BasicOTA.ino or OTALeds.ino sketch instead.
-
-3. Carry on with remaining steps.
-
-
 ## Web Browser

 Updates described in this chapter are done with a web browser that can be useful in the following typical scenarios:
@ -236,7 +273,7 @@ Updates described in this chapter are done with a web browser that can be useful

 ### Implementation Overview

-Updates with a web browser are implemented using ```ESP8266HTTPUpdateServer``` class together with ```ESP8266WebServer``` and ```ESP8266mDNS``` classes. The following code is required to get it work:
+Updates with a web browser are implemented using ``` ESP8266HTTPUpdateServer ``` class together with ``` ESP8266WebServer ``` and ``` ESP8266mDNS ``` classes. The following code is required to get it work:

 setup()

@ -260,10 +297,10 @@ loop()

 The sample implementation provided below has been done using:

- example sketch WebUpdater.ino available in ESP8266HTTPUpdateServer library
+- example sketch WebUpdater.ino available in ``` ESP8266HTTPUpdateServer ``` library
 - NodeMCU 1.0 (ESP-12E Module)

-You can use another module if it meets “Flash chip size is 2x the size of the sketch” requirement.
+You can use another module if it meets previously desribed [requirements](#basic-requirements).


 1. Before you begin, please make sure that you have the following software installed:
@ -291,9 +328,8 @@ You can use another module if it meets “Flash chip size is 2x the size of the
 4. Now open web browser and enter the url provided on Serial Monitor, i.e. http://esp8266-webupdate.local/update. Once entered, browser should display a form like below that has been served by your module. The form invites you to choose a file for update.

    ![OTA update form in web browser](ota-web-browser-form.png)
-
-    **Note:** If entering “http://esp8266-webupdate.local/update” does not work, try replacing “esp8266-webupdate” with module’s IP address. For example, if your module IP is “192.168.1.100” then url should be “http://192.168.1.100/update”. This workaround is useful in case the host software installed in step 2 does not work. If still nothing works and there are no clues on Serial Monitor, try to diagnose issue by opening provided url in Google Chrome, pressing F12 and checking contents of “Console” and “Network” tabs. Chrome provides some advanced logging on these tabs.
-
+    
+    **Note:** If entering ``` http://esp8266-webupdate.local/update ``` does not work, try replacing ``` esp8266-webupdate ``` with module’s IP address. For example, if your module IP is ``` 192.168.1.100 ``` then url should be ``` http://192.168.1.100/update ```. This workaround is useful in case the host software installed in step 2 does not work. If still nothing works and there are no clues on Serial Monitor, try to diagnose issue by opening provided url in Google Chrome, pressing F12 and checking contents of “Console” and “Network” tabs. Chrome provides some advanced logging on these tabs.

 5. To obtain the file navigate to directory used by Arduino IDE to store results of compilation. You can check the path to this file in compilation log shown in IDE debug window as marked below.

@ -306,8 +342,8 @@ You can use another module if it meets “Flash chip size is 2x the size of the
    Module will reboot that should be visible on Serial Monitor:

    ![Serial Monitor - after OTA update](ota-web-serial-monitor-reboot.png)
-
-    Just after reboot you should see exactly the same message “HTTPUpdateServer ready! Open http:// esp8266-webupdate.local /update in your browser” like in step 3. This is because module has been loaded again with the same code – first using serial port, and then using OTA.
+    
+    Just after reboot you should see exactly the same message ``` HTTPUpdateServer ready! Open http:// esp8266-webupdate.local /update in your browser``` like in step 3. This is because module has been loaded again with the same code – first using serial port, and then using OTA.

 Once you are comfortable with this procedure go ahead and modify WebUpdater.ino sketch to print some additional messages, compile it, locate new binary file and upload it using web browser to see entered changes on a Serial Monitor.

--- a/doc/ota_updates/selection-of-package-version.png
+++ b/doc/ota_updates/selection-of-package-version.png
--- a/libraries/ArduinoOTA/ArduinoOTA.cpp
+++ b/libraries/ArduinoOTA/ArduinoOTA.cpp
@ -18,7 +18,12 @@ extern "C" {
 #include "include/UdpContext.h"
 #include <ESP8266mDNS.h>

-//#define OTA_DEBUG 1
+
+#ifdef DEBUG_ESP_OTA
+#ifdef DEBUG_ESP_PORT
+#define OTA_DEBUG DEBUG_ESP_PORT
+#endif
+#endif

 ArduinoOTAClass::ArduinoOTAClass()
 : _port(0)
@ -109,8 +114,8 @@ void ArduinoOTAClass::begin() {
  }
  _initialized = true;
  _state = OTA_IDLE;
-#if OTA_DEBUG
-  Serial.printf("OTA server at: %s.local:%u\n", _hostname.c_str(), _port);
+#ifdef OTA_DEBUG
+  OTA_DEBUG.printf("OTA server at: %s.local:%u\n", _hostname.c_str(), _port);
 #endif
 }

@ -226,8 +231,8 @@ void ArduinoOTAClass::_onRx(){

 void ArduinoOTAClass::_runUpdate() {
  if (!Update.begin(_size, _cmd)) {
-#if OTA_DEBUG
-    Serial.println("Update Begin Error");
+#ifdef OTA_DEBUG
+    OTA_DEBUG.println("Update Begin Error");
 #endif
    if (_error_callback) {
      _error_callback(OTA_BEGIN_ERROR);
@ -249,8 +254,8 @@ void ArduinoOTAClass::_runUpdate() {

  WiFiClient client;
  if (!client.connect(_ota_ip, _ota_port)) {
-#if OTA_DEBUG
-    Serial.printf("Connect Failed\n");
+#ifdef OTA_DEBUG
+    OTA_DEBUG.printf("Connect Failed\n");
 #endif
    _udp_ota->listen(*IP_ADDR_ANY, _port);
    if (_error_callback) {
@ -265,8 +270,8 @@ void ArduinoOTAClass::_runUpdate() {
    while (!client.available() && waited--)
      delay(1);
    if (!waited){
-#if OTA_DEBUG
-      Serial.printf("Receive Failed\n");
+#ifdef OTA_DEBUG
+      OTA_DEBUG.printf("Receive Failed\n");
 #endif
      _udp_ota->listen(*IP_ADDR_ANY, _port);
      if (_error_callback) {
@ -288,8 +293,8 @@ void ArduinoOTAClass::_runUpdate() {
    client.print("OK");
    client.stop();
    delay(10);
-#if OTA_DEBUG
-    Serial.printf("Update Success\nRebooting...\n");
+#ifdef OTA_DEBUG
+    OTA_DEBUG.printf("Update Success\nRebooting...\n");
 #endif
    if (_end_callback) {
      _end_callback();
@ -301,8 +306,8 @@ void ArduinoOTAClass::_runUpdate() {
      _error_callback(OTA_END_ERROR);
    }
    Update.printError(client);
-#if OTA_DEBUG
-    Update.printError(Serial);
+#ifdef OTA_DEBUG
+    Update.printError(OTA_DEBUG);
 #endif
    _state = OTA_IDLE;
  }
--- a/libraries/ESP8266HTTPClient/examples/Authorization/Authorization.ino
+++ b/libraries/ESP8266HTTPClient/examples/Authorization/Authorization.ino
@ -63,7 +63,7 @@ void loop() {
        int httpCode = http.GET();

        // httpCode will be negative on error
-        if(httpCode) {
+        if(httpCode > 0) {
            // HTTP header has been send and Server response header has been handled
            USE_SERIAL.printf("[HTTP] GET... code: %d\n", httpCode);

--- a/libraries/ESP8266HTTPClient/examples/BasicHttpClient/BasicHttpClient.ino
+++ b/libraries/ESP8266HTTPClient/examples/BasicHttpClient/BasicHttpClient.ino
@ -51,7 +51,7 @@ void loop() {
        int httpCode = http.GET();

        // httpCode will be negative on error
-        if(httpCode) {
+        if(httpCode > 0) {
            // HTTP header has been send and Server response header has been handled
            USE_SERIAL.printf("[HTTP] GET... code: %d\n", httpCode);

--- a/libraries/ESP8266HTTPClient/examples/ReuseConnection/ReuseConnection.ino
+++ b/libraries/ESP8266HTTPClient/examples/ReuseConnection/ReuseConnection.ino
@ -48,7 +48,7 @@ void loop() {
        //http.begin("192.168.1.12", 80, "/test.html");

        int httpCode = http.GET();
-        if(httpCode) {
+        if(httpCode > 0) {
            USE_SERIAL.printf("[HTTP] GET... code: %d\n", httpCode);

            // file found at server
--- a/libraries/ESP8266HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino
+++ b/libraries/ESP8266HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino
@ -50,7 +50,7 @@ void loop() {
        USE_SERIAL.print("[HTTP] GET...\n");
        // start connection and send HTTP header
        int httpCode = http.GET();
-        if(httpCode) {
+        if(httpCode > 0) {
            // HTTP header has been send and Server response header has been handled
            USE_SERIAL.printf("[HTTP] GET... code: %d\n", httpCode);

--- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
+++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
@ -40,6 +40,9 @@ HTTPClient::HTTPClient() {
    _port = 0;

    _reuse = false;
+    _tcpTimeout = HTTPCLIENT_DEFAULT_TCP_TIMEOUT;
+    _useHTTP10 = false;
+
    _https = false;

    _userAgent = "ESP8266HTTPClient";
@ -50,7 +53,7 @@ HTTPClient::HTTPClient() {
    _returnCode = 0;
    _size = -1;
    _canReuse = false;
-	_tcpTimeout = HTTPCLIENT_DEFAULT_TCP_TIMEOUT;
+    _transferEncoding = HTTPC_TE_IDENTITY;

 }

@ -264,6 +267,16 @@ void HTTPClient::setTimeout(uint16_t timeout) {
    }
 }

+
+
+/**
+ * use HTTP1.0
+ * @param timeout
+ */
+void HTTPClient::useHTTP10(bool useHTTP10) {
+     _useHTTP10 = useHTTP10;
+}
+
 /**
 * send a GET request
 * @return http code
@ -296,7 +309,7 @@ int HTTPClient::POST(String payload) {
 int HTTPClient::sendRequest(const char * type, uint8_t * payload, size_t size) {
    // connect to server
    if(!connect()) {
-        return HTTPC_ERROR_CONNECTION_REFUSED;
+        return returnError(HTTPC_ERROR_CONNECTION_REFUSED);
    }

    if(payload && size > 0) {
@ -305,18 +318,18 @@ int HTTPClient::sendRequest(const char * type, uint8_t * payload, size_t size) {

    // send Header
    if(!sendHeader(type)) {
-        return HTTPC_ERROR_SEND_HEADER_FAILED;
+        return returnError(HTTPC_ERROR_SEND_HEADER_FAILED);
    }

    // send Payload if needed
    if(payload && size > 0) {
        if(_tcp->write(&payload[0], size) != size) {
-            return HTTPC_ERROR_SEND_PAYLOAD_FAILED;
+            return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED);
        }
    }

    // handle Server Response (Header)
-    return handleHeaderResponse();
+    return returnError(handleHeaderResponse());
 }

 /**
@ -329,12 +342,12 @@ int HTTPClient::sendRequest(const char * type, uint8_t * payload, size_t size) {
 int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size) {

    if(!stream) {
-        return HTTPC_ERROR_NO_STREAM;
+        return returnError(HTTPC_ERROR_NO_STREAM);
    }

    // connect to server
    if(!connect()) {
-        return HTTPC_ERROR_CONNECTION_REFUSED;
+        return returnError(HTTPC_ERROR_CONNECTION_REFUSED);
    }

    if(size > 0) {
@ -343,10 +356,10 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size) {

    // send Header
    if(!sendHeader(type)) {
-        return HTTPC_ERROR_SEND_HEADER_FAILED;
+        return returnError(HTTPC_ERROR_SEND_HEADER_FAILED);
    }

-    size_t buff_size = HTTP_TCP_BUFFER_SIZE;
+    int buff_size = HTTP_TCP_BUFFER_SIZE;

    int len = size;
    int bytesWritten = 0;
@ -369,25 +382,68 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size) {
        while(connected() && (stream->available() > -1) && (len > 0 || len == -1)) {

            // get available data size
-            size_t s = stream->available();
+            int sizeAvailable = stream->available();

-            if(len) {
-                s = ((s > len) ? len : s);
-            }
+            if(sizeAvailable) {

-            if(s) {
-                int c = stream->readBytes(buff, ((s > buff_size) ? buff_size : s));
+                int readBytes = sizeAvailable;

-                // write it to Stream
-                int w = _tcp->write((const uint8_t *) buff, c);
-                bytesWritten += w;
-                if(w != c) {
-                    DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] short write asked for %d but got %d\n", c, w);
-                    break;
+                // read only the asked bytes
+                if(len > 0 && readBytes > len) {
+                    readBytes = len;
                }

+                // not read more the buffer can handle
+                if(readBytes > buff_size) {
+                    readBytes = buff_size;
+                }
+
+                // read data
+                int bytesRead = stream->readBytes(buff, readBytes);
+
+                // write it to Stream
+                int bytesWrite = _tcp->write((const uint8_t *) buff, bytesRead);
+                bytesWritten += bytesWrite;
+
+                // are all Bytes a writen to stream ?
+                if(bytesWrite != bytesRead) {
+                    DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] short write, asked for %d but got %d retry...\n", bytesRead, bytesWrite);
+
+                    // check for write error
+                    if(_tcp->getWriteError()) {
+                        DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] stream write error %d\n", _tcp->getWriteError());
+
+                        //reset write error for retry
+                        _tcp->clearWriteError();
+                    }
+
+                    // some time for the stream
+                    delay(1);
+
+                    int leftBytes = (readBytes - bytesWrite);
+
+                    // retry to send the missed bytes
+                    bytesWrite = _tcp->write((const uint8_t *) (buff + bytesWrite), leftBytes);
+                    bytesWritten += bytesWrite;
+
+                    if(bytesWrite != leftBytes) {
+                        // failed again
+                        DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] short write, asked for %d but got %d failed.\n", leftBytes, bytesWrite);
+                        free(buff);
+                        return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED);
+                    }
+                }
+
+                // check for write error
+                if(_tcp->getWriteError()) {
+                    DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] stream write error %d\n", _tcp->getWriteError());
+                    free(buff);
+                    return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED);
+                }
+
+                // count bytes to read left
                if(len > 0) {
-                    len -= c;
+                    len -= readBytes;
                }

                delay(0);
@ -401,18 +457,18 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size) {
        if(size && (int) size != bytesWritten) {
            DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] Stream payload bytesWritten %d and size %d mismatch!.\n", bytesWritten, size);
            DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] ERROR SEND PAYLOAD FAILED!");
-            return HTTPC_ERROR_SEND_PAYLOAD_FAILED;
+            return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED);
        } else {
            DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] Stream payload written: %d\n", bytesWritten);
        }

    } else {
        DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] too less ram! need %d\n", HTTP_TCP_BUFFER_SIZE);
-        return HTTPC_ERROR_TOO_LESS_RAM;
+        return returnError(HTTPC_ERROR_TOO_LESS_RAM);
    }

    // handle Server Response (Header)
-    return handleHeaderResponse();
+    return returnError(handleHeaderResponse());
 }

 /**
@ -459,70 +515,73 @@ WiFiClient * HTTPClient::getStreamPtr(void) {
 int HTTPClient::writeToStream(Stream * stream) {

    if(!stream) {
-        return HTTPC_ERROR_NO_STREAM;
+        return returnError(HTTPC_ERROR_NO_STREAM);
    }

    if(!connected()) {
-        return HTTPC_ERROR_NOT_CONNECTED;
+        return returnError(HTTPC_ERROR_NOT_CONNECTED);
    }

    // get length of document (is -1 when Server sends no Content-Length header)
    int len = _size;
-    int bytesWritten = 0;
+    int ret = 0;

-    size_t buff_size = HTTP_TCP_BUFFER_SIZE;
+    if(_transferEncoding == HTTPC_TE_IDENTITY) {
+        ret = writeToStreamDataBlock(stream, len);

-    // if possible create smaller buffer then HTTP_TCP_BUFFER_SIZE
-    if((len > 0) && (len < HTTP_TCP_BUFFER_SIZE)) {
-        buff_size = len;
-    }
-
-    // create buffer for read
-    uint8_t * buff = (uint8_t *) malloc(buff_size);
-
-    if(buff) {
-        // read all data from server
-        while(connected() && (len > 0 || len == -1)) {
-
-            // get available data size
-            size_t size = _tcp->available();
-
-            if(size) {
-                int c = _tcp->readBytes(buff, ((size > buff_size) ? buff_size : size));
-
-                // write it to Stream
-                int w = stream->write(buff, c);
-                bytesWritten += w;
-                if(w != c) {
-                    DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] short write asked for %d but got %d\n", c, w);
-                    break;
-                }
-
-                if(len > 0) {
-                    len -= c;
-                }
-
-                delay(0);
-            } else {
-                delay(1);
+        // have we an error?
+        if(ret < 0) {
+            return returnError(ret);
+        }
+    } else if(_transferEncoding == HTTPC_TE_CHUNKED) {
+        int size = 0;
+        while(1) {
+            if(!connected()) {
+                return returnError(HTTPC_ERROR_CONNECTION_LOST);
            }
+            String chunkHeader = _tcp->readStringUntil('\n');
+
+            if(chunkHeader.length() <= 0) {
+                return returnError(HTTPC_ERROR_READ_TIMEOUT);
+            }
+
+            chunkHeader.trim(); // remove \r
+
+            // read size of chunk
+            len = (uint32_t) strtol((const char *) chunkHeader.c_str(), NULL, 16);
+            size += len;
+            DEBUG_HTTPCLIENT("[HTTP-Client] read chunk len: %d\n", len);
+
+            // data left?
+            if(len > 0) {
+                int r = writeToStreamDataBlock(stream, len);
+                if(r < 0) {
+                    // error in writeToStreamDataBlock
+                    return returnError(r);
+                }
+                ret += r;
+            } else {
+
+                // if no length Header use global chunk size
+                if(_size <= 0) {
+                    _size = size;
+                }
+
+                // check if we have write all data out
+                if(ret != _size) {
+                    return returnError(HTTPC_ERROR_STREAM_WRITE);
+                }
+                break;
+            }
+
+            delay(0);
        }
-
-        free(buff);
-
-        DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] connection closed or file end (written: %d).\n", bytesWritten);
-
-        if(_size && _size != bytesWritten) {
-            DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] bytesWritten %d and size %d mismatch!.\n", bytesWritten, _size);
-        }
-
    } else {
-        DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] too less ram! need %d\n", HTTP_TCP_BUFFER_SIZE);
-        return HTTPC_ERROR_TOO_LESS_RAM;
+        return returnError(HTTPC_ERROR_ENCODING);
    }

    end();
-    return bytesWritten;
+    return ret;
 }

 /**
@ -567,6 +626,12 @@ String HTTPClient::errorToString(int error) {
            return String("no HTTP server");
        case HTTPC_ERROR_TOO_LESS_RAM:
            return String("too less ram");
+        case HTTPC_ERROR_ENCODING:
+            return String("Transfer-Encoding not supported");
+        case HTTPC_ERROR_STREAM_WRITE:
+            return String("Stream write error");
+        case HTTPC_ERROR_READ_TIMEOUT:
+            return String("read Timeout");
        default:
            return String();
    }
@ -703,7 +768,15 @@ bool HTTPClient::sendHeader(const char * type) {
        return false;
    }

-    String header = String(type) + " " + _url + " HTTP/1.1\r\n"
+    String header = String(type) + " " + _url + " HTTP/1.";
+
+    if(_useHTTP10) {
+        header += "0";
+    } else {
+        header += "1";
+    }
+
+    header += "\r\n"
            "Host: " + _host + "\r\n"
            "User-Agent: " + _userAgent + "\r\n"
            "Connection: ";
@ -715,6 +788,10 @@ bool HTTPClient::sendHeader(const char * type) {
    }
    header += "\r\n";

+    if(!_useHTTP10) {
+        header += "Accept-Encoding: identity;q=1 chunked;q=0.1 *;q=0\r\n";
+    }
+
    if(_base64Authorization.length()) {
        header += "Authorization: Basic " + _base64Authorization + "\r\n";
    }
@ -733,9 +810,10 @@ int HTTPClient::handleHeaderResponse() {
    if(!connected()) {
        return HTTPC_ERROR_NOT_CONNECTED;
    }
-
+    String transferEncoding;
    _returnCode = -1;
    _size = -1;
+    _transferEncoding = HTTPC_TE_IDENTITY;

    while(connected()) {
        size_t len = _tcp->available();
@ -759,6 +837,10 @@ int HTTPClient::handleHeaderResponse() {
                    _canReuse = headerValue.equalsIgnoreCase("keep-alive");
                }

+                if(headerName.equalsIgnoreCase("Transfer-Encoding")) {
+                    transferEncoding = headerValue;
+                }
+
                for(size_t i = 0; i < _headerKeysCount; i++) {
                    if(_currentHeaders[i].key.equalsIgnoreCase(headerName)) {
                        _currentHeaders[i].value = headerValue;
@ -769,9 +851,22 @@ int HTTPClient::handleHeaderResponse() {

            if(headerLine == "") {
                DEBUG_HTTPCLIENT("[HTTP-Client][handleHeaderResponse] code: %d\n", _returnCode);
-                if(_size) {
+
+                if(_size > 0) {
                    DEBUG_HTTPCLIENT("[HTTP-Client][handleHeaderResponse] size: %d\n", _size);
                }
+
+                if(transferEncoding.length() > 0) {
+                    DEBUG_HTTPCLIENT("[HTTP-Client][handleHeaderResponse] Transfer-Encoding: %s\n", transferEncoding.c_str());
+                    if(transferEncoding.equalsIgnoreCase("chunked")) {
+                        _transferEncoding = HTTPC_TE_CHUNKED;
+                    } else {
+                        return HTTPC_ERROR_ENCODING;
+                    }
+                } else {
+                    _transferEncoding = HTTPC_TE_IDENTITY;
+                }
+
                if(_returnCode) {
                    return _returnCode;
                } else {
@ -787,3 +882,132 @@ int HTTPClient::handleHeaderResponse() {

    return HTTPC_ERROR_CONNECTION_LOST;
 }
+
+
+
+/**
+ * write one Data Block to Stream
+ * @param stream Stream *
+ * @param size int
+ * @return < 0 = error >= 0 = size written
+ */
+int HTTPClient::writeToStreamDataBlock(Stream * stream, int size) {
+    int buff_size = HTTP_TCP_BUFFER_SIZE;
+    int len = size;
+    int bytesWritten = 0;
+
+    // if possible create smaller buffer then HTTP_TCP_BUFFER_SIZE
+    if((len > 0) && (len < HTTP_TCP_BUFFER_SIZE)) {
+        buff_size = len;
+    }
+
+    // create buffer for read
+    uint8_t * buff = (uint8_t *) malloc(buff_size);
+
+    if(buff) {
+        // read all data from server
+        while(connected() && (len > 0 || len == -1)) {
+
+            // get available data size
+            size_t sizeAvailable = _tcp->available();
+
+            if(sizeAvailable) {
+
+                int readBytes = sizeAvailable;
+
+                // read only the asked bytes
+                if(len > 0 && readBytes > len) {
+                    readBytes = len;
+                }
+
+                // not read more the buffer can handle
+                if(readBytes > buff_size) {
+                    readBytes = buff_size;
+                }
+
+                // read data
+                int bytesRead = _tcp->readBytes(buff, readBytes);
+
+                // write it to Stream
+                int bytesWrite = stream->write(buff, bytesRead);
+                bytesWritten += bytesWrite;
+
+                // are all Bytes a writen to stream ?
+                if(bytesWrite != bytesRead) {
+                    DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] short write asked for %d but got %d retry...\n", bytesRead, bytesWrite);
+
+                    // check for write error
+                    if(stream->getWriteError()) {
+                        DEBUG_HTTPCLIENT("[HTTP-Client][writeToStreamDataBlock] stream write error %d\n", stream->getWriteError());
+
+                        //reset write error for retry
+                        stream->clearWriteError();
+                    }
+
+                    // some time for the stream
+                    delay(1);
+
+                    int leftBytes = (readBytes - bytesWrite);
+
+                    // retry to send the missed bytes
+                    bytesWrite = stream->write((buff + bytesWrite), leftBytes);
+                    bytesWritten += bytesWrite;
+
+                    if(bytesWrite != leftBytes) {
+                        // failed again
+                        DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] short write asked for %d but got %d failed.\n", leftBytes, bytesWrite);
+                        free(buff);
+                        return HTTPC_ERROR_STREAM_WRITE;
+                    }
+                }
+
+                // check for write error
+                if(stream->getWriteError()) {
+                    DEBUG_HTTPCLIENT("[HTTP-Client][writeToStreamDataBlock] stream write error %d\n", stream->getWriteError());
+                    free(buff);
+                    return HTTPC_ERROR_STREAM_WRITE;
+                }
+
+                // count bytes to read left
+                if(len > 0) {
+                    len -= readBytes;
+                }
+
+                delay(0);
+            } else {
+                delay(1);
+            }
+        }
+
+        free(buff);
+
+        DEBUG_HTTPCLIENT("[HTTP-Client][writeToStreamDataBlock] connection closed or file end (written: %d).\n", bytesWritten);
+
+        if((size > 0) && (size != bytesWritten)) {
+            DEBUG_HTTPCLIENT("[HTTP-Client][writeToStreamDataBlock] bytesWritten %d and size %d mismatch!.\n", bytesWritten, size);
+            return HTTPC_ERROR_STREAM_WRITE;
+        }
+
+    } else {
+        DEBUG_HTTPCLIENT("[HTTP-Client][writeToStreamDataBlock] too less ram! need %d\n", HTTP_TCP_BUFFER_SIZE);
+        return HTTPC_ERROR_TOO_LESS_RAM;
+    }
+
+    return bytesWritten;
+}
+
+/**
+ * called to handle error return, may disconnect the connection if still exists
+ * @param error
+ * @return error
+ */
+int HTTPClient::returnError(int error) {
+    if(error < 0) {
+        DEBUG_HTTPCLIENT("[HTTP-Client][returnError] error(%d): %s\n", error, errorToString(error).c_str());
+        if(connected()) {
+            DEBUG_HTTPCLIENT("[HTTP-Client][returnError] tcp stop\n");
+            _tcp->stop();
+        }
+    }
+    return error;
+}
--- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
+++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
@ -25,13 +25,17 @@
 #ifndef ESP8266HTTPClient_H_
 #define ESP8266HTTPClient_H_

-//#define DEBUG_HTTPCLIENT(...) Serial1.printf( __VA_ARGS__ )
+#ifdef DEBUG_ESP_HTTP_CLIENT
+#ifdef DEBUG_ESP_PORT
+#define DEBUG_HTTPCLIENT(...) DEBUG_ESP_PORT.printf( __VA_ARGS__ )
+#endif
+#endif

 #ifndef DEBUG_HTTPCLIENT
 #define DEBUG_HTTPCLIENT(...)
 #endif

-#define HTTPCLIENT_DEFAULT_TCP_TIMEOUT (1000)
+#define HTTPCLIENT_DEFAULT_TCP_TIMEOUT (5000)

 /// HTTP client errors
 #define HTTPC_ERROR_CONNECTION_REFUSED  (-1)
@ -42,6 +46,9 @@
 #define HTTPC_ERROR_NO_STREAM           (-6)
 #define HTTPC_ERROR_NO_HTTP_SERVER      (-7)
 #define HTTPC_ERROR_TOO_LESS_RAM        (-8)
+#define HTTPC_ERROR_ENCODING            (-9)
+#define HTTPC_ERROR_STREAM_WRITE        (-10)
+#define HTTPC_ERROR_READ_TIMEOUT        (-11)

 /// size for the stream handling
 #define HTTP_TCP_BUFFER_SIZE (1460)
@ -108,6 +115,11 @@ typedef enum {
    HTTP_CODE_NETWORK_AUTHENTICATION_REQUIRED = 511
 } t_http_codes;

+typedef enum {
+    HTTPC_TE_IDENTITY,
+    HTTPC_TE_CHUNKED
+} transferEncoding_t;
+
 class HTTPClient {
    public:
        HTTPClient();
@ -129,6 +141,8 @@ class HTTPClient {
        void setAuthorization(const char * auth);
        void setTimeout(uint16_t timeout);

+        void useHTTP10(bool usehttp10 = true);
+
        /// request handling
        int GET();
        int POST(uint8_t * payload, size_t size);
@ -172,6 +186,7 @@ class HTTPClient {
        uint16_t _port;
        bool _reuse;
        uint16_t _tcpTimeout;
+        bool _useHTTP10;

        String _url;
        bool _https;
@ -188,11 +203,13 @@ class HTTPClient {
        int _returnCode;
        int _size;
        bool _canReuse;
+        transferEncoding_t _transferEncoding;

+        int returnError(int error);
        bool connect(void);
        bool sendHeader(const char * type);
        int handleHeaderResponse();
-
+        int writeToStreamDataBlock(Stream * stream, int len);
 };


--- a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
+++ b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@ -28,8 +28,13 @@
 #include "ESP8266WebServer.h"
 #include "FS.h"
 #include "detail/RequestHandlersImpl.h"
-// #define DEBUG
+
+//#define DEBUG_ESP_HTTP_SERVER
+#ifdef DEBUG_ESP_PORT
+#define DEBUG_OUTPUT DEBUG_ESP_PORT
+#else
 #define DEBUG_OUTPUT Serial
+#endif

 const char * AUTHORIZATION_HEADER = "Authorization";

@ -155,7 +160,7 @@ void ESP8266WebServer::handleClient() {
    return;
  }

-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
  DEBUG_OUTPUT.println("New client");
 #endif

@ -416,13 +421,13 @@ void ESP8266WebServer::onNotFound(THandlerFunction fn) {
 void ESP8266WebServer::_handleRequest() {
  bool handled = false;
  if (!_currentHandler){
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
    DEBUG_OUTPUT.println("request handler not found");
 #endif
  }
  else {
    handled = _currentHandler->handle(*this, _currentMethod, _currentUri);
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
    if (!handled) {
      DEBUG_OUTPUT.println("request handler failed to handle request");
    }
--- a/libraries/ESP8266WebServer/src/Parsing.cpp
+++ b/libraries/ESP8266WebServer/src/Parsing.cpp
@ -24,8 +24,12 @@
 #include "WiFiClient.h"
 #include "ESP8266WebServer.h"

-//#define DEBUG
+//#define DEBUG_ESP_HTTP_SERVER
+#ifdef DEBUG_ESP_PORT
+#define DEBUG_OUTPUT DEBUG_ESP_PORT
+#else
 #define DEBUG_OUTPUT Serial
+#endif

 bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
  // Read the first line of HTTP request
@ -41,7 +45,7 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
  int addr_start = req.indexOf(' ');
  int addr_end = req.indexOf(' ', addr_start + 1);
  if (addr_start == -1 || addr_end == -1) {
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
    DEBUG_OUTPUT.print("Invalid request: ");
    DEBUG_OUTPUT.println(req);
 #endif
@ -72,7 +76,7 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
  }
  _currentMethod = method;

-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
  DEBUG_OUTPUT.print("method: ");
  DEBUG_OUTPUT.print(methodStr);
  DEBUG_OUTPUT.print(" url: ");
@ -111,7 +115,7 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
      headerValue.trim();
       _collectHeader(headerName.c_str(),headerValue.c_str());
 	  
-	  #ifdef DEBUG
+	  #ifdef DEBUG_ESP_HTTP_SERVER
 	  DEBUG_OUTPUT.print("headerName: ");
 	  DEBUG_OUTPUT.println(headerName);
 	  DEBUG_OUTPUT.print("headerValue: ");
@ -142,7 +146,7 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
      char *plainBuf = (char*)malloc(plainLen+1);
      client.readBytes(plainBuf, plainLen);
      plainBuf[plainLen] = '\0';
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
      DEBUG_OUTPUT.print("Plain: ");
      DEBUG_OUTPUT.println(plainBuf);
 #endif
@ -177,7 +181,7 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
      headerValue = req.substring(headerDiv + 2);
      _collectHeader(headerName.c_str(),headerValue.c_str());
 	  
-	  #ifdef DEBUG
+	  #ifdef DEBUG_ESP_HTTP_SERVER
 	  DEBUG_OUTPUT.print("headerName: ");
 	  DEBUG_OUTPUT.println(headerName);
 	  DEBUG_OUTPUT.print("headerValue: ");
@ -192,7 +196,7 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
  }
  client.flush();

-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
  DEBUG_OUTPUT.print("Request: ");
  DEBUG_OUTPUT.println(url);
  DEBUG_OUTPUT.print(" Arguments: ");
@ -213,7 +217,7 @@ bool ESP8266WebServer::_collectHeader(const char* headerName, const char* header
 }

 void ESP8266WebServer::_parseArguments(String data) {
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
  DEBUG_OUTPUT.print("args: ");
  DEBUG_OUTPUT.println(data);
 #endif
@ -233,7 +237,7 @@ void ESP8266WebServer::_parseArguments(String data) {
    ++i;
    ++_currentArgCount;
  }
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
  DEBUG_OUTPUT.print("args count: ");
  DEBUG_OUTPUT.println(_currentArgCount);
 #endif
@ -244,7 +248,7 @@ void ESP8266WebServer::_parseArguments(String data) {
  for (iarg = 0; iarg < _currentArgCount;) {
    int equal_sign_index = data.indexOf('=', pos);
    int next_arg_index = data.indexOf('&', pos);
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
    DEBUG_OUTPUT.print("pos ");
    DEBUG_OUTPUT.print(pos);
    DEBUG_OUTPUT.print("=@ ");
@ -253,7 +257,7 @@ void ESP8266WebServer::_parseArguments(String data) {
    DEBUG_OUTPUT.println(next_arg_index);
 #endif
    if ((equal_sign_index == -1) || ((equal_sign_index > next_arg_index) && (next_arg_index != -1))) {
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
      DEBUG_OUTPUT.print("arg missing value: ");
      DEBUG_OUTPUT.println(iarg);
 #endif
@ -265,7 +269,7 @@ void ESP8266WebServer::_parseArguments(String data) {
    RequestArgument& arg = _currentArgs[iarg];
    arg.key = data.substring(pos, equal_sign_index);
 	arg.value = urlDecode(data.substring(equal_sign_index + 1, next_arg_index));
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
    DEBUG_OUTPUT.print("arg ");
    DEBUG_OUTPUT.print(iarg);
    DEBUG_OUTPUT.print(" key: ");
@ -279,7 +283,7 @@ void ESP8266WebServer::_parseArguments(String data) {
    pos = next_arg_index + 1;
  }
  _currentArgCount = iarg;
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
  DEBUG_OUTPUT.print("args count: ");
  DEBUG_OUTPUT.println(_currentArgCount);
 #endif
@ -308,7 +312,7 @@ uint8_t ESP8266WebServer::_uploadReadByte(WiFiClient& client){

 bool ESP8266WebServer::_parseForm(WiFiClient& client, String boundary, uint32_t len){

-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
  DEBUG_OUTPUT.print("Parse Form: Boundary: ");
  DEBUG_OUTPUT.print(boundary);
  DEBUG_OUTPUT.print(" Length: ");
@ -346,14 +350,14 @@ bool ESP8266WebServer::_parseForm(WiFiClient& client, String boundary, uint32_t
            argFilename = argName.substring(nameStart+2, argName.length() - 1);
            argName = argName.substring(0, argName.indexOf('"'));
            argIsFile = true;
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
            DEBUG_OUTPUT.print("PostArg FileName: ");
            DEBUG_OUTPUT.println(argFilename);
 #endif
            //use GET to set the filename if uploading using blob
            if (argFilename == "blob" && hasArg("filename")) argFilename = arg("filename");
          }
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
          DEBUG_OUTPUT.print("PostArg Name: ");
          DEBUG_OUTPUT.println(argName);
 #endif
@ -366,7 +370,7 @@ bool ESP8266WebServer::_parseForm(WiFiClient& client, String boundary, uint32_t
            client.readStringUntil('\r');
            client.readStringUntil('\n');
          }
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
          DEBUG_OUTPUT.print("PostArg Type: ");
          DEBUG_OUTPUT.println(argType);
 #endif
@ -378,7 +382,7 @@ bool ESP8266WebServer::_parseForm(WiFiClient& client, String boundary, uint32_t
              if (argValue.length() > 0) argValue += "\n";
              argValue += line;
            }
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
            DEBUG_OUTPUT.print("PostArg Value: ");
            DEBUG_OUTPUT.println(argValue);
            DEBUG_OUTPUT.println();
@ -389,7 +393,7 @@ bool ESP8266WebServer::_parseForm(WiFiClient& client, String boundary, uint32_t
            arg.value = argValue;

            if (line == ("--"+boundary+"--")){
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
              DEBUG_OUTPUT.println("Done Parsing POST");
 #endif
              break;
@ -401,7 +405,7 @@ bool ESP8266WebServer::_parseForm(WiFiClient& client, String boundary, uint32_t
            _currentUpload.type = argType;
            _currentUpload.totalSize = 0;
            _currentUpload.currentSize = 0;
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
            DEBUG_OUTPUT.print("Start File: ");
            DEBUG_OUTPUT.print(_currentUpload.filename);
            DEBUG_OUTPUT.print(" Type: ");
@ -450,7 +454,7 @@ readfile:
                _currentUpload.status = UPLOAD_FILE_END;
                if(_currentHandler && _currentHandler->canUpload(_currentUri))
                  _currentHandler->upload(*this, _currentUri, _currentUpload);
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
                DEBUG_OUTPUT.print("End File: ");
                DEBUG_OUTPUT.print(_currentUpload.filename);
                DEBUG_OUTPUT.print(" Type: ");
@ -461,7 +465,7 @@ readfile:
                line = client.readStringUntil(0x0D);
                client.readStringUntil(0x0A);
                if (line == "--"){
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
                  DEBUG_OUTPUT.println("Done Parsing POST");
 #endif
                  break;
@ -507,7 +511,7 @@ readfile:
    if (postArgs) delete[] postArgs;
    return true;
  }
-#ifdef DEBUG
+#ifdef DEBUG_ESP_HTTP_SERVER
  DEBUG_OUTPUT.print("Error: line: ");
  DEBUG_OUTPUT.println(line);
 #endif
--- a/libraries/ESP8266WiFi/examples/WiFiClientEvents/WiFiClientEvents.ino
+++ b/libraries/ESP8266WiFi/examples/WiFiClientEvents/WiFiClientEvents.ino
@ -0,0 +1,48 @@
+/*
+ *  This sketch shows the WiFi event usage
+ *
+ */
+
+#include <ESP8266WiFi.h>
+
+const char* ssid     = "your-ssid";
+const char* password = "your-password";
+
+
+void WiFiEvent(WiFiEvent_t event) {
+    Serial.printf("[WiFi-event] event: %d\n", event);
+
+    switch(event) {
+        case WIFI_EVENT_STAMODE_GOT_IP:
+            Serial.println("WiFi connected");
+            Serial.println("IP address: ");
+            Serial.println(WiFi.localIP());
+            break;
+        case WIFI_EVENT_STAMODE_DISCONNECTED:
+            Serial.println("WiFi lost connection");
+            break;
+    }
+}
+
+void setup() {
+    Serial.begin(115200);
+
+    // delete old config
+    WiFi.disconnect(true);
+
+    delay(1000);
+
+    WiFi.onEvent(WiFiEvent);
+
+    WiFi.begin(ssid, password);
+
+    Serial.println();
+    Serial.println();
+    Serial.println("Wait for WiFi... ");
+}
+
+
+void loop() {
+    delay(1000);
+}
+
--- a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
@ -1,23 +1,26 @@
 /*
-  ESP8266WiFi.cpp - WiFi library for esp8266
+ ESP8266WiFi.cpp - WiFi library for esp8266

-  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
+ Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+ This file is part of the esp8266 core for Arduino environment.

-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.

-  This library 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
-  Lesser General Public License for more details.
+ This library 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
+ Lesser General Public License for more details.

-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+ Reworked on 28 Dec 2015 by Markus Sattler
+
+ */

 #include "ESP8266WiFi.h"

@ -34,925 +37,23 @@ extern "C" {
 #include "lwip/dns.h"
 }

-#include "WiFiClient.h"
-#include "WiFiUdp.h"
 #include "debug.h"

-extern "C" void esp_schedule();
-extern "C" void esp_yield();
+// -----------------------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------------- Debug ------------------------------------------------------
+// -----------------------------------------------------------------------------------------------------------------------

-ESP8266WiFiClass::ESP8266WiFiClass()
-: _smartConfigStarted(false)
-, _smartConfigDone(false)
-, _useStaticIp(false)
-, _persistent(true)
-{
-    uint8 m = wifi_get_opmode();
-    _useClientMode = (m & WIFI_STA);
-    _useApMode = (m & WIFI_AP);
-    wifi_set_event_handler_cb((wifi_event_handler_cb_t)&ESP8266WiFiClass::_eventCallback);
-}
-
-void ESP8266WiFiClass::persistent(bool persistent)
-{
-    _persistent = persistent;
-}
-
-
-void ESP8266WiFiClass::mode(WiFiMode m)
-{
-    if(wifi_get_opmode() == (uint8)m) {
-        return;
-    }
-
-    if((m & WIFI_AP)) {
-        _useApMode = true;
-    } else {
-        _useApMode = false;
-    }
-
-    if((m & WIFI_STA)) {
-        _useClientMode = true;
-    } else {
-        _useClientMode = false;
-    }
-
-    _mode(m);
-}
-
-WiFiMode ESP8266WiFiClass::getMode()
-{
-    return (WiFiMode)wifi_get_opmode();
-}
-
-void ESP8266WiFiClass::_mode(WiFiMode m)
-{
-    if(wifi_get_opmode() == (uint8)m) {
-        return;
-    }
-
-    ETS_UART_INTR_DISABLE();
-    if (_persistent)
-        wifi_set_opmode(m);
-    else
-        wifi_set_opmode_current(m);
-    ETS_UART_INTR_ENABLE();
-
-}
-
-static bool sta_config_equal(const station_config& lhs, const station_config& rhs)
-{
-    if (strcmp(reinterpret_cast<const char*>(lhs.ssid), reinterpret_cast<const char*>(rhs.ssid)) != 0)
-        return false;
-
-    if (strcmp(reinterpret_cast<const char*>(lhs.password), reinterpret_cast<const char*>(rhs.password)) != 0)
-        return false;
-
-    if (lhs.bssid_set) {
-        if (!rhs.bssid_set)
-            return false;
-
-        if (memcmp(lhs.bssid, rhs.bssid, 6) != 0)
-            return false;
-    }
-    else {
-        if (rhs.bssid_set)
-            return false;
-    }
-
-    return true;
-}
-
-int ESP8266WiFiClass::begin(char* ssid, char *passphrase, int32_t channel, const uint8_t* bssid)
-{
-    return begin((const char*) ssid, (const char*) passphrase, channel, bssid);
-}
-
-int ESP8266WiFiClass::begin(const char* ssid, const char *passphrase, int32_t channel, const uint8_t* bssid)
-{
-    _useClientMode = true;
-
-    if(_useApMode) {
-        // turn on AP+STA mode
-        _mode(WIFI_AP_STA);
-    } else {
-        // turn on STA mode
-        _mode(WIFI_STA);
-    }
-
-    if(!ssid || *ssid == 0x00 || strlen(ssid) > 31) {
-        // fail SSID too long or missing!
-        return WL_CONNECT_FAILED;
-    }
-
-    if(passphrase && strlen(passphrase) > 63) {
-        // fail passphrase too long!
-        return WL_CONNECT_FAILED;
-    }
-
-    struct station_config conf;
-    strcpy(reinterpret_cast<char*>(conf.ssid), ssid);
-
-    if (passphrase) {
-        strcpy(reinterpret_cast<char*>(conf.password), passphrase);
-    } else {
-        *conf.password = 0;
-    }
-
-    if (bssid) {
-        conf.bssid_set = 1;
-        memcpy((void *) &conf.bssid[0], (void *) bssid, 6);
-    } else {
-        conf.bssid_set = 0;
-    }
-
-    struct station_config current_conf;
-    wifi_station_get_config(&current_conf);
-    if (sta_config_equal(current_conf, conf)) {
-        DEBUGV("sta config unchanged");
-        return status();
-    }
-
-    ETS_UART_INTR_DISABLE();
-    if (_persistent)
-        wifi_station_set_config(&conf);
-    else
-        wifi_station_set_config_current(&conf);
-    wifi_station_connect();
-    ETS_UART_INTR_ENABLE();
-
-    if(channel > 0 && channel <= 13) {
-        wifi_set_channel(channel);
-    }
-
-    if(!_useStaticIp)
-        wifi_station_dhcpc_start();
-    return status();
-}
-
-int ESP8266WiFiClass::begin()
-{
-    ETS_UART_INTR_DISABLE();
-    wifi_station_connect();
-    ETS_UART_INTR_ENABLE();
-
-    if(!_useStaticIp)
-        wifi_station_dhcpc_start();
-    return status();
-}
-
-uint8_t ESP8266WiFiClass::waitForConnectResult(){
-  if ((wifi_get_opmode() & 1) == 0)//1 and 3 have STA enabled
-      return WL_DISCONNECTED;
-  while (status() == WL_DISCONNECTED)
-    delay(100);
-  return status();
-}
-
-
-// You will have to set the DNS-Server manually later since this will not enable DHCP2
-void ESP8266WiFiClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subnet)
-{
-    struct ip_info info;
-    info.ip.addr = static_cast<uint32_t>(local_ip);
-    info.gw.addr = static_cast<uint32_t>(gateway);
-    info.netmask.addr = static_cast<uint32_t>(subnet);
-
-    wifi_station_dhcpc_stop();
-    wifi_set_ip_info(STATION_IF, &info);
-
-    _useStaticIp = true;
-}
-
-void ESP8266WiFiClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns)
-{
-    struct ip_info info;
-    info.ip.addr = static_cast<uint32_t>(local_ip);
-    info.gw.addr = static_cast<uint32_t>(gateway);
-    info.netmask.addr = static_cast<uint32_t>(subnet);
-
-    wifi_station_dhcpc_stop();
-    wifi_set_ip_info(STATION_IF, &info);
-
-    // Set DNS-Server
-    ip_addr_t d;
-    d.addr = static_cast<uint32_t>(dns);
-    dns_setserver(0,&d);
-
-    _useStaticIp = true;
-}
-
-int ESP8266WiFiClass::softAPdisconnect(bool wifioff)
-{
-    struct softap_config conf;
-    *conf.ssid = 0;
-    *conf.password = 0;
-    ETS_UART_INTR_DISABLE();
-    if (_persistent)
-        wifi_softap_set_config(&conf);
-    else
-        wifi_softap_set_config_current(&conf);
-    ETS_UART_INTR_ENABLE();
-
-    if(wifioff) {
-        _useApMode = false;
-
-        if( _useClientMode) {
-            // turn on STA
-            _mode(WIFI_STA);
-        } else {
-            // turn wifi off
-            _mode(WIFI_OFF);
-        }
-    }
-
-    return 0;
-}
-
-int ESP8266WiFiClass::disconnect(bool wifioff)
-{
-    struct station_config conf;
-    *conf.ssid = 0;
-    *conf.password = 0;
-    ETS_UART_INTR_DISABLE();
-    if (_persistent)
-        wifi_station_set_config(&conf);
-    else
-        wifi_station_set_config_current(&conf);
-    wifi_station_disconnect();
-    ETS_UART_INTR_ENABLE();
-
-    if(wifioff) {
-        _useClientMode = false;
-
-        if(_useApMode) {
-            // turn on AP
-            _mode(WIFI_AP);
-        } else {
-            // turn wifi off
-            _mode(WIFI_OFF);
-        }
-    }
-
-    return 0;
-}
-
-static bool softap_config_equal(const softap_config& lhs, const softap_config& rhs)
-{
-    if (strcmp(reinterpret_cast<const char*>(lhs.ssid), reinterpret_cast<const char*>(rhs.ssid)) != 0)
-        return false;
-    if (strcmp(reinterpret_cast<const char*>(lhs.password), reinterpret_cast<const char*>(rhs.password)) != 0)
-        return false;
-    if (lhs.channel != rhs.channel)
-        return false;
-    if (lhs.ssid_hidden != rhs.ssid_hidden)
-        return false;
-    return true;
-}
-
-
-void ESP8266WiFiClass::softAP(const char* ssid)
-{
-    softAP(ssid, 0);
-}
-
-
-void ESP8266WiFiClass::softAP(const char* ssid, const char* passphrase, int channel, int ssid_hidden)
-{
-    _useApMode = true;
-    if(_useClientMode) {
-        // turn on AP+STA mode
-        _mode(WIFI_AP_STA);
-    } else {
-        // turn on STA mode
-        _mode(WIFI_AP);
-    }
-
-    if(!ssid || *ssid == 0 || strlen(ssid) > 31) {
-        // fail SSID too long or missing!
-        return;
-    }
-
-    if(passphrase && strlen(passphrase) > 63) {
-        // fail passphrase to long!
-        return;
-    }
-
-    struct softap_config conf;
-    wifi_softap_get_config(&conf);
-    strcpy(reinterpret_cast<char*>(conf.ssid), ssid);
-    conf.channel = channel;
-    conf.ssid_len = strlen(ssid);
-    conf.ssid_hidden = ssid_hidden;
-    conf.max_connection = 4;
-    conf.beacon_interval = 100;
-
-    if (!passphrase || strlen(passphrase) == 0)
-    {
-        conf.authmode = AUTH_OPEN;
-        *conf.password = 0;
-    }
-    else
-    {
-        conf.authmode = AUTH_WPA2_PSK;
-        strcpy(reinterpret_cast<char*>(conf.password), passphrase);
-    }
-
-    struct softap_config conf_current;
-    wifi_softap_get_config(&conf_current);
-    if (softap_config_equal(conf, conf_current))
-    {
-        DEBUGV("softap config unchanged");
-        return;
-    }
-
-    ETS_UART_INTR_DISABLE();
-    if (_persistent)
-        wifi_softap_set_config(&conf);
-    else
-        wifi_softap_set_config_current(&conf);
-    ETS_UART_INTR_ENABLE();
-}
-
-void ESP8266WiFiClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet)
-{
-    struct ip_info info;
-    info.ip.addr = static_cast<uint32_t>(local_ip);
-    info.gw.addr = static_cast<uint32_t>(gateway);
-    info.netmask.addr = static_cast<uint32_t>(subnet);
-    wifi_softap_dhcps_stop();
-    wifi_set_ip_info(SOFTAP_IF, &info);
-    wifi_softap_dhcps_start();
-}
-
-uint8_t* ESP8266WiFiClass::macAddress(uint8_t* mac)
-{
-    wifi_get_macaddr(STATION_IF, mac);
-    return mac;
-}
-
-String ESP8266WiFiClass::macAddress(void)
-{
-    uint8_t mac[6];
-    char macStr[18] = {0};
-    wifi_get_macaddr(STATION_IF, mac);
-
-    sprintf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0],  mac[1], mac[2], mac[3], mac[4], mac[5]);
-    return String(macStr);
-}
-
-uint8_t* ESP8266WiFiClass::softAPmacAddress(uint8_t* mac)
-{
-    wifi_get_macaddr(SOFTAP_IF, mac);
-    return mac;
-}
-
-String ESP8266WiFiClass::softAPmacAddress(void)
-{
-    uint8_t mac[6];
-    char macStr[18] = {0};
-    wifi_get_macaddr(SOFTAP_IF, mac);
-
-    sprintf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0],  mac[1], mac[2], mac[3], mac[4], mac[5]);
-    return String(macStr);
-}
-
-IPAddress ESP8266WiFiClass::localIP()
-{
-    struct ip_info ip;
-    wifi_get_ip_info(STATION_IF, &ip);
-    return IPAddress(ip.ip.addr);
-}
-
-IPAddress ESP8266WiFiClass::softAPIP()
-{
-    struct ip_info ip;
-    wifi_get_ip_info(SOFTAP_IF, &ip);
-    return IPAddress(ip.ip.addr);
-}
-
-IPAddress ESP8266WiFiClass::subnetMask()
-{
-    struct ip_info ip;
-    wifi_get_ip_info(STATION_IF, &ip);
-    return IPAddress(ip.netmask.addr);
-}
-
-IPAddress ESP8266WiFiClass::gatewayIP()
-{
-    struct ip_info ip;
-    wifi_get_ip_info(STATION_IF, &ip);
-    return IPAddress(ip.gw.addr);
-}
-
-IPAddress ESP8266WiFiClass::dnsIP(int dns_no)
-{
-    ip_addr_t dns_ip = dns_getserver(dns_no);
-    return IPAddress(dns_ip.addr);
-}
-
-String ESP8266WiFiClass::SSID() const
-{
-    static struct station_config conf;
-    wifi_station_get_config(&conf);
-    return String(reinterpret_cast<char*>(conf.ssid));
-}
-
-String ESP8266WiFiClass::psk() const
-{
-    static struct station_config conf;
-    wifi_station_get_config(&conf);
-		return String(reinterpret_cast<char*>(conf.password));
-}
-
-uint8_t* ESP8266WiFiClass::BSSID(void)
-{
-    static struct station_config conf;
-    wifi_station_get_config(&conf);
-    return reinterpret_cast<uint8_t*>(conf.bssid);
-}
-
-String ESP8266WiFiClass::BSSIDstr(void)
-{
-    static struct station_config conf;
-    char mac[18] = {0};
-    wifi_station_get_config(&conf);
-    sprintf(mac,"%02X:%02X:%02X:%02X:%02X:%02X", conf.bssid[0],  conf.bssid[1],  conf.bssid[2], conf.bssid[3], conf.bssid[4], conf.bssid[5]);
-    return String(mac);
-}
-
-
-int32_t ESP8266WiFiClass::channel(void) {
-    return wifi_get_channel();
-}
-
-
-int32_t ESP8266WiFiClass::RSSI(void) {
-    return wifi_station_get_rssi();
-}
-
-extern "C"
-{
-    typedef STAILQ_HEAD(, bss_info) bss_info_head_t;
-}
-
-void ESP8266WiFiClass::_scanDone(void* result, int status)
-{
-    if (status != OK)
-    {
-        ESP8266WiFiClass::_scanCount = 0;
-        ESP8266WiFiClass::_scanResult = 0;
-    }
-    else
-    {
-
-        int i = 0;
-        bss_info_head_t* head = reinterpret_cast<bss_info_head_t*>(result);
-
-        for (bss_info* it = STAILQ_FIRST(head); it; it = STAILQ_NEXT(it, next), ++i);
-        ESP8266WiFiClass::_scanCount = i;
-        if (i == 0)
-        {
-            ESP8266WiFiClass::_scanResult = 0;
-        }
-        else
-        {
-            bss_info* copied_info = new bss_info[i];
-            i = 0;
-            for (bss_info* it = STAILQ_FIRST(head); it; it = STAILQ_NEXT(it, next), ++i)
-            {
-                memcpy(copied_info + i, it, sizeof(bss_info));
-            }
-
-            ESP8266WiFiClass::_scanResult = copied_info;
-        }
-
-    }
-
-    ESP8266WiFiClass::_scanStarted = false;
-    ESP8266WiFiClass::_scanComplete = true;
-
-    if(!ESP8266WiFiClass::_scanAsync) {
-        esp_schedule();
-    }
-}
-
-int8_t ESP8266WiFiClass::scanComplete() {
-
-    if(_scanStarted) {
-        return WIFI_SCAN_RUNNING;
-    }
-
-    if(_scanComplete) {
-        return ESP8266WiFiClass::_scanCount;
-    }
-
-    return WIFI_SCAN_FAILED;
-}
-
-void ESP8266WiFiClass::scanDelete()
-{
-    if (ESP8266WiFiClass::_scanResult)
-    {
-        delete[] reinterpret_cast<bss_info*>(ESP8266WiFiClass::_scanResult);
-        ESP8266WiFiClass::_scanResult = 0;
-        ESP8266WiFiClass::_scanCount = 0;
-    }
-    _scanComplete = false;
-}
-
-int8_t ESP8266WiFiClass::scanNetworks(bool async, bool show_hidden)
-{
-    if(ESP8266WiFiClass::_scanStarted) {
-        return WIFI_SCAN_RUNNING;
-    }
-
-    ESP8266WiFiClass::_scanAsync = async;
-
-    if(_useApMode) {
-        // turn on AP+STA mode
-        _mode(WIFI_AP_STA);
-    } else {
-        // turn on STA mode
-        _mode(WIFI_STA);
-    }
-
-    int status = wifi_station_get_connect_status();
-    if (status != STATION_GOT_IP && status != STATION_IDLE)
-    {
-        disconnect();
-    }
-
-    scanDelete();
-
-    struct scan_config config;
-    config.ssid = 0;
-    config.bssid = 0;
-    config.channel = 0;
-    config.show_hidden = show_hidden;
-    if(wifi_station_scan(&config, reinterpret_cast<scan_done_cb_t>(&ESP8266WiFiClass::_scanDone))) {
-        ESP8266WiFiClass::_scanComplete = false;
-        ESP8266WiFiClass::_scanStarted = true;
-
-        if(ESP8266WiFiClass::_scanAsync) {
-            delay(0); // time for the OS to trigger the scan
-            return WIFI_SCAN_RUNNING;
-        }
-
-        esp_yield();
-        return ESP8266WiFiClass::_scanCount;
-    } else {
-        return WIFI_SCAN_FAILED;
-    }
-
-}
-
-void * ESP8266WiFiClass::_getScanInfoByIndex(int i)
-{
-    if (!ESP8266WiFiClass::_scanResult || (size_t)i > ESP8266WiFiClass::_scanCount)
-    {
-        return 0;
-    }
-
-    return reinterpret_cast<bss_info*>(ESP8266WiFiClass::_scanResult) + i;
-}
-
-String ESP8266WiFiClass::SSID(uint8_t i)
-{
-    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
-    if (!it)
-        return "";
-
-    return String(reinterpret_cast<const char*>(it->ssid));
-}
-
-uint8_t * ESP8266WiFiClass::BSSID(uint8_t i)
-{
-    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
-    if (!it)
-        return 0;
-
-    return it->bssid;
-}
-
-String ESP8266WiFiClass::BSSIDstr(uint8_t i)
-{
-    char mac[18] = {0};
-    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
-    if (!it)
-        return String("");
-
-    sprintf(mac,"%02X:%02X:%02X:%02X:%02X:%02X", it->bssid[0],  it->bssid[1],  it->bssid[2], it->bssid[3], it->bssid[4], it->bssid[5]);
-    return String(mac);
-}
-
-int32_t ESP8266WiFiClass::channel(uint8_t i)
-{
-    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
-    if (!it)
-        return 0;
-
-    return it->channel;
-}
-
-bool ESP8266WiFiClass::isHidden(uint8_t i)
-{
-    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
-    if (!it)
-        return false;
-
-    return (it->is_hidden != 0);
-}
-
-bool ESP8266WiFiClass::getNetworkInfo(uint8_t i, String &ssid, uint8_t &encType, int32_t &rssi, uint8_t* &bssid, int32_t &channel, bool &isHidden)
-{
-    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
-     if (!it)
-         return false;
-
-     ssid = (const char*)it->ssid;
-     encType = encryptionType(i);
-     rssi = it->rssi;
-     bssid = it->bssid; // move ptr
-     channel = it->channel;
-     isHidden = (it->is_hidden != 0);
-
-     return true;
-}
-
-int32_t ESP8266WiFiClass::RSSI(uint8_t i)
-{
-    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
-    if (!it)
-        return 0;
-
-    return it->rssi;
-}
-
-uint8_t ESP8266WiFiClass::encryptionType(uint8_t i)
-{
-    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
-    if (!it)
-        return -1;
-
-    int authmode = it->authmode;
-    if (authmode == AUTH_OPEN)
-        return ENC_TYPE_NONE;
-    if (authmode == AUTH_WEP)
-        return ENC_TYPE_WEP;
-    if (authmode == AUTH_WPA_PSK)
-        return ENC_TYPE_TKIP;
-    if (authmode == AUTH_WPA2_PSK)
-        return ENC_TYPE_CCMP;
-    if (authmode == AUTH_WPA_WPA2_PSK)
-        return ENC_TYPE_AUTO;
-    return -1;
-}
-
-wl_status_t ESP8266WiFiClass::status()
-{
-    int status = wifi_station_get_connect_status();
-
-    if (status == STATION_GOT_IP)
-      return WL_CONNECTED;
-    else if (status == STATION_NO_AP_FOUND)
-      return WL_NO_SSID_AVAIL;
-    else if (status == STATION_CONNECT_FAIL || status == STATION_WRONG_PASSWORD)
-      return WL_CONNECT_FAILED;
-    else if (status == STATION_IDLE)
-      return WL_IDLE_STATUS;
-    else
-      return WL_DISCONNECTED;
-}
-
-void wifi_dns_found_callback(const char *name, ip_addr_t *ipaddr, void *callback_arg)
-{
-    if (ipaddr)
-        (*reinterpret_cast<IPAddress*>(callback_arg)) = ipaddr->addr;
-    esp_schedule(); // resume the hostByName function
-}
-
-int ESP8266WiFiClass::hostByName(const char* aHostname, IPAddress& aResult)
-{
-    ip_addr_t addr;
-    aResult = static_cast<uint32_t>(0);
-    err_t err = dns_gethostbyname(aHostname, &addr, &wifi_dns_found_callback, &aResult);
-    if (err == ERR_OK)
-    {
-        aResult = addr.addr;
-    }
-    else if (err == ERR_INPROGRESS)
-    {
-        esp_yield();
-        // will return here when dns_found_callback fires
-    }
-
-    return (aResult != 0) ? 1 : 0;
-}
-
-String ESP8266WiFiClass::hostname(void) {
-    return String(wifi_station_get_hostname());
-}
-
-bool ESP8266WiFiClass::hostname(char* aHostname) {
-    if(strlen(aHostname) > 32) {
-        return false;
-    }
-    return wifi_station_set_hostname(aHostname);
-}
-
-bool ESP8266WiFiClass::hostname(const char* aHostname) {
-    return hostname((char*) aHostname);
-}
-
-bool ESP8266WiFiClass::hostname(String aHostname) {
-    return hostname((char*) aHostname.c_str());
-}
-
-//--------------------------------------------------------------
-
-void wifi_wps_status_cb(wps_cb_status status)
-{
-    DEBUGV("wps cb status: %d\r\n", status);
-    switch (status) {
-        case WPS_CB_ST_SUCCESS:
-            if(!wifi_wps_disable()) {
-                  DEBUGV("wps disable failed\n");
-            }
-            wifi_station_connect();
-            break;
-        case WPS_CB_ST_FAILED:
-            DEBUGV("wps FAILED\n");
-            break;
-        case WPS_CB_ST_TIMEOUT:
-            DEBUGV("wps TIMEOUT\n");
-            break;
-        case WPS_CB_ST_WEP:
-            DEBUGV("wps WEP\n");
-            break;
-    }
-    // todo user function to get status
-
-    esp_schedule(); // resume the beginWPSConfig function
-}
-
-bool ESP8266WiFiClass::beginWPSConfig(void) {
-
-    _useClientMode = true;
-
-     if(_useApMode) {
-         // turn on AP+STA mode
-         _mode(WIFI_AP_STA);
-     } else {
-         // turn on STA mode
-         _mode(WIFI_STA);
-     }
-
-    disconnect();
-
-    DEBUGV("wps begin\n");
-
-    if(!wifi_wps_disable()) {
-        DEBUGV("wps disable failed\n");
-        return false;
-    }
-
-    // so far only WPS_TYPE_PBC is supported (SDK 1.2.0)
-    if(!wifi_wps_enable(WPS_TYPE_PBC)) {
-        DEBUGV("wps enable failed\n");
-        return false;
-    }
-
-    if(!wifi_set_wps_cb((wps_st_cb_t) &wifi_wps_status_cb)) {
-        DEBUGV("wps cb failed\n");
-        return false;
-    }
-
-    if(!wifi_wps_start()) {
-        DEBUGV("wps start failed\n");
-        return false;
-    }
-
-    esp_yield();
-    // will return here when wifi_wps_status_cb fires
-
-    return true;
-}
-
-//--------------------------------------------------------------
-
-
-
-void ESP8266WiFiClass::beginSmartConfig()
-{
-    if (_smartConfigStarted)
-        return;
-
-    if(_useApMode) {
-        // turn on AP+STA mode
-        _mode(WIFI_AP_STA);
-    } else {
-        // turn on STA mode
-        _mode(WIFI_STA);
-    }
-
-    _smartConfigStarted = true;
-    _smartConfigDone = false;
-
-    //SC_TYPE_ESPTOUCH use ESPTOUCH for smartconfig, or use SC_TYPE_AIRKISS for AIRKISS
-    smartconfig_start(reinterpret_cast<sc_callback_t>(&ESP8266WiFiClass::_smartConfigCallback), 1);
-}
-
-void ESP8266WiFiClass::stopSmartConfig()
-{
-    if (!_smartConfigStarted)
-        return;
-
-    smartconfig_stop();
-    _smartConfigStarted = false;
-}
-
-bool ESP8266WiFiClass::smartConfigDone()
-{
-    if (!_smartConfigStarted)
-        return false;
-
-    return _smartConfigDone;
-}
-
-void ESP8266WiFiClass::_smartConfigCallback(uint32_t st, void* result)
-{
-    sc_status status = (sc_status) st;
-    if (status == SC_STATUS_LINK) {
-        station_config* sta_conf = reinterpret_cast<station_config*>(result);
-
-        wifi_station_set_config(sta_conf);
-        wifi_station_disconnect();
-        wifi_station_connect();
-
-        WiFi._smartConfigDone = true;
-    }
-    else if (status == SC_STATUS_LINK_OVER) {
-        WiFi.stopSmartConfig();
-    }
-}
-
-
-//--------------------------------------------------------------

 /**
- * set Sleep mode
- * @param type sleep_type_t
- * @return bool
+ * Output WiFi settings to an object derived from Print interface (like Serial).
+ * @param p Print interface
 */
-bool ESP8266WiFiClass::setSleepMode(WiFiSleepType_t type) {
-    return wifi_set_sleep_type((sleep_type_t)type);
-}
-
-/**
- * get Sleep mode
- * @return sleep_type_t
- */
-WiFiSleepType_t ESP8266WiFiClass::getSleepMode() {
-    return (WiFiSleepType_t)wifi_get_sleep_type();
-}
-
-/**
- * set phy Mode
- * @param mode phy_mode_t
- * @return bool
- */
-bool ESP8266WiFiClass::setPhyMode(WiFiPhyMode_t mode) {
-    return wifi_set_phy_mode((phy_mode_t)mode);
-}
-
-/**
- * get phy Mode
- * @return phy_mode_t
- */
-WiFiPhyMode_t ESP8266WiFiClass::getPhyMode() {
-    return (WiFiPhyMode_t)wifi_get_phy_mode();
-}
-
-//--------------------------------------------------------------
-
-void ESP8266WiFiClass::_eventCallback(void* arg)
-{
-    System_Event_t* event = reinterpret_cast<System_Event_t*>(arg);
-    DEBUGV("wifi evt: %d\r\n", event->event);
-
-    if (event->event == EVENT_STAMODE_DISCONNECTED) {
-        WiFiClient::stopAll();
-    }
-}
-
-void ESP8266WiFiClass::printDiag(Print& p)
-{
-    const char* modes[] = {"NULL", "STA", "AP", "STA+AP"};
+void ESP8266WiFiClass::printDiag(Print& p) {
+    const char* modes[] = { "NULL", "STA", "AP", "STA+AP" };
    p.print("Mode: ");
    p.println(modes[wifi_get_opmode()]);

-    const char* phymodes[] = {"", "B", "G", "N"};
+    const char* phymodes[] = { "", "B", "G", "N" };
    p.print("PHY mode: ");
    p.println(phymodes[(int) wifi_get_phy_mode()]);

@ -968,7 +69,7 @@ void ESP8266WiFiClass::printDiag(Print& p)
    p.print("Auto connect: ");
    p.println(wifi_station_get_auto_connect());

-    static struct station_config conf;
+    struct station_config conf;
    wifi_station_get_config(&conf);

    const char* ssid = reinterpret_cast<const char*>(conf.ssid);
@ -988,12 +89,4 @@ void ESP8266WiFiClass::printDiag(Print& p)

 }

-bool ESP8266WiFiClass::_scanAsync = false;
-bool ESP8266WiFiClass::_scanStarted = false;
-bool ESP8266WiFiClass::_scanComplete = false;
-
-size_t ESP8266WiFiClass::_scanCount = 0;
-void* ESP8266WiFiClass::_scanResult = 0;
-
-
 ESP8266WiFiClass WiFi;
--- a/libraries/ESP8266WiFi/src/ESP8266WiFi.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.h
@ -1,23 +1,23 @@
 /*
-  ESP8266WiFi.h - esp8266 Wifi support.
-  Based on WiFi.h from Ardiono WiFi shield library.
-  Copyright (c) 2011-2014 Arduino.  All right reserved.
-  Modified by Ivan Grokhotkov, December 2014
+ ESP8266WiFi.h - esp8266 Wifi support.
+ Based on WiFi.h from Ardiono WiFi shield library.
+ Copyright (c) 2011-2014 Arduino.  All right reserved.
+ Modified by Ivan Grokhotkov, December 2014

-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.

-  This library 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
-  Lesser General Public License for more details.
+ This library 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
+ Lesser General Public License for more details.

-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */

 #ifndef WiFi_h
 #define WiFi_h
@ -25,415 +25,50 @@
 #include <stdint.h>

 extern "C" {
-  #include "include/wl_definitions.h"
+#include "include/wl_definitions.h"
 }

 #include "IPAddress.h"
+
+#include "ESP8266WiFiType.h"
+#include "ESP8266WiFiSTA.h"
+#include "ESP8266WiFiAP.h"
+#include "ESP8266WiFiScan.h"
+#include "ESP8266WiFiGeneric.h"
+
 #include "WiFiClient.h"
 #include "WiFiServer.h"
 #include "WiFiClientSecure.h"

-#define WIFI_SCAN_RUNNING   (-1)
-#define WIFI_SCAN_FAILED     (-2)
+class ESP8266WiFiClass : public ESP8266WiFiGenericClass, public ESP8266WiFiSTAClass, public ESP8266WiFiScanClass, public ESP8266WiFiAPClass {
+    public:

+        // workaround same function name with different signature
+        using ESP8266WiFiGenericClass::channel;

-// Note:
-// this enums need to be in sync with the SDK!
+        using ESP8266WiFiSTAClass::SSID;
+        using ESP8266WiFiSTAClass::RSSI;
+        using ESP8266WiFiSTAClass::BSSID;
+        using ESP8266WiFiSTAClass::BSSIDstr;

-enum WiFiMode { WIFI_OFF = 0, WIFI_STA = 1, WIFI_AP = 2, WIFI_AP_STA = 3 };
+        using ESP8266WiFiScanClass::SSID;
+        using ESP8266WiFiScanClass::encryptionType;
+        using ESP8266WiFiScanClass::RSSI;
+        using ESP8266WiFiScanClass::BSSID;
+        using ESP8266WiFiScanClass::BSSIDstr;
+        using ESP8266WiFiScanClass::channel;
+        using ESP8266WiFiScanClass::isHidden;

-typedef enum {
-    WIFI_PHY_MODE_11B = 1, WIFI_PHY_MODE_11G = 2, WIFI_PHY_MODE_11N = 3
-} WiFiPhyMode_t;
+        // ----------------------------------------------------------------------------------------------
+        // ------------------------------------------- Debug --------------------------------------------
+        // ----------------------------------------------------------------------------------------------

-typedef enum {
-    WIFI_NONE_SLEEP = 0, WIFI_LIGHT_SLEEP = 2, WIFI_MODEM_SLEEP = 3
-} WiFiSleepType_t;
+    public:

+        void printDiag(Print& dest);

-class ESP8266WiFiClass
-{
-public:
-
-    ESP8266WiFiClass();
-
-    void persistent(bool persistent);
-
-    void mode(WiFiMode);
-    WiFiMode getMode();
-
-    /**
-     * Start Wifi connection
-     * if passphrase is set the most secure supported mode will be automatically selected
-     * @param ssid const char*          Pointer to the SSID string.
-     * @param passphrase const char *   Optional. Passphrase. Valid characters in a passphrase must be between ASCII 32-126 (decimal).
-     * @param bssid uint8_t[6]          Optional. BSSID / MAC of AP
-     * @param channel                   Optional. Channel of AP
-     * @return
-     */
-    int begin(const char* ssid, const char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL);
-    int begin(char* ssid, char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL);
-
-    // Use sdk config to connect.
-    int begin();
-
-
-   /* Wait for Wifi connection to reach a result
-    * returns the status reached or disconnect if STA is off
-    */
-    uint8_t waitForConnectResult();
-
-    /* Set up an open access point
-     *
-     * param ssid: Pointer to the SSID string.
-     */
-    void softAP(const char* ssid);
-
-
-    /* Set up a WPA2-secured access point
-     *
-     * param ssid: Pointer to the SSID string.
-     * param passphrase: Pointer to passphrase, 8 characters min.
-     * param channel: WiFi channel number, 1 - 13.
-     * param ssid_hidden: Network cloaking? 0 = broadcast SSID, 1 = hide SSID
-     */
-    void softAP(const char* ssid, const char* passphrase, int channel = 1, int ssid_hidden = 0);
-
-    /* Change Ip configuration settings disabling the dhcp client
-        *
-        * param local_ip: 	Static ip configuration
-        * param gateway: 	Static gateway configuration
-        * param subnet:		Static Subnet mask
-        */
-    void config(IPAddress local_ip, IPAddress gateway, IPAddress subnet);
-
-	/* Change Ip configuration settings disabling the dhcp client
-        *
-        * param local_ip: 	Static ip configuration
-        * param gateway: 	Static gateway configuration
-        * param subnet:		Static Subnet mask
-		* param dns: 		Defined DNS
-        */
-    void config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns);
-
-    /* Configure access point
-     *
-     * param local_ip: access point IP
-     * param gateway: gateway IP
-     * param subnet: subnet mask
-     */
-    void softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet);
-
-    /*
-      * Disconnect from the network (close AP)
-      *
-      * return: one value of wl_status_t enum
-      */
-    int softAPdisconnect(bool wifioff = false);
-
-    /*
-     * Disconnect from the network
-     *
-     * return: one value of wl_status_t enum
-     */
-    int disconnect(bool wifioff = false);
-
-    /*
-     * Get the station interface MAC address.
-     *
-     * return: pointer to uint8_t array with length WL_MAC_ADDR_LENGTH
-     * return: String
-     */
-    uint8_t* macAddress(uint8_t* mac);
-    String macAddress(void);
-
-    /*
-     * Get the softAP interface MAC address.
-     *
-     * return: pointer to uint8_t array with length WL_MAC_ADDR_LENGTH
-     * return: String
-     */
-    uint8_t* softAPmacAddress(uint8_t* mac);
-    String softAPmacAddress(void);
-
-    /*
-     * Get the station interface IP address.
-     *
-     * return: Ip address value
-     */
-    IPAddress localIP();
-
-    /*
-     * Get the softAP interface IP address.
-     *
-     * return: Ip address value
-     */
-    IPAddress softAPIP();
-
-    /*
-     * Get the interface subnet mask address.
-     *
-     * return: subnet mask address value
-     */
-    IPAddress subnetMask();
-
-    /*
-     * Get the gateway ip address.
-     *
-     * return: gateway ip address value
-     */
-   IPAddress gatewayIP();
-
-    /*
-     * Get the DNS ip address.
-     *
-     * return: DNS ip address value
-     */
-   IPAddress dnsIP(int dns_no = 0);
-
-    /*
-     * Return the current SSID associated with the network
-     *
-     * return: ssid string
-     */
-    String SSID() const;
-
-    /*
-     * Return the current pre shared key associated with the network
-     *
-     * return: psk string
-     */
-    String psk() const;
-
-    /*
-     * Return the current bssid / mac associated with the network if configured
-     *
-     * return: bssid uint8_t *
-     */
-    uint8_t *BSSID(void);
-
-    /*
-     * Return the current bssid / mac associated with the network if configured
-     *
-     * return: bssid string
-     */
-    String BSSIDstr(void);
-
-    /*
-     * Return the current channel associated with the network
-     *
-     * return: channel
-     */
-    int32_t channel(void);
-
-    /*
-     * Return the current network RSSI.
-     *
-     * return: RSSI value
-     */
-
-    int32_t RSSI();
-
-
-    /*
-     * called to get the scan state in Async mode
-     *
-     * return -1 if scan not fin
-     * return -2 if scan not triggered
-     */
-    int8_t scanComplete();
-
-    /*
-     * delete last scan result from RAM
-     */
-    void scanDelete();
-
-    /*
-     * Start scan WiFi networks available
-     *
-     * return: Number of discovered networks
-     */
-    int8_t scanNetworks(bool async = false, bool show_hidden = false);
-
-    /*
-     * Return the SSID discovered during the network scan.
-     *
-     * param networkItem: specify from which network item want to get the information
-	 *
-     * return: ssid string of the specified item on the networks scanned list
-     */
-    String SSID(uint8_t networkItem);
-
-    /*
-     * Return the encryption type of the networks discovered during the scanNetworks
-     *
-     * param networkItem: specify from which network item want to get the information
-	 *
-     * return: encryption type (enum wl_enc_type) of the specified item on the networks scanned list
-     */
-    uint8_t	encryptionType(uint8_t networkItem);
-
-    /*
-     * Return the RSSI of the networks discovered during the scanNetworks
-     *
-     * param networkItem: specify from which network item want to get the information
-	 *
-     * return: signed value of RSSI of the specified item on the networks scanned list
-     */
-    int32_t RSSI(uint8_t networkItem);
-
-
-    /**
-     * return MAC / BSSID of scanned wifi
-     * @param networkItem specify from which network item want to get the information
-     * @return uint8_t * MAC / BSSID of scanned wifi
-     */
-    uint8_t * BSSID(uint8_t networkItem);
-
-    /**
-     * return MAC / BSSID of scanned wifi
-     * @param networkItem specify from which network item want to get the information
-     * @return String MAC / BSSID of scanned wifi
-     */
-    String BSSIDstr(uint8_t networkItem);
-
-    /**
-     * return channel of scanned wifi
-     * @param networkItem specify from which network item want to get the information
-     * @return uint32_t channel of scanned wifi
-     */
-    int32_t channel(uint8_t networkItem);
-
-    /**
-     * return if the scanned wifi is Hidden (no SSID)
-     * @param networkItem specify from which network item want to get the information
-     * @return bool (true == hidden)
-     */
-    bool isHidden(uint8_t networkItem);
-
-    /**
-     * loads all infos from a scanned wifi in to the ptr parameters
-     * @param networkItem uint8_t
-     * @param ssid  const char**
-     * @param encryptionType uint8_t *
-     * @param RSSI int32_t *
-     * @param BSSID uint8_t **
-     * @param channel int32_t *
-     * @param isHidden bool *
-     * @return (true if ok)
-     */
-    bool getNetworkInfo(uint8_t networkItem, String &ssid, uint8_t &encryptionType, int32_t &RSSI, uint8_t* &BSSID, int32_t &channel, bool &isHidden);
-
-
-    /*
-     * Return Connection status.
-     *
-     * return: one of the value defined in wl_status_t
-     */
-    wl_status_t status();
-
-    /*
-     * Resolve the given hostname to an IP address.
-     * param aHostname: Name to be resolved
-     * param aResult: IPAddress structure to store the returned IP address
-     * result: 1 if aIPAddrString was successfully converted to an IP address,
-     *          else error code
-     */
-    int hostByName(const char* aHostname, IPAddress& aResult);
-
-    /*
-     * Get ESP8266 station DHCP hostname
-     */
-    String hostname(void);
-
-    /*
-     * Set ESP8266 station DHCP hostname
-     * hostname, max length:32
-     */
-    bool hostname(char* aHostname);
-    bool hostname(const char* aHostname);
-    bool hostname(String aHostname);
-
-
-    /**
-     * WPS config
-     * so far only WPS_TYPE_PBC is supported (SDK 1.2.0)
-     */
-    bool beginWPSConfig(void);
-
-    /*
-     * Output WiFi settings to an object derived from Print interface (like Serial).
-     *
-     */
-    void printDiag(Print& dest);
-
-    /*
-     * Start SmartConfig
-     *
-     */
-    void beginSmartConfig();
-
-    /*
-     * Query SmartConfig status, to decide when stop config
-     *
-     */
-    bool smartConfigDone();
-
-    /*
-     * Stop SmartConfig
-     *
-     */
-    void stopSmartConfig();
-
-    friend class WiFiClient;
-    friend class WiFiServer;
-
-    /**
-     * set Sleep mode
-     * @param type WiFiPhyMode_t
-     * @return bool
-     */
-    bool setSleepMode(WiFiSleepType_t type);
-
-    /**
-     * get Sleep mode
-     * @return sleep_type_t
-     */
-    WiFiSleepType_t getSleepMode();
-
-    /**
-     * set phy Mode
-     * @param mode phy_mode_t
-     * @return bool
-     */
-    bool setPhyMode(WiFiPhyMode_t mode);
-
-    /**
-     * get phy Mode
-     * @return phy_mode_t
-     */
-    WiFiPhyMode_t getPhyMode();
-
-protected:
-    void _mode(WiFiMode);
-    static void _scanDone(void* result, int status);
-    void * _getScanInfoByIndex(int i);
-    static void _smartConfigCallback(uint32_t status, void* result);
-    static void _eventCallback(void *event);
-    bool _smartConfigStarted;
-    bool _smartConfigDone;
-
-    bool _useApMode;
-    bool _useClientMode;
-	bool _useStaticIp;
-    bool _persistent;
-
-	static bool _scanAsync;
-	static bool _scanStarted;
-	static bool _scanComplete;
-
-    static size_t _scanCount;
-    static void* _scanResult;
+        friend class WiFiClient;
+        friend class WiFiServer;

 };

--- a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp
@ -0,0 +1,230 @@
+/*
+ ESP8266WiFiSTA.cpp - WiFi library for esp8266
+
+ Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+ This file is part of the esp8266 core for Arduino environment.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+ Reworked on 28 Dec 2015 by Markus Sattler
+
+ */
+
+#include "ESP8266WiFi.h"
+#include "ESP8266WiFiGeneric.h"
+#include "ESP8266WiFiAP.h"
+
+extern "C" {
+#include "c_types.h"
+#include "ets_sys.h"
+#include "os_type.h"
+#include "osapi.h"
+#include "mem.h"
+#include "user_interface.h"
+}
+
+#include "debug.h"
+
+
+
+// -----------------------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------- Private functions ------------------------------------------------
+// -----------------------------------------------------------------------------------------------------------------------
+
+static bool softap_config_equal(const softap_config& lhs, const softap_config& rhs);
+
+
+
+/**
+ * compare two AP configurations
+ * @param lhs softap_config
+ * @param rhs softap_config
+ * @return equal
+ */
+static bool softap_config_equal(const softap_config& lhs, const softap_config& rhs) {
+    if(strcmp(reinterpret_cast<const char*>(lhs.ssid), reinterpret_cast<const char*>(rhs.ssid)) != 0) {
+        return false;
+    }
+    if(strcmp(reinterpret_cast<const char*>(lhs.password), reinterpret_cast<const char*>(rhs.password)) != 0) {
+        return false;
+    }
+    if(lhs.channel != rhs.channel) {
+        return false;
+    }
+    if(lhs.ssid_hidden != rhs.ssid_hidden) {
+        return false;
+    }
+    return true;
+}
+
+// -----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------- AP function -----------------------------------------------------
+// -----------------------------------------------------------------------------------------------------------------------
+
+
+/**
+ * Set up an access point
+ * @param ssid          Pointer to the SSID (max 63 char).
+ * @param passphrase    (for WPA2 min 8 char, for open use NULL)
+ * @param channel       WiFi channel number, 1 - 13.
+ * @param ssid_hidden   Network cloaking (0 = broadcast SSID, 1 = hide SSID)
+ */
+bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* passphrase, int channel, int ssid_hidden) {
+
+    if(!WiFi.enableAP(true)) {
+        // enable AP failed
+        return false;
+    }
+
+    if(!ssid || *ssid == 0 || strlen(ssid) > 31) {
+        // fail SSID too long or missing!
+        return false;
+    }
+
+    if(passphrase && (strlen(passphrase) > 63 || strlen(passphrase) < 8)) {
+        // fail passphrase to long or short!
+        return false;
+    }
+
+    struct softap_config conf;
+    strcpy(reinterpret_cast<char*>(conf.ssid), ssid);
+    conf.channel = channel;
+    conf.ssid_len = strlen(ssid);
+    conf.ssid_hidden = ssid_hidden;
+    conf.max_connection = 4;
+    conf.beacon_interval = 100;
+
+    if(!passphrase || strlen(passphrase) == 0) {
+        conf.authmode = AUTH_OPEN;
+        *conf.password = 0;
+    } else {
+        conf.authmode = AUTH_WPA2_PSK;
+        strcpy(reinterpret_cast<char*>(conf.password), passphrase);
+    }
+
+    struct softap_config conf_current;
+    wifi_softap_get_config(&conf_current);
+    if(softap_config_equal(conf, conf_current)) {
+        DEBUGV("softap config unchanged");
+        return true;
+    }
+
+    bool ret;
+
+    ETS_UART_INTR_DISABLE();
+    if(WiFi._persistent) {
+        ret = wifi_softap_set_config(&conf);
+    } else {
+        ret = wifi_softap_set_config_current(&conf);
+    }
+    ETS_UART_INTR_ENABLE();
+
+    return ret;
+}
+
+
+/**
+ * Configure access point
+ * @param local_ip      access point IP
+ * @param gateway       gateway IP
+ * @param subnet        subnet mask
+ */
+bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet) {
+
+    if(!WiFi.enableAP(true)) {
+        // enable AP failed
+        return false;
+    }
+
+    struct ip_info info;
+    info.ip.addr = static_cast<uint32_t>(local_ip);
+    info.gw.addr = static_cast<uint32_t>(gateway);
+    info.netmask.addr = static_cast<uint32_t>(subnet);
+    wifi_softap_dhcps_stop();
+    if(wifi_set_ip_info(SOFTAP_IF, &info)) {
+        return wifi_softap_dhcps_start();
+    }
+    return false;
+}
+
+
+
+/**
+ * Disconnect from the network (close AP)
+ * @param wifioff disable mode?
+ * @return one value of wl_status_t enum
+ */
+bool ESP8266WiFiAPClass::softAPdisconnect(bool wifioff) {
+    bool ret;
+    struct softap_config conf;
+    *conf.ssid = 0;
+    *conf.password = 0;
+    ETS_UART_INTR_DISABLE();
+    if(WiFi._persistent) {
+        ret = wifi_softap_set_config(&conf);
+    } else {
+        ret = wifi_softap_set_config_current(&conf);
+    }
+    ETS_UART_INTR_ENABLE();
+
+    if(wifioff) {
+        ret = WiFi.enableAP(false);
+    }
+
+    return ret;
+}
+
+
+/**
+ * Get the count of the Station / client that are connected to the softAP interface
+ * @return Stations count
+ */
+uint8_t ESP8266WiFiAPClass::softAPgetStationNum() {
+    return wifi_softap_get_station_num();
+}
+
+/**
+ * Get the softAP interface IP address.
+ * @return IPAddress softAP IP
+ */
+IPAddress ESP8266WiFiAPClass::softAPIP() {
+    struct ip_info ip;
+    wifi_get_ip_info(SOFTAP_IF, &ip);
+    return IPAddress(ip.ip.addr);
+}
+
+
+/**
+ * Get the softAP interface MAC address.
+ * @param mac   pointer to uint8_t array with length WL_MAC_ADDR_LENGTH
+ * @return      pointer to uint8_t*
+ */
+uint8_t* ESP8266WiFiAPClass::softAPmacAddress(uint8_t* mac) {
+    wifi_get_macaddr(SOFTAP_IF, mac);
+    return mac;
+}
+
+/**
+ * Get the softAP interface MAC address.
+ * @return String mac
+ */
+String ESP8266WiFiAPClass::softAPmacAddress(void) {
+    uint8_t mac[6];
+    char macStr[18] = { 0 };
+    wifi_get_macaddr(SOFTAP_IF, mac);
+
+    sprintf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+    return String(macStr);
+}
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiAP.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiAP.h
@ -0,0 +1,54 @@
+/*
+ ESP8266WiFiAP.h - esp8266 Wifi support.
+ Based on WiFi.h from Ardiono WiFi shield library.
+ Copyright (c) 2011-2014 Arduino.  All right reserved.
+ Modified by Ivan Grokhotkov, December 2014
+ Reworked by Markus Sattler, December 2015
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ESP8266WIFIAP_H_
+#define ESP8266WIFIAP_H_
+
+
+#include "ESP8266WiFiType.h"
+#include "ESP8266WiFiGeneric.h"
+
+
+class ESP8266WiFiAPClass {
+
+        // ----------------------------------------------------------------------------------------------
+        // ----------------------------------------- AP function ----------------------------------------
+        // ----------------------------------------------------------------------------------------------
+
+    public:
+
+        bool softAP(const char* ssid, const char* passphrase = NULL, int channel = 1, int ssid_hidden = 0);
+        bool softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet);
+        bool softAPdisconnect(bool wifioff = false);
+
+        uint8_t softAPgetStationNum();
+
+        IPAddress softAPIP();
+
+        uint8_t* softAPmacAddress(uint8_t* mac);
+        String softAPmacAddress(void);
+
+    protected:
+
+};
+
+#endif /* ESP8266WIFIAP_H_*/
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp
@ -0,0 +1,343 @@
+/*
+ ESP8266WiFiGeneric.cpp - WiFi library for esp8266
+
+ Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+ This file is part of the esp8266 core for Arduino environment.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+ Reworked on 28 Dec 2015 by Markus Sattler
+
+ */
+
+#include "ESP8266WiFi.h"
+#include "ESP8266WiFiGeneric.h"
+
+extern "C" {
+#include "c_types.h"
+#include "ets_sys.h"
+#include "os_type.h"
+#include "osapi.h"
+#include "mem.h"
+#include "user_interface.h"
+
+#include "lwip/opt.h"
+#include "lwip/err.h"
+#include "lwip/dns.h"
+}
+
+#include "WiFiClient.h"
+#include "WiFiUdp.h"
+
+#include "debug.h"
+
+#undef min
+#undef max
+#include <vector>
+
+extern "C" void esp_schedule();
+extern "C" void esp_yield();
+
+// -----------------------------------------------------------------------------------------------------------------------
+// ------------------------------------------------- Generic WiFi function -----------------------------------------------
+// -----------------------------------------------------------------------------------------------------------------------
+
+// arduino dont like std::vectors move static here
+static std::vector<WiFiEventCbList_t> cbEventList;
+
+bool ESP8266WiFiGenericClass::_persistent = true;
+WiFiMode_t ESP8266WiFiGenericClass::_forceSleepLastMode = WIFI_OFF;
+
+ESP8266WiFiGenericClass::ESP8266WiFiGenericClass()  {
+    wifi_set_event_handler_cb((wifi_event_handler_cb_t) &ESP8266WiFiGenericClass::_eventCallback);
+}
+
+/**
+ * set callback function
+ * @param cbEvent WiFiEventCb
+ * @param event optional filter (WIFI_EVENT_MAX is all events)
+ */
+void ESP8266WiFiGenericClass::onEvent(WiFiEventCb cbEvent, WiFiEvent_t event) {
+    if(!cbEvent) {
+        return;
+    }
+    WiFiEventCbList_t newEventHandler;
+    newEventHandler.cb = cbEvent;
+    newEventHandler.event = event;
+    cbEventList.push_back(newEventHandler);
+}
+
+/**
+ * removes a callback form event handler
+ * @param cbEvent WiFiEventCb
+ * @param event optional filter (WIFI_EVENT_MAX is all events)
+ */
+void ESP8266WiFiGenericClass::removeEvent(WiFiEventCb cbEvent, WiFiEvent_t event) {
+    if(!cbEvent) {
+        return;
+    }
+
+    for(uint32_t i = 0; i < cbEventList.size(); i++) {
+        WiFiEventCbList_t entry = cbEventList[i];
+        if(entry.cb == cbEvent && entry.event == event) {
+            cbEventList.erase(cbEventList.begin() + i);
+        }
+    }
+}
+
+/**
+ * callback for WiFi events
+ * @param arg
+ */
+void ESP8266WiFiGenericClass::_eventCallback(void* arg) {
+    System_Event_t* event = reinterpret_cast<System_Event_t*>(arg);
+    DEBUGV("wifi evt: %d\n", event->event);
+
+    if(event->event == EVENT_STAMODE_DISCONNECTED) {
+        DEBUGV("STA disconnect: %d\n", event->event_info.disconnected.reason);
+        WiFiClient::stopAll();
+    }
+
+    for(uint32_t i = 0; i < cbEventList.size(); i++) {
+        WiFiEventCbList_t entry = cbEventList[i];
+        if(entry.cb) {
+            if(entry.event == (WiFiEvent_t) event->event || entry.event == WIFI_EVENT_MAX) {
+                entry.cb((WiFiEvent_t) event->event);
+            }
+        }
+    }
+}
+
+/**
+ * Return the current channel associated with the network
+ * @return channel (1-13)
+ */
+int32_t ESP8266WiFiGenericClass::channel(void) {
+    return wifi_get_channel();
+}
+
+/**
+ * set Sleep mode
+ * @param type sleep_type_t
+ * @return bool
+ */
+bool ESP8266WiFiGenericClass::setSleepMode(WiFiSleepType_t type) {
+    return wifi_set_sleep_type((sleep_type_t) type);
+}
+
+/**
+ * get Sleep mode
+ * @return sleep_type_t
+ */
+WiFiSleepType_t ESP8266WiFiGenericClass::getSleepMode() {
+    return (WiFiSleepType_t) wifi_get_sleep_type();
+}
+
+/**
+ * set phy Mode
+ * @param mode phy_mode_t
+ * @return bool
+ */
+bool ESP8266WiFiGenericClass::setPhyMode(WiFiPhyMode_t mode) {
+    return wifi_set_phy_mode((phy_mode_t) mode);
+}
+
+/**
+ * get phy Mode
+ * @return phy_mode_t
+ */
+WiFiPhyMode_t ESP8266WiFiGenericClass::getPhyMode() {
+    return (WiFiPhyMode_t) wifi_get_phy_mode();
+}
+
+/**
+ * set the output power of WiFi
+ * @param dBm max: +20.5dBm  min: 0dBm
+ */
+void ESP8266WiFiGenericClass::setOutputPower(float dBm) {
+
+    if(dBm > 20.5) {
+        dBm = 20.5;
+    } else if(dBm < 0) {
+        dBm = 0;
+    }
+
+    uint8_t val = (dBm*4.0f);
+    system_phy_set_max_tpw(val);
+}
+
+
+/**
+ * store WiFi config in SDK flash area
+ * @param persistent
+ */
+void ESP8266WiFiGenericClass::persistent(bool persistent) {
+    _persistent = persistent;
+}
+
+
+/**
+ * set new mode
+ * @param m WiFiMode_t
+ */
+bool ESP8266WiFiGenericClass::mode(WiFiMode_t m) {
+    if(wifi_get_opmode() == (uint8) m) {
+        return true;
+    }
+
+    bool ret = false;
+
+    ETS_UART_INTR_DISABLE();
+    if(_persistent) {
+        ret = wifi_set_opmode(m);
+    } else {
+        ret = wifi_set_opmode_current(m);
+    }
+    ETS_UART_INTR_ENABLE();
+
+    return ret;
+}
+
+/**
+ * get WiFi mode
+ * @return WiFiMode
+ */
+WiFiMode_t ESP8266WiFiGenericClass::getMode() {
+    return (WiFiMode_t) wifi_get_opmode();
+}
+
+/**
+ * control STA mode
+ * @param enable bool
+ * @return ok
+ */
+bool ESP8266WiFiGenericClass::enableSTA(bool enable) {
+
+    WiFiMode_t currentMode = getMode();
+    bool isEnabled = ((currentMode & WIFI_STA) != 0);
+
+    if(isEnabled != enable) {
+        if(enable) {
+            return mode((WiFiMode_t)(currentMode | WIFI_STA));
+        } else {
+            return mode((WiFiMode_t)(currentMode & (~WIFI_STA)));
+        }
+    } else {
+        return true;
+    }
+}
+
+/**
+ * control AP mode
+ * @param enable bool
+ * @return ok
+ */
+bool ESP8266WiFiGenericClass::enableAP(bool enable){
+
+    WiFiMode_t currentMode = getMode();
+    bool isEnabled = ((currentMode & WIFI_AP) != 0);
+
+    if(isEnabled != enable) {
+        if(enable) {
+            return mode((WiFiMode_t)(currentMode | WIFI_AP));
+        } else {
+            return mode((WiFiMode_t)(currentMode & (~WIFI_AP)));
+        }
+    } else {
+        return true;
+    }
+}
+
+
+/**
+ * Disable WiFi for x us when value is not 0
+ * @param sleep_time_in_us
+ * @return ok
+ */
+bool ESP8266WiFiGenericClass::forceSleepBegin(uint32 sleepUs) {
+    _forceSleepLastMode = getMode();
+    if(!mode(WIFI_OFF)) {
+        return false;
+    }
+
+    if(sleepUs == 0) {
+        sleepUs = 0xFFFFFFF;
+    }
+
+    wifi_fpm_set_sleep_type(MODEM_SLEEP_T);
+    wifi_fpm_open();
+    return (wifi_fpm_do_sleep(sleepUs) == 0);
+}
+
+/**
+ * wake up WiFi Modem
+ * @return ok
+ */
+bool ESP8266WiFiGenericClass::forceSleepWake() {
+    wifi_fpm_do_wakeup();
+    wifi_fpm_close();
+
+    // restore last mode
+    if(mode(_forceSleepLastMode)) {
+        if((_forceSleepLastMode & WIFI_STA) != 0){
+            wifi_station_connect();
+        }
+        return true;
+    }
+    return false;
+}
+
+
+// -----------------------------------------------------------------------------------------------------------------------
+// ------------------------------------------------ Generic Network function ---------------------------------------------
+// -----------------------------------------------------------------------------------------------------------------------
+
+void wifi_dns_found_callback(const char *name, ip_addr_t *ipaddr, void *callback_arg);
+
+/**
+ * Resolve the given hostname to an IP address.
+ * @param aHostname     Name to be resolved
+ * @param aResult       IPAddress structure to store the returned IP address
+ * @return 1 if aIPAddrString was successfully converted to an IP address,
+ *          else error code
+ */
+int ESP8266WiFiGenericClass::hostByName(const char* aHostname, IPAddress& aResult) {
+    ip_addr_t addr;
+    aResult = static_cast<uint32_t>(0);
+    err_t err = dns_gethostbyname(aHostname, &addr, &wifi_dns_found_callback, &aResult);
+    if(err == ERR_OK) {
+        aResult = addr.addr;
+    } else if(err == ERR_INPROGRESS) {
+        esp_yield();
+        // will return here when dns_found_callback fires
+    }
+
+    return (aResult != 0) ? 1 : 0;
+}
+
+/**
+ * DNS callback
+ * @param name
+ * @param ipaddr
+ * @param callback_arg
+ */
+void wifi_dns_found_callback(const char *name, ip_addr_t *ipaddr, void *callback_arg) {
+    if(ipaddr) {
+        (*reinterpret_cast<IPAddress*>(callback_arg)) = ipaddr->addr;
+    }
+    esp_schedule(); // resume the hostByName function
+}
+
+
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.h
@ -0,0 +1,89 @@
+/*
+ ESP8266WiFiGeneric.h - esp8266 Wifi support.
+ Based on WiFi.h from Ardiono WiFi shield library.
+ Copyright (c) 2011-2014 Arduino.  All right reserved.
+ Modified by Ivan Grokhotkov, December 2014
+ Reworked by Markus Sattler, December 2015
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ESP8266WIFIGENERIC_H_
+#define ESP8266WIFIGENERIC_H_
+
+#include "ESP8266WiFiType.h"
+
+typedef void (*WiFiEventCb)(WiFiEvent_t event);
+
+typedef struct {
+        WiFiEventCb cb;
+        WiFiEvent_t event;
+} WiFiEventCbList_t;
+
+class ESP8266WiFiGenericClass {
+        // ----------------------------------------------------------------------------------------------
+        // -------------------------------------- Generic WiFi function ---------------------------------
+        // ----------------------------------------------------------------------------------------------
+
+    public:
+
+        ESP8266WiFiGenericClass();
+
+        void onEvent(WiFiEventCb cbEvent, WiFiEvent_t event = WIFI_EVENT_MAX);
+        void removeEvent(WiFiEventCb cbEvent, WiFiEvent_t event = WIFI_EVENT_MAX);
+
+        int32_t channel(void);
+
+        bool setSleepMode(WiFiSleepType_t type);
+        WiFiSleepType_t getSleepMode();
+
+        bool setPhyMode(WiFiPhyMode_t mode);
+        WiFiPhyMode_t getPhyMode();
+
+        void setOutputPower(float dBm);
+
+        void persistent(bool persistent);
+
+        bool mode(WiFiMode_t);
+        WiFiMode_t getMode();
+
+        bool enableSTA(bool enable);
+        bool enableAP(bool enable);
+
+        bool forceSleepBegin(uint32 sleepUs = 0);
+        bool forceSleepWake();
+
+    protected:
+        static bool _persistent;
+        static WiFiMode_t _forceSleepLastMode;
+
+        static void _eventCallback(void *event);
+
+        // ----------------------------------------------------------------------------------------------
+        // ------------------------------------ Generic Network function --------------------------------
+        // ----------------------------------------------------------------------------------------------
+
+    public:
+
+        int hostByName(const char* aHostname, IPAddress& aResult);
+
+    protected:
+
+        friend class ESP8266WiFiSTAClass;
+        friend class ESP8266WiFiScanClass;
+        friend class ESP8266WiFiAPClass;
+};
+
+#endif /* ESP8266WIFIGENERIC_H_ */
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
@ -32,7 +32,11 @@
 #undef max
 #include <vector>

-//#define DEBUG_WIFI_MULTI(...) Serial1.printf( __VA_ARGS__ )
+#ifdef DEBUG_ESP_WIFI
+#ifdef DEBUG_ESP_PORT
+#define DEBUG_WIFI_MULTI(...) DEBUG_ESP_PORT.printf( __VA_ARGS__ )
+#endif
+#endif

 #ifndef DEBUG_WIFI_MULTI
 #define DEBUG_WIFI_MULTI(...)
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
@ -0,0 +1,657 @@
+/*
+ ESP8266WiFiSTA.cpp - WiFi library for esp8266
+
+ Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+ This file is part of the esp8266 core for Arduino environment.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+ Reworked on 28 Dec 2015 by Markus Sattler
+
+ */
+
+#include "ESP8266WiFi.h"
+#include "ESP8266WiFiGeneric.h"
+#include "ESP8266WiFiSTA.h"
+
+extern "C" {
+#include "c_types.h"
+#include "ets_sys.h"
+#include "os_type.h"
+#include "osapi.h"
+#include "mem.h"
+#include "user_interface.h"
+#include "smartconfig.h"
+#include "lwip/err.h"
+#include "lwip/dns.h"
+}
+
+#include "debug.h"
+
+extern "C" void esp_schedule();
+extern "C" void esp_yield();
+
+// -----------------------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------- Private functions ------------------------------------------------
+// -----------------------------------------------------------------------------------------------------------------------
+
+static bool sta_config_equal(const station_config& lhs, const station_config& rhs);
+
+
+/**
+ * compare two STA configurations
+ * @param lhs station_config
+ * @param rhs station_config
+ * @return equal
+ */
+static bool sta_config_equal(const station_config& lhs, const station_config& rhs) {
+    if(strcmp(reinterpret_cast<const char*>(lhs.ssid), reinterpret_cast<const char*>(rhs.ssid)) != 0) {
+        return false;
+    }
+
+    if(strcmp(reinterpret_cast<const char*>(lhs.password), reinterpret_cast<const char*>(rhs.password)) != 0) {
+        return false;
+    }
+
+    if(lhs.bssid_set != rhs.bssid_set) {
+        return false;
+    }
+
+    if(lhs.bssid_set) {
+        if(memcmp(lhs.bssid, rhs.bssid, 6) != 0) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+// -----------------------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------- STA function -----------------------------------------------------
+// -----------------------------------------------------------------------------------------------------------------------
+
+bool ESP8266WiFiSTAClass::_useStaticIp = false;
+
+/**
+ * Start Wifi connection
+ * if passphrase is set the most secure supported mode will be automatically selected
+ * @param ssid const char*          Pointer to the SSID string.
+ * @param passphrase const char *   Optional. Passphrase. Valid characters in a passphrase must be between ASCII 32-126 (decimal).
+ * @param bssid uint8_t[6]          Optional. BSSID / MAC of AP
+ * @param channel                   Optional. Channel of AP
+ * @param connect                   Optional. call connect
+ * @return
+ */
+wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_t channel, const uint8_t* bssid, bool connect) {
+
+    if(!WiFi.enableSTA(true)) {
+        // enable STA failed
+        return WL_CONNECT_FAILED;
+    }
+
+    if(!ssid || *ssid == 0x00 || strlen(ssid) > 31) {
+        // fail SSID too long or missing!
+        return WL_CONNECT_FAILED;
+    }
+
+    if(passphrase && strlen(passphrase) > 63) {
+        // fail passphrase too long!
+        return WL_CONNECT_FAILED;
+    }
+
+    struct station_config conf;
+    strcpy(reinterpret_cast<char*>(conf.ssid), ssid);
+
+    if(passphrase) {
+        strcpy(reinterpret_cast<char*>(conf.password), passphrase);
+    } else {
+        *conf.password = 0;
+    }
+
+    if(bssid) {
+        conf.bssid_set = 1;
+        memcpy((void *) &conf.bssid[0], (void *) bssid, 6);
+    } else {
+        conf.bssid_set = 0;
+    }
+
+    struct station_config current_conf;
+    wifi_station_get_config(&current_conf);
+    if(sta_config_equal(current_conf, conf)) {
+        DEBUGV("sta config unchanged");
+        return status();
+    }
+
+    ETS_UART_INTR_DISABLE();
+
+    if(WiFi._persistent) {
+        wifi_station_set_config(&conf);
+    } else {
+        wifi_station_set_config_current(&conf);
+    }
+
+    if(connect) {
+        wifi_station_connect();
+    }
+
+    ETS_UART_INTR_ENABLE();
+
+    if(channel > 0 && channel <= 13) {
+        wifi_set_channel(channel);
+    }
+
+    if(!_useStaticIp) {
+        wifi_station_dhcpc_start();
+    }
+
+    return status();
+}
+
+wl_status_t ESP8266WiFiSTAClass::begin(char* ssid, char *passphrase, int32_t channel, const uint8_t* bssid, bool connect) {
+    return begin((const char*) ssid, (const char*) passphrase, channel, bssid, connect);
+}
+
+/**
+ * Use to connect to SDK config.
+ * @return wl_status_t
+ */
+wl_status_t ESP8266WiFiSTAClass::begin() {
+
+    if(!WiFi.enableSTA(true)) {
+        // enable STA failed
+        return WL_CONNECT_FAILED;
+    }
+
+    ETS_UART_INTR_DISABLE();
+    wifi_station_connect();
+    ETS_UART_INTR_ENABLE();
+
+    if(!_useStaticIp) {
+        wifi_station_dhcpc_start();
+    }
+    return status();
+}
+
+
+/**
+ * Change IP configuration settings disabling the dhcp client
+ * @param local_ip   Static ip configuration
+ * @param gateway    Static gateway configuration
+ * @param subnet     Static Subnet mask
+ * @param dns1       Static DNS server 1
+ * @param dns2       Static DNS server 2
+ */
+bool ESP8266WiFiSTAClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1, IPAddress dns2) {
+
+    if(!WiFi.enableSTA(true)) {
+        return false;
+    }
+
+    struct ip_info info;
+    info.ip.addr = static_cast<uint32_t>(local_ip);
+    info.gw.addr = static_cast<uint32_t>(gateway);
+    info.netmask.addr = static_cast<uint32_t>(subnet);
+
+    wifi_station_dhcpc_stop();
+    if(wifi_set_ip_info(STATION_IF, &info)) {
+        _useStaticIp = true;
+    } else {
+        return false;
+    }
+    ip_addr_t d;
+
+    if(dns1 != (uint32_t)0x00000000) {
+        // Set DNS1-Server
+        d.addr = static_cast<uint32_t>(dns1);
+        dns_setserver(0, &d);
+    }
+
+    if(dns2 != (uint32_t)0x00000000) {
+        // Set DNS2-Server
+        d.addr = static_cast<uint32_t>(dns2);
+        dns_setserver(1, &d);
+    }
+
+    return true;
+}
+
+/**
+ * will force a disconnect an then start reconnecting to AP
+ * @return ok
+ */
+bool ESP8266WiFiSTAClass::reconnect() {
+    if((WiFi.getMode() & WIFI_STA) != 0) {
+        if(wifi_station_disconnect()) {
+            return wifi_station_connect();
+        }
+    }
+    return false;
+}
+
+/**
+ * Disconnect from the network
+ * @param wifioff
+ * @return  one value of wl_status_t enum
+ */
+bool ESP8266WiFiSTAClass::disconnect(bool wifioff) {
+    bool ret;
+    struct station_config conf;
+    *conf.ssid = 0;
+    *conf.password = 0;
+
+    ETS_UART_INTR_DISABLE();
+    if(WiFi._persistent) {
+        wifi_station_set_config(&conf);
+    } else {
+        wifi_station_set_config_current(&conf);
+    }
+    ret = wifi_station_disconnect();
+    ETS_UART_INTR_ENABLE();
+
+    if(wifioff) {
+        WiFi.enableSTA(false);
+    }
+
+    return ret;
+}
+
+/**
+ * is STA interface connected?
+ * @return true if STA is connected to an AD
+ */
+bool ESP8266WiFiSTAClass::isConnected() {
+    return (status() == WL_CONNECTED);
+}
+
+
+/**
+ * Setting the ESP8266 station to connect to the AP (which is recorded)
+ * automatically or not when powered on. Enable auto-connect by default.
+ * @param autoConnect bool
+ * @return if saved
+ */
+bool ESP8266WiFiSTAClass::setAutoConnect(bool autoConnect) {
+    bool ret;
+    ETS_UART_INTR_DISABLE();
+    ret = wifi_station_set_auto_connect(autoConnect);
+    ETS_UART_INTR_ENABLE();
+    return ret;
+}
+
+/**
+ * Checks if ESP8266 station mode will connect to AP
+ * automatically or not when it is powered on.
+ * @return auto connect
+ */
+bool ESP8266WiFiSTAClass::getAutoConnect() {
+    return (wifi_station_get_auto_connect() != 0);
+}
+
+/**
+ * Set whether reconnect or not when the ESP8266 station is disconnected from AP.
+ * @param autoReconnect
+ * @return
+ */
+bool ESP8266WiFiSTAClass::setAutoReconnect(bool autoReconnect) {
+    return wifi_station_set_reconnect_policy(autoReconnect);
+}
+
+/**
+ * Wait for WiFi connection to reach a result
+ * returns the status reached or disconnect if STA is off
+ * @return wl_status_t
+ */
+uint8_t ESP8266WiFiSTAClass::waitForConnectResult() {
+    //1 and 3 have STA enabled
+    if((wifi_get_opmode() & 1) == 0) {
+        return WL_DISCONNECTED;
+    }
+    while(status() == WL_DISCONNECTED) {
+        delay(100);
+    }
+    return status();
+}
+
+/**
+ * Get the station interface IP address.
+ * @return IPAddress station IP
+ */
+IPAddress ESP8266WiFiSTAClass::localIP() {
+    struct ip_info ip;
+    wifi_get_ip_info(STATION_IF, &ip);
+    return IPAddress(ip.ip.addr);
+}
+
+
+/**
+ * Get the station interface MAC address.
+ * @param mac   pointer to uint8_t array with length WL_MAC_ADDR_LENGTH
+ * @return      pointer to uint8_t *
+ */
+uint8_t* ESP8266WiFiSTAClass::macAddress(uint8_t* mac) {
+    wifi_get_macaddr(STATION_IF, mac);
+    return mac;
+}
+
+/**
+ * Get the station interface MAC address.
+ * @return String mac
+ */
+String ESP8266WiFiSTAClass::macAddress(void) {
+    uint8_t mac[6];
+    char macStr[18] = { 0 };
+    wifi_get_macaddr(STATION_IF, mac);
+
+    sprintf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+    return String(macStr);
+}
+
+/**
+ * Get the interface subnet mask address.
+ * @return IPAddress subnetMask
+ */
+IPAddress ESP8266WiFiSTAClass::subnetMask() {
+    struct ip_info ip;
+    wifi_get_ip_info(STATION_IF, &ip);
+    return IPAddress(ip.netmask.addr);
+}
+
+/**
+ * Get the gateway ip address.
+ * @return IPAddress gatewayIP
+ */
+IPAddress ESP8266WiFiSTAClass::gatewayIP() {
+    struct ip_info ip;
+    wifi_get_ip_info(STATION_IF, &ip);
+    return IPAddress(ip.gw.addr);
+}
+
+/**
+ * Get the DNS ip address.
+ * @param dns_no
+ * @return IPAddress DNS Server IP
+ */
+IPAddress ESP8266WiFiSTAClass::dnsIP(uint8_t dns_no) {
+    ip_addr_t dns_ip = dns_getserver(dns_no);
+    return IPAddress(dns_ip.addr);
+}
+
+
+/**
+ * Get ESP8266 station DHCP hostname
+ * @return hostname
+ */
+String ESP8266WiFiSTAClass::hostname(void) {
+    return String(wifi_station_get_hostname());
+}
+
+
+/**
+ * Set ESP8266 station DHCP hostname
+ * @param aHostname max length:32
+ * @return ok
+ */
+bool ESP8266WiFiSTAClass::hostname(char* aHostname) {
+    if(strlen(aHostname) > 32) {
+        return false;
+    }
+    return wifi_station_set_hostname(aHostname);
+}
+
+/**
+ * Set ESP8266 station DHCP hostname
+ * @param aHostname max length:32
+ * @return ok
+ */
+bool ESP8266WiFiSTAClass::hostname(const char* aHostname) {
+    return hostname((char*) aHostname);
+}
+
+/**
+ * Set ESP8266 station DHCP hostname
+ * @param aHostname max length:32
+ * @return ok
+ */
+bool ESP8266WiFiSTAClass::hostname(String aHostname) {
+    return hostname((char*) aHostname.c_str());
+}
+
+/**
+ * Return Connection status.
+ * @return one of the value defined in wl_status_t
+ *
+ */
+wl_status_t ESP8266WiFiSTAClass::status() {
+    station_status_t status = wifi_station_get_connect_status();
+
+    switch(status) {
+        case STATION_GOT_IP:
+            return WL_CONNECTED;
+        case STATION_NO_AP_FOUND:
+            return WL_NO_SSID_AVAIL;
+        case STATION_CONNECT_FAIL:
+        case STATION_WRONG_PASSWORD:
+            return WL_CONNECT_FAILED;
+        case STATION_IDLE:
+            return WL_IDLE_STATUS;
+        default:
+            return WL_DISCONNECTED;
+    }
+}
+
+/**
+ * Return the current SSID associated with the network
+ * @return SSID
+ */
+String ESP8266WiFiSTAClass::SSID() const {
+    struct station_config conf;
+    wifi_station_get_config(&conf);
+    return String(reinterpret_cast<char*>(conf.ssid));
+}
+
+/**
+ * Return the current pre shared key associated with the network
+ * @return  psk string
+ */
+String ESP8266WiFiSTAClass::psk() const {
+    struct station_config conf;
+    wifi_station_get_config(&conf);
+    return String(reinterpret_cast<char*>(conf.password));
+}
+
+/**
+ * Return the current bssid / mac associated with the network if configured
+ * @return bssid uint8_t *
+ */
+uint8_t* ESP8266WiFiSTAClass::BSSID(void) {
+    static struct station_config conf;
+    wifi_station_get_config(&conf);
+    return reinterpret_cast<uint8_t*>(conf.bssid);
+}
+
+/**
+ * Return the current bssid / mac associated with the network if configured
+ * @return String bssid mac
+ */
+String ESP8266WiFiSTAClass::BSSIDstr(void) {
+    struct station_config conf;
+    char mac[18] = { 0 };
+    wifi_station_get_config(&conf);
+    sprintf(mac, "%02X:%02X:%02X:%02X:%02X:%02X", conf.bssid[0], conf.bssid[1], conf.bssid[2], conf.bssid[3], conf.bssid[4], conf.bssid[5]);
+    return String(mac);
+}
+
+/**
+ * Return the current network RSSI.
+ * @return  RSSI value
+ */
+int32_t ESP8266WiFiSTAClass::RSSI(void) {
+    return wifi_station_get_rssi();
+}
+
+
+
+// -----------------------------------------------------------------------------------------------------------------------
+// -------------------------------------------------- STA remote configure -----------------------------------------------
+// -----------------------------------------------------------------------------------------------------------------------
+
+void wifi_wps_status_cb(wps_cb_status status);
+
+/**
+ * WPS config
+ * so far only WPS_TYPE_PBC is supported (SDK 1.2.0)
+ * @return ok
+ */
+bool ESP8266WiFiSTAClass::beginWPSConfig(void) {
+
+    if(!WiFi.enableSTA(true)) {
+        // enable STA failed
+        return false;
+    }
+
+    disconnect();
+
+    DEBUGV("wps begin\n");
+
+    if(!wifi_wps_disable()) {
+        DEBUGV("wps disable failed\n");
+        return false;
+    }
+
+    // so far only WPS_TYPE_PBC is supported (SDK 1.2.0)
+    if(!wifi_wps_enable(WPS_TYPE_PBC)) {
+        DEBUGV("wps enable failed\n");
+        return false;
+    }
+
+    if(!wifi_set_wps_cb((wps_st_cb_t) &wifi_wps_status_cb)) {
+        DEBUGV("wps cb failed\n");
+        return false;
+    }
+
+    if(!wifi_wps_start()) {
+        DEBUGV("wps start failed\n");
+        return false;
+    }
+
+    esp_yield();
+    // will return here when wifi_wps_status_cb fires
+
+    return true;
+}
+
+/**
+ * WPS callback
+ * @param status wps_cb_status
+ */
+void wifi_wps_status_cb(wps_cb_status status) {
+    DEBUGV("wps cb status: %d\r\n", status);
+    switch(status) {
+        case WPS_CB_ST_SUCCESS:
+            if(!wifi_wps_disable()) {
+                DEBUGV("wps disable failed\n");
+            }
+            wifi_station_connect();
+            break;
+        case WPS_CB_ST_FAILED:
+            DEBUGV("wps FAILED\n");
+            break;
+        case WPS_CB_ST_TIMEOUT:
+            DEBUGV("wps TIMEOUT\n");
+            break;
+        case WPS_CB_ST_WEP:
+            DEBUGV("wps WEP\n");
+            break;
+    }
+    // TODO user function to get status
+
+    esp_schedule(); // resume the beginWPSConfig function
+}
+
+
+
+bool ESP8266WiFiSTAClass::_smartConfigStarted = false;
+bool ESP8266WiFiSTAClass::_smartConfigDone = false;
+
+/**
+ * Start SmartConfig
+ */
+bool ESP8266WiFiSTAClass::beginSmartConfig() {
+    if(_smartConfigStarted) {
+        return false;
+    }
+
+    if(!WiFi.enableSTA(true)) {
+        // enable STA failed
+        return false;
+    }
+
+    if(smartconfig_start(reinterpret_cast<sc_callback_t>(&ESP8266WiFiSTAClass::_smartConfigCallback), 1)) {
+        _smartConfigStarted = true;
+        _smartConfigDone = false;
+        return true;
+    }
+    return false;
+}
+
+
+/**
+ *  Stop SmartConfig
+ */
+bool ESP8266WiFiSTAClass::stopSmartConfig() {
+    if(!_smartConfigStarted) {
+        return true;
+    }
+
+    if(smartconfig_stop()) {
+        _smartConfigStarted = false;
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Query SmartConfig status, to decide when stop config
+ * @return smartConfig Done
+ */
+bool ESP8266WiFiSTAClass::smartConfigDone() {
+    if(!_smartConfigStarted) {
+        return false;
+    }
+
+    return _smartConfigDone;
+}
+
+
+/**
+ * _smartConfigCallback
+ * @param st
+ * @param result
+ */
+void ESP8266WiFiSTAClass::_smartConfigCallback(uint32_t st, void* result) {
+    sc_status status = (sc_status) st;
+    if(status == SC_STATUS_LINK) {
+        station_config* sta_conf = reinterpret_cast<station_config*>(result);
+
+        wifi_station_set_config(sta_conf);
+        wifi_station_disconnect();
+        wifi_station_connect();
+
+        _smartConfigDone = true;
+    } else if(status == SC_STATUS_LINK_OVER) {
+        WiFi.stopSmartConfig();
+    }
+}
+
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h
@ -0,0 +1,107 @@
+/*
+ ESP8266WiFiSTA.h - esp8266 Wifi support.
+ Based on WiFi.h from Ardiono WiFi shield library.
+ Copyright (c) 2011-2014 Arduino.  All right reserved.
+ Modified by Ivan Grokhotkov, December 2014
+ Reworked by Markus Sattler, December 2015
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ESP8266WIFISTA_H_
+#define ESP8266WIFISTA_H_
+
+
+#include "ESP8266WiFiType.h"
+#include "ESP8266WiFiGeneric.h"
+
+
+class ESP8266WiFiSTAClass {
+        // ----------------------------------------------------------------------------------------------
+        // ---------------------------------------- STA function ----------------------------------------
+        // ----------------------------------------------------------------------------------------------
+
+    public:
+
+        wl_status_t begin(const char* ssid, const char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL, bool connect = true);
+        wl_status_t begin(char* ssid, char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL, bool connect = true);
+        wl_status_t begin();
+
+        bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = (uint32_t)0x00000000, IPAddress dns2 = (uint32_t)0x00000000);
+
+        bool reconnect();
+        bool disconnect(bool wifioff = false);
+
+        bool isConnected();
+
+        bool setAutoConnect(bool autoConnect);
+        bool getAutoConnect();
+
+        bool setAutoReconnect(bool autoReconnect);
+
+        uint8_t waitForConnectResult();
+
+        // STA network info
+        IPAddress localIP();
+
+        uint8_t * macAddress(uint8_t* mac);
+        String macAddress();
+
+        IPAddress subnetMask();
+        IPAddress gatewayIP();
+        IPAddress dnsIP(uint8_t dns_no = 0);
+
+        String hostname();
+        bool hostname(char* aHostname);
+        bool hostname(const char* aHostname);
+        bool hostname(String aHostname);
+
+        // STA WiFi info
+        wl_status_t status();
+        String SSID() const;
+        String psk() const;
+
+        uint8_t * BSSID();
+        String BSSIDstr();
+
+        int32_t RSSI();
+
+    protected:
+
+      static bool _useStaticIp;
+
+    // ----------------------------------------------------------------------------------------------
+    // ------------------------------------ STA remote configure  -----------------------------------
+    // ----------------------------------------------------------------------------------------------
+
+    public:
+
+        bool beginWPSConfig(void);
+
+        bool beginSmartConfig();
+        bool stopSmartConfig();
+        bool smartConfigDone();
+
+    protected:
+
+        static bool _smartConfigStarted;
+        static bool _smartConfigDone;
+
+        static void _smartConfigCallback(uint32_t status, void* result);
+
+};
+
+
+#endif /* ESP8266WIFISTA_H_ */
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiScan.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiScan.cpp
@ -0,0 +1,322 @@
+/*
+ ESP8266WiFiScan.cpp - WiFi library for esp8266
+
+ Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
+ This file is part of the esp8266 core for Arduino environment.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+ Reworked on 28 Dec 2015 by Markus Sattler
+
+ */
+
+#include "ESP8266WiFi.h"
+#include "ESP8266WiFiGeneric.h"
+#include "ESP8266WiFiScan.h"
+
+extern "C" {
+#include "c_types.h"
+#include "ets_sys.h"
+#include "os_type.h"
+#include "osapi.h"
+#include "mem.h"
+#include "user_interface.h"
+}
+
+#include "debug.h"
+
+extern "C" void esp_schedule();
+extern "C" void esp_yield();
+
+// -----------------------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------- Private functions ------------------------------------------------
+// -----------------------------------------------------------------------------------------------------------------------
+
+
+
+
+// -----------------------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------- scan function ---------------------------------------------------
+// -----------------------------------------------------------------------------------------------------------------------
+
+bool ESP8266WiFiScanClass::_scanAsync = false;
+bool ESP8266WiFiScanClass::_scanStarted = false;
+bool ESP8266WiFiScanClass::_scanComplete = false;
+
+size_t ESP8266WiFiScanClass::_scanCount = 0;
+void* ESP8266WiFiScanClass::_scanResult = 0;
+
+/**
+ * Start scan WiFi networks available
+ * @param async         run in async mode
+ * @param show_hidden   show hidden networks
+ * @return Number of discovered networks
+ */
+int8_t ESP8266WiFiScanClass::scanNetworks(bool async, bool show_hidden) {
+    if(ESP8266WiFiScanClass::_scanStarted) {
+        return WIFI_SCAN_RUNNING;
+    }
+
+    ESP8266WiFiScanClass::_scanAsync = async;
+
+    WiFi.enableSTA(true);
+
+    int status = wifi_station_get_connect_status();
+    if(status != STATION_GOT_IP && status != STATION_IDLE) {
+        WiFi.disconnect(false);
+    }
+
+    scanDelete();
+
+    struct scan_config config;
+    config.ssid = 0;
+    config.bssid = 0;
+    config.channel = 0;
+    config.show_hidden = show_hidden;
+    if(wifi_station_scan(&config, reinterpret_cast<scan_done_cb_t>(&ESP8266WiFiScanClass::_scanDone))) {
+        ESP8266WiFiScanClass::_scanComplete = false;
+        ESP8266WiFiScanClass::_scanStarted = true;
+
+        if(ESP8266WiFiScanClass::_scanAsync) {
+            delay(0); // time for the OS to trigger the scan
+            return WIFI_SCAN_RUNNING;
+        }
+
+        esp_yield();
+        return ESP8266WiFiScanClass::_scanCount;
+    } else {
+        return WIFI_SCAN_FAILED;
+    }
+
+}
+
+
+/**
+ * called to get the scan state in Async mode
+ * @return scan result or status
+ *          -1 if scan not fin
+ *          -2 if scan not triggered
+ */
+int8_t ESP8266WiFiScanClass::scanComplete() {
+
+    if(_scanStarted) {
+        return WIFI_SCAN_RUNNING;
+    }
+
+    if(_scanComplete) {
+        return ESP8266WiFiScanClass::_scanCount;
+    }
+
+    return WIFI_SCAN_FAILED;
+}
+
+/**
+ * delete last scan result from RAM
+ */
+void ESP8266WiFiScanClass::scanDelete() {
+    if(ESP8266WiFiScanClass::_scanResult) {
+        delete[] reinterpret_cast<bss_info*>(ESP8266WiFiScanClass::_scanResult);
+        ESP8266WiFiScanClass::_scanResult = 0;
+        ESP8266WiFiScanClass::_scanCount = 0;
+    }
+    _scanComplete = false;
+}
+
+
+/**
+ * loads all infos from a scanned wifi in to the ptr parameters
+ * @param networkItem uint8_t
+ * @param ssid  const char**
+ * @param encryptionType uint8_t *
+ * @param RSSI int32_t *
+ * @param BSSID uint8_t **
+ * @param channel int32_t *
+ * @param isHidden bool *
+ * @return (true if ok)
+ */
+bool ESP8266WiFiScanClass::getNetworkInfo(uint8_t i, String &ssid, uint8_t &encType, int32_t &rssi, uint8_t* &bssid, int32_t &channel, bool &isHidden) {
+    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
+    if(!it) {
+        return false;
+    }
+
+    ssid = (const char*) it->ssid;
+    encType = encryptionType(i);
+    rssi = it->rssi;
+    bssid = it->bssid; // move ptr
+    channel = it->channel;
+    isHidden = (it->is_hidden != 0);
+
+    return true;
+}
+
+
+/**
+ * Return the SSID discovered during the network scan.
+ * @param i     specify from which network item want to get the information
+ * @return       ssid string of the specified item on the networks scanned list
+ */
+String ESP8266WiFiScanClass::SSID(uint8_t i) {
+    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
+    if(!it) {
+        return "";
+    }
+
+    return String(reinterpret_cast<const char*>(it->ssid));
+}
+
+
+/**
+ * Return the encryption type of the networks discovered during the scanNetworks
+ * @param i specify from which network item want to get the information
+ * @return  encryption type (enum wl_enc_type) of the specified item on the networks scanned list
+ */
+uint8_t ESP8266WiFiScanClass::encryptionType(uint8_t i) {
+    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
+    if(!it) {
+        return -1;
+    }
+
+    switch(it->authmode) {
+        case AUTH_OPEN:
+            return ENC_TYPE_NONE;
+        case AUTH_WEP:
+            return ENC_TYPE_WEP;
+        case AUTH_WPA_PSK:
+            return ENC_TYPE_TKIP;
+        case AUTH_WPA2_PSK:
+            return ENC_TYPE_CCMP;
+        case AUTH_WPA_WPA2_PSK:
+            return ENC_TYPE_AUTO;
+        default:
+            return -1;
+    }
+}
+
+/**
+ * Return the RSSI of the networks discovered during the scanNetworks
+ * @param i specify from which network item want to get the information
+ * @return  signed value of RSSI of the specified item on the networks scanned list
+ */
+int32_t ESP8266WiFiScanClass::RSSI(uint8_t i) {
+    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
+    if(!it) {
+        return 0;
+    }
+    return it->rssi;
+}
+
+
+/**
+ * return MAC / BSSID of scanned wifi
+ * @param i specify from which network item want to get the information
+ * @return uint8_t * MAC / BSSID of scanned wifi
+ */
+uint8_t * ESP8266WiFiScanClass::BSSID(uint8_t i) {
+    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
+    if(!it) {
+        return 0;
+    }
+    return it->bssid;
+}
+
+/**
+ * return MAC / BSSID of scanned wifi
+ * @param i specify from which network item want to get the information
+ * @return String MAC / BSSID of scanned wifi
+ */
+String ESP8266WiFiScanClass::BSSIDstr(uint8_t i) {
+    char mac[18] = { 0 };
+    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
+    if(!it) {
+        return String("");
+    }
+    sprintf(mac, "%02X:%02X:%02X:%02X:%02X:%02X", it->bssid[0], it->bssid[1], it->bssid[2], it->bssid[3], it->bssid[4], it->bssid[5]);
+    return String(mac);
+}
+
+int32_t ESP8266WiFiScanClass::channel(uint8_t i) {
+    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
+    if(!it) {
+        return 0;
+    }
+    return it->channel;
+}
+
+/**
+ * return if the scanned wifi is Hidden (no SSID)
+ * @param networkItem specify from which network item want to get the information
+ * @return bool (true == hidden)
+ */
+bool ESP8266WiFiScanClass::isHidden(uint8_t i) {
+    struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
+    if(!it) {
+        return false;
+    }
+    return (it->is_hidden != 0);
+}
+
+/**
+ * private
+ * scan callback
+ * @param result  void *arg
+ * @param status STATUS
+ */
+void ESP8266WiFiScanClass::_scanDone(void* result, int status) {
+    if(status != OK) {
+        ESP8266WiFiScanClass::_scanCount = 0;
+        ESP8266WiFiScanClass::_scanResult = 0;
+    } else {
+
+        int i = 0;
+        bss_info_head_t* head = reinterpret_cast<bss_info_head_t*>(result);
+
+        for(bss_info* it = STAILQ_FIRST(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 = STAILQ_FIRST(head); it; it = STAILQ_NEXT(it, next), ++i) {
+                memcpy(copied_info + i, it, sizeof(bss_info));
+            }
+
+            ESP8266WiFiScanClass::_scanResult = copied_info;
+        }
+
+    }
+
+    ESP8266WiFiScanClass::_scanStarted = false;
+    ESP8266WiFiScanClass::_scanComplete = true;
+
+    if(!ESP8266WiFiScanClass::_scanAsync) {
+        esp_schedule();
+    }
+}
+
+/**
+ *
+ * @param i specify from which network item want to get the information
+ * @return bss_info *
+ */
+void * ESP8266WiFiScanClass::_getScanInfoByIndex(int i) {
+    if(!ESP8266WiFiScanClass::_scanResult || (size_t) i > ESP8266WiFiScanClass::_scanCount) {
+        return 0;
+    }
+    return reinterpret_cast<bss_info*>(ESP8266WiFiScanClass::_scanResult) + i;
+}
+
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiScan.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiScan.h
@ -0,0 +1,68 @@
+/*
+ ESP8266WiFiScan.h - esp8266 Wifi support.
+ Based on WiFi.h from Ardiono WiFi shield library.
+ Copyright (c) 2011-2014 Arduino.  All right reserved.
+ Modified by Ivan Grokhotkov, December 2014
+ Reworked by Markus Sattler, December 2015
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef ESP8266WIFISCAN_H_
+#define ESP8266WIFISCAN_H_
+
+#include "ESP8266WiFiType.h"
+#include "ESP8266WiFiGeneric.h"
+
+class ESP8266WiFiScanClass {
+
+        // ----------------------------------------------------------------------------------------------
+        // ----------------------------------------- scan function --------------------------------------
+        // ----------------------------------------------------------------------------------------------
+
+    public:
+
+        int8_t scanNetworks(bool async = false, bool show_hidden = false);
+
+        int8_t scanComplete();
+        void scanDelete();
+
+        // scan result
+        bool getNetworkInfo(uint8_t networkItem, String &ssid, uint8_t &encryptionType, int32_t &RSSI, uint8_t* &BSSID, int32_t &channel, bool &isHidden);
+
+        String SSID(uint8_t networkItem);
+        uint8_t encryptionType(uint8_t networkItem);
+        int32_t RSSI(uint8_t networkItem);
+        uint8_t * BSSID(uint8_t networkItem);
+        String BSSIDstr(uint8_t networkItem);
+        int32_t channel(uint8_t networkItem);
+        bool isHidden(uint8_t networkItem);
+
+    protected:
+
+        static bool _scanAsync;
+        static bool _scanStarted;
+        static bool _scanComplete;
+
+        static size_t _scanCount;
+        static void* _scanResult;
+
+        static void _scanDone(void* result, int status);
+        static void * _getScanInfoByIndex(int i);
+
+};
+
+
+#endif /* ESP8266WIFISCAN_H_ */
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiType.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiType.h
@ -0,0 +1,66 @@
+/*
+ ESP8266WiFiType.h - esp8266 Wifi support.
+ Copyright (c) 2011-2014 Arduino.  All right reserved.
+ Modified by Ivan Grokhotkov, December 2014
+ Reworked by Markus Sattler, December 2015
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+
+#ifndef ESP8266WIFITYPE_H_
+#define ESP8266WIFITYPE_H_
+
+#include <queue.h>
+
+#define WIFI_SCAN_RUNNING   (-1)
+#define WIFI_SCAN_FAILED    (-2)
+
+// Note:
+// this enums need to be in sync with the SDK!
+
+typedef enum WiFiMode {
+    WIFI_OFF = 0, WIFI_STA = 1, WIFI_AP = 2, WIFI_AP_STA = 3
+} WiFiMode_t;
+
+typedef enum {
+    WIFI_PHY_MODE_11B = 1, WIFI_PHY_MODE_11G = 2, WIFI_PHY_MODE_11N = 3
+} WiFiPhyMode_t;
+
+typedef enum {
+    WIFI_NONE_SLEEP = 0, WIFI_LIGHT_SLEEP = 2, WIFI_MODEM_SLEEP = 3
+} WiFiSleepType_t;
+
+
+typedef enum {
+    WIFI_EVENT_STAMODE_CONNECTED = 0,
+    WIFI_EVENT_STAMODE_DISCONNECTED,
+    WIFI_EVENT_STAMODE_AUTHMODE_CHANGE,
+    WIFI_EVENT_STAMODE_GOT_IP,
+    WIFI_EVENT_STAMODE_DHCP_TIMEOUT,
+    WIFI_EVENT_SOFTAPMODE_STACONNECTED,
+    WIFI_EVENT_SOFTAPMODE_STADISCONNECTED,
+    WIFI_EVENT_SOFTAPMODE_PROBEREQRECVED,
+    WIFI_EVENT_MAX
+} WiFiEvent_t;
+
+
+
+extern "C" {
+typedef STAILQ_HEAD(, bss_info)
+bss_info_head_t;
+}
+
+#endif /* ESP8266WIFITYPE_H_ */
--- a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
@ -41,7 +41,9 @@ extern "C"
 #include "include/ClientContext.h"
 #include "c_types.h"

-//#define DEBUG_SSL
+#ifdef DEBUG_ESP_SSL
+#define DEBUG_SSL
+#endif

 #ifdef DEBUG_SSL
 #define SSL_DEBUG_OPTS SSL_DISPLAY_STATES
--- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
+++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
@ -146,6 +146,9 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha

    t_httpUpdate_return ret = HTTP_UPDATE_FAILED;

+    // use HTTP/1.0 for update since the update handler not support any transfer Encoding
+    http->useHTTP10(true);
+    http->setTimeout(8000);
    http->setUserAgent("ESP8266-http-Update");
    http->addHeader("x-ESP8266-STA-MAC", WiFi.macAddress());
    http->addHeader("x-ESP8266-AP-MAC", WiFi.softAPmacAddress());
--- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
+++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
@ -32,7 +32,11 @@
 #include <WiFiUdp.h>
 #include <ESP8266HTTPClient.h>

-//#define DEBUG_HTTP_UPDATE(...) Serial1.printf( __VA_ARGS__ )
+#ifdef DEBUG_ESP_HTTP_UPDATE
+#ifdef DEBUG_ESP_PORT
+#define DEBUG_HTTP_UPDATE(...) DEBUG_ESP_PORT.printf( __VA_ARGS__ )
+#endif
+#endif

 #ifndef DEBUG_HTTP_UPDATE
 #define DEBUG_HTTP_UPDATE(...)
--- a/libraries/ESP8266mDNS/ESP8266mDNS.cpp
+++ b/libraries/ESP8266mDNS/ESP8266mDNS.cpp
@ -290,7 +290,8 @@ void MDNSResponder::_parsePacket(){
  uint16_t servicePort = 0;

  char protoName[32];
-  uint8_t protoNameLen;
+  protoName[0] = 0;
+  uint8_t protoNameLen = 0;

  uint16_t packetHeader[6];

@ -330,7 +331,7 @@ void MDNSResponder::_parsePacket(){
    serviceName[serviceNameLen] = '\0';

    if(serviceName[0] == '_'){
-      memcpy(serviceName, serviceName+1, serviceNameLen);
+      memmove(serviceName, serviceName+1, serviceNameLen);
      serviceNameLen--;
      serviceParsed = true;
    } else if(serviceNameLen == 5 && strcmp("local", serviceName) == 0){
@ -362,7 +363,7 @@ void MDNSResponder::_parsePacket(){
    _conn_readS(protoName, protoNameLen);
    protoName[protoNameLen] = '\0';
    if(protoNameLen == 4 && protoName[0] == '_'){
-      memcpy(protoName, protoName+1, protoNameLen);
+      memmove(protoName, protoName+1, protoNameLen);
      protoNameLen--;
      protoParsed = true;
    } else {
@ -494,7 +495,7 @@ void MDNSResponder::_reply(uint8_t replyMask, char * service, char *proto, uint1
  size_t hostNameLen = hostName.length();

  char underscore[]  = "_";
-
+ 
  // build service name with _
  char serviceName[os_strlen(service)+2];
  os_strcpy(serviceName,underscore);
--- a/package/package_esp8266com_index.template.json
+++ b/package/package_esp8266com_index.template.json
@ -54,6 +54,9 @@
            },
            {
              "name": "WifInfo"
+            },
+			{
+              "name": "ESPDuino"
            }
          ],
          "toolsDependencies": [
--- a/platform.txt
+++ b/platform.txt
@ -61,13 +61,13 @@ compiler.objcopy.eep.extra_flags=
 compiler.elf2hex.extra_flags=

 ## Compile c files
-recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
+recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"

 ## Compile c++ files
-recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
+recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"

 ## Compile S files
-recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
+recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"

 ## Create archives
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/arduino.ar" "{object_file}"
--- a/tools/sdk/include/user_interface.h
+++ b/tools/sdk/include/user_interface.h
@ -164,7 +164,7 @@ bool wifi_set_opmode_current(uint8 opmode);
 uint8 wifi_get_broadcast_if(void);
 bool wifi_set_broadcast_if(uint8 interface);

-struct bss_info {
+typedef struct bss_info {
    STAILQ_ENTRY(bss_info)     next;

    uint8 bssid[6];
@ -177,7 +177,7 @@ struct bss_info {
    sint16 freq_offset;
    sint16 freqcal_val;
 	uint8 *esp_mesh_ie;
-};
+} bss_info_t;

 typedef struct _scaninfo {
    STAILQ_HEAD(, bss_info) *pbss;
@ -222,21 +222,21 @@ bool wifi_station_set_auto_connect(uint8 set);

 bool wifi_station_set_reconnect_policy(bool set);

-enum {
+typedef enum {
    STATION_IDLE = 0,
    STATION_CONNECTING,
    STATION_WRONG_PASSWORD,
    STATION_NO_AP_FOUND,
    STATION_CONNECT_FAIL,
    STATION_GOT_IP
-};
+} station_status_t;

 enum dhcp_status {
 	DHCP_STOPPED,
 	DHCP_STARTED
 };

-uint8 wifi_station_get_connect_status(void);
+station_status_t wifi_station_get_connect_status(void);

 uint8 wifi_station_get_current_ap_id(void);
 bool wifi_station_ap_change(uint8 current_ap_id);
--- a/variants/ESPDuino/pins_arduino.h
+++ b/variants/ESPDuino/pins_arduino.h
@ -0,0 +1,68 @@
+/*
+  pins_arduino.h - Pin definition functions for Arduino
+  Part of Arduino - http://www.arduino.cc/
+  Copyright (c) 2007 David A. Mellis
+  Modified for ESP8266 platform by Ivan Grokhotkov, 2014-2015.
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+  This library 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
+  Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+  $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
+*/
+/*
+  Modified by Doit.am team
+  www.doit.am
+*/
+
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        17
+#define NUM_ANALOG_INPUTS       1
+
+#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
+#define digitalPinToInterrupt(p)  	(((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
+#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+
+static const uint8_t SDA = 4;
+static const uint8_t SCL = 5;
+
+static const uint8_t SS    = 15;
+static const uint8_t MOSI  = 13;
+static const uint8_t MISO  = 12;
+static const uint8_t SCK   = 14;
+
+static const uint8_t BUILTIN_LED = 16;
+
+static const uint8_t A0 = 17;
+
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_MONITOR        Serial
+#define SERIAL_PORT_USBVIRTUAL     Serial
+#define SERIAL_PORT_HARDWARE       Serial
+#define SERIAL_PORT_HARDWARE_OPEN  Serial
+
+#endif /* Pins_Arduino_h */