Merge remote-tracking branch 'upstream/esp8266'

Conflicts:
	hardware/esp8266com/esp8266/cores/esp8266/Client.h
	hardware/esp8266com/esp8266/cores/esp8266/IPAddress.h
	hardware/esp8266com/esp8266/cores/esp8266/Printable.h
	hardware/esp8266com/esp8266/cores/esp8266/Server.h
	hardware/esp8266com/esp8266/cores/esp8266/Udp.h
	hardware/esp8266com/esp8266/cores/esp8266/binary.h

README.md

@@ -78,7 +78,7 @@ This is mostly similar to WiFi shield library. Differences include:
 - ```WiFi.printDiag(Serial);``` will print out some diagnostic info
 
 WiFiServer, WiFiClient, and WiFiUDP behave mostly the same way as with WiFi shield library.
-Three samples are provided for this library.
+Four samples are provided for this library.
 
 #### Ticker ####
 
@@ -107,6 +107,16 @@ Before using I2C, pins for SDA and SCL need to be set by calling
 An initial SPI support for the HSPI interface (GPIO12-15) was implemented by [Sermus](https://github.com/Sermus).
 The implementation supports the entire Arduino SPI API including transactions, except setting phase and polarity as it's unclear how to set them in ESP8266 yet.
 
+#### ESP-specific APIs ####
+
+APIs related to deep sleep and watchdog timer are available in the ```ESP``` object.
+
+```ESP.deepSleep(microseconds, mode)``` will put the chip into deep sleep. ```mode``` is one of ```WAKE_DEFAULT```, ```WAKE_RFCAL```, ```WAKE_NO_RFCAL```, ```WAKE_RF_DISABLED```.
+
+```ESP.wdtEnable()```, ```ESP.wdtDisable()```, and ```ESP.wdtFeed()``` provide some control over the watchdog timer.
+
+```ESP.reset()``` resets the CPU.
+
 #### OneWire (from https://www.pjrc.com/teensy/td_libs_OneWire.html) ####
 
 Library was adapted to work with ESP8266 by including register definitions into OneWire.h

esp8266com/esp8266/cores/esp8266/Arduino.h

@@ -1,21 +1,21 @@
 /*
-  Arduino.h - Main include file for the Arduino SDK
-  Copyright (c) 2005-2013 Arduino Team.  All right reserved.
+ Arduino.h - Main include file for the Arduino SDK
+ Copyright (c) 2005-2013 Arduino Team.  All right reserved.
 
-  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 Arduino_h
 #define Arduino_h
@@ -30,7 +30,7 @@
 #include "pgmspace.h"
 
 #ifdef __cplusplus
-extern "C"{
+extern "C" {
 #endif
 
 void yield(void);
@@ -144,7 +144,6 @@ volatile uint32_t* portOutputRegister(uint32_t port);
 volatile uint32_t* portInputRegister(uint32_t port);
 volatile uint32_t* portModeRegister(uint32_t port);
 
-
 #define NOT_A_PIN 0
 #define NOT_A_PORT 0
 #define NOT_AN_INTERRUPT -1
@@ -159,6 +158,7 @@ volatile uint32_t* portModeRegister(uint32_t port);
 #include "WString.h"
 
 #include "HardwareSerial.h"
+#include "Esp.h"
 
 uint16_t makeWord(uint16_t w);
 uint16_t makeWord(byte h, byte l);

esp8266com/esp8266/cores/esp8266/Client.h

@@ -1,45 +1,48 @@
 /*
-  Client.h - Base class that provides Client
-  Copyright (c) 2011 Adrian McEwen.  All right reserved.
+ Client.h - Base class that provides Client
+ Copyright (c) 2011 Adrian McEwen.  All right reserved.
 
-  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 client_h
 #define client_h
 #include "Print.h"
 #include "Stream.h"
 #include "IPAddress.h"
 
-class Client : public Stream {
+class Client: public Stream {
 
-public:
-  virtual int connect(IPAddress ip, uint16_t port) =0;
-  virtual int connect(const char *host, uint16_t port) =0;
-  virtual size_t write(uint8_t) =0;
-  virtual size_t write(const uint8_t *buf, size_t size) =0;
-  virtual int available() = 0;
-  virtual int read() = 0;
-  virtual int read(uint8_t *buf, size_t size) = 0;
-  virtual int peek() = 0;
-  virtual void flush() = 0;
-  virtual void stop() = 0;
-  virtual uint8_t connected() = 0;
-  virtual operator bool() = 0;
-protected:
-  uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); };
+    public:
+        virtual int connect(IPAddress ip, uint16_t port) =0;
+        virtual int connect(const char *host, uint16_t port) =0;
+        virtual size_t write(uint8_t) =0;
+        virtual size_t write(const uint8_t *buf, size_t size) =0;
+        virtual int available() = 0;
+        virtual int read() = 0;
+        virtual int read(uint8_t *buf, size_t size) = 0;
+        virtual int peek() = 0;
+        virtual void flush() = 0;
+        virtual void stop() = 0;
+        virtual uint8_t connected() = 0;
+        virtual operator bool() = 0;
+    protected:
+        uint8_t* rawIPAddress(IPAddress& addr) {
+            return addr.raw_address();
+        }
+        ;
 };
 
 #endif

esp8266com/esp8266/cores/esp8266/Esp.cpp

@@ -0,0 +1,62 @@
+/* 
+ Esp.cpp - ESP8266-specific APIs
+ Copyright (c) 2015 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
+ */
+
+#include "Arduino.h"
+
+extern "C" {
+#include "user_interface.h"
+}
+
+extern "C" void ets_wdt_enable (void);
+extern "C" void ets_wdt_disable (void);
+extern "C" void wdt_feed (void);
+
+EspClass ESP;
+
+EspClass::EspClass()
+{
+
+}
+
+void EspClass::wdtEnable(int)
+{
+	ets_wdt_enable();
+}
+
+void EspClass::wdtDisable()
+{
+	ets_wdt_disable();
+}
+
+void EspClass::wdtFeed()
+{
+	wdt_feed();
+}
+
+void EspClass::deepSleep(uint32_t time_us, WakeMode mode)
+{
+	system_deep_sleep_set_option(static_cast<int>(mode));
+ 	system_deep_sleep(time_us);
+}
+
+void EspClass::reset()
+{
+	((void (*)(void))0x40000080)();
+}

esp8266com/esp8266/cores/esp8266/Esp.h

@@ -0,0 +1,48 @@
+/* 
+ Esp.h - ESP8266-specific APIs
+ Copyright (c) 2015 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
+ */
+
+#ifndef ESP_H
+#define ESP_H
+
+
+enum WakeMode {
+    WAKE_RF_DEFAULT = 0, // RF_CAL or not after deep-sleep wake up, depends on init data byte 108.
+    WAKE_RFCAL = 1,      // RF_CAL after deep-sleep wake up, there will be large current.
+    WAKE_NO_RFCAL = 2,   // no RF_CAL after deep-sleep wake up, there will only be small current.
+    WAKE_RF_DISABLED = 4 // disable RF after deep-sleep wake up, just like modem sleep, there will be the smallest current.
+};
+
+class EspClass {
+    public:
+        EspClass();
+
+        void wdtEnable(int timeout_ms = 0);  
+        // TODO: figure out how to set WDT timeout
+        void wdtDisable();
+        void wdtFeed();
+
+        void deepSleep(uint32_t time_us, WakeMode mode = WAKE_RF_DEFAULT);
+
+        void reset();
+};
+
+extern EspClass ESP;
+
+#endif //ESP_H