Merge remote-tracking branch 'remotes/ficeto/esp8266' into esp8266

README.md

@@ -1,18 +1,20 @@
 Arduino-compatible IDE with ESP8266 support
 ===========================================
 
+![Linux build status](http://img.shields.io/travis/igrr/Arduino.svg)
+
 This project brings support for ESP8266 chip to the Arduino environment. ESP8266WiFi library bundled with this project has the same interface as the WiFi Shield library, making it easy to re-use existing code and libraries.
 
-### Downloads ###
+### Installing with Boards Manager ###
 
-| OS | Build status | Latest release | Alpha Version |
-| --- | ------------ | -------------- | --------------- |
-| Linux | [![Linux build status](http://img.shields.io/travis/igrr/Arduino.svg)](https://travis-ci.org/igrr/Arduino) | [arduino-1.6.1-linux64.tar.xz](../../releases/download/1.6.1-esp8266-1/arduino-1.6.1-linux64.tar.xz) | |
-| Windows | [![Windows build status](http://img.shields.io/appveyor/ci/igrr/Arduino.svg)](https://ci.appveyor.com/project/igrr/Arduino) | [arduino-1.6.1-p1-windows.zip](https://github.com/igrr/Arduino/releases/download/1.6.1-esp8266-1/arduino-1.6.1-p1-windows.zip) |  [appveyor 64Bit Build](https://ci.appveyor.com/project/igrr/Arduino/build/artifacts) |
-| OS X |  | [arduino-1.6.1-macosx-java-latest-signed.zip](../../releases/download/1.6.1-esp8266-1/arduino-1.6.1-macosx-java-latest-signed.zip) | |
+Starting with 1.6.4, Arduino allows installation of third-party platform packages using Boards Manager. We have packages available for Windows, Mac OS, and Linux (32 and 64 bit).
 
+- Install Arduino 1.6.4 from the [Arduino website](http://www.arduino.cc/en/main/software).
+- Start Arduino and open Perferences window.
+- Enter ```http://arduino.esp8266.com/package_esp8266com_index.json``` into *Additional Board Manager URLs* field. You can add multiple URLs, separating them with commas.
+- Open Boards Manager from Tools > Board menu and install *esp8266* platform (and don't forget to select your ESP8266 board from Tools > Board menu after installation).
 
-### Building from source ###
+### Building latest version from source ###
 ```
 $ git clone https://github.com/esp8266/Arduino.git
 $ cd Arduino/build
@@ -20,8 +22,9 @@ $ ant dist
 ```
 
 ### Supported boards ###
-- [Wifio](http://wifio.cc)
 - Generic esp8266 modules (without auto-reset support)
+- NodeMCU
+- Olimex MOD-WIFI-ESP8266
 
 ### Things that work ###
 

cores/esp8266/Arduino.h

@@ -112,8 +112,6 @@ void timer1_write(uint32_t ticks); //maximum ticks 8388607
 #undef abs
 #endif
 
-#define min(a,b) ((a)<(b)?(a):(b))
-#define max(a,b) ((a)>(b)?(a):(b))
 #define abs(x) ((x)>0?(x):-(x))
 #define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
 #define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
@@ -215,6 +213,9 @@ void loop(void);
 #include "Esp.h"
 #include "debug.h"
 
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+
 uint16_t makeWord(uint16_t w);
 uint16_t makeWord(byte h, byte l);
 

cores/esp8266/Esp.cpp

@@ -158,6 +158,11 @@ uint32_t EspClass::getFlashChipId(void)
     return spi_flash_get_id();
 }
 
+uint32_t EspClass::getFlashChipRealSize(void)
+{
+    return (1 << ((spi_flash_get_id() >> 16) & 0xFF));
+}
+
 uint32_t EspClass::getFlashChipSize(void)
 {
     uint32_t data;
@@ -175,6 +180,12 @@ uint32_t EspClass::getFlashChipSize(void)
                 return (2_MB);
             case 0x4: // 32 MBit (4MB)
                 return (4_MB);
+            case 0x5: // 64 MBit (8MB)
+                return (8_MB);
+            case 0x6: // 128 MBit (16MB)
+                return (16_MB);
+            case 0x7: // 256 MBit (32MB)
+                return (32_MB);
             default: // fail?
                 return 0;
         }

cores/esp8266/Esp.h

@@ -90,6 +90,9 @@ class EspClass {
         uint8_t getCpuFreqMHz(void);
 
         uint32_t getFlashChipId(void);
+        //gets the actual chip size based on the flash id
+        uint32_t getFlashChipRealSize(void);
+        //gets the size of the flash as set by the compiler
         uint32_t getFlashChipSize(void);
         uint32_t getFlashChipSpeed(void);
         FlashMode_t getFlashChipMode(void);

cores/esp8266/FileSystem.cpp

@@ -23,7 +23,7 @@
 #include "spiffs/spiffs_esp8266.h"
 
 #define LOGICAL_PAGE_SIZE       256
-#define LOGICAL_BLOCK_SIZE      512
+#define LOGICAL_BLOCK_SIZE      (INTERNAL_FLASH_SECTOR_SIZE * 1)
 
 
 // These addresses are defined in the linker script.
@@ -64,7 +64,7 @@ int FSClass::_mountInternal(){
   
   SPIFFS_API_DBG_V("FSClass::_mountInternal: start:%x, size:%d Kb\n", cfg.phys_addr, cfg.phys_size / 1024);
 
-  _work.reset(new uint8_t[LOGICAL_BLOCK_SIZE]);
+  _work.reset(new uint8_t[2*LOGICAL_PAGE_SIZE]);
   _fdsSize = 32 * _maxOpenFiles;
   _fds.reset(new uint8_t[_fdsSize]);
   _cacheSize = (32 + LOGICAL_PAGE_SIZE) * _maxOpenFiles;

cores/esp8266/core_esp8266_wiring_analog.c

@@ -21,34 +21,13 @@
 #include "wiring_private.h"
 #include "pins_arduino.h"
 
+extern uint16_t readvdd33(void);
+
 void analogReference(uint8_t mode) {}
 
 extern int __analogRead(uint8_t pin) {
   if(pin == 17){
-    //return system_adc_read();
-    uint8_t i;
-    uint16_t data[8];
-
-    rom_i2c_writeReg_Mask(0x6C,2,0,5,5,1);
-
-    ESP8266_REG(0xD5C) |= (1 << 21);
-    while ((ESP8266_REG(0xD50) & (7 << 24)) > 0);
-    ESP8266_REG(0xD50) &= ~(1 << 1);
-    ESP8266_REG(0xD50) |= (1 << 1);
-    delayMicroseconds(2);
-    while ((ESP8266_REG(0xD50) & (7 << 24)) > 0);
-
-    read_sar_dout(data);
-    rom_i2c_writeReg_Mask(0x6C,2,0,5,5,1);
-
-    while ((ESP8266_REG(0xD50) & (7 << 24)) > 0);
-    ESP8266_REG(0xD5C) &= ~(1 << 21);
-    ESP8266_REG(0xD60) |= (1 << 0);
-    ESP8266_REG(0xD60) &= ~(1 << 0);
-
-    uint16_t tout = 0;
-    for (i = 0; i < 8; i++) tout += data[i];
-    return tout >> 4;//tout is 10 bits fraction
+    return readvdd33() >> 2; // readvdd33 is 12 bit
   }
   return digitalRead(pin) * 1023;
 }

libraries/ESP8266WebServer/src/ESP8266WebServer.cpp

@@ -101,7 +101,8 @@ void ESP8266WebServer::handleClient()
 #endif
 
   // Wait for data from client to become available
-  while(client.connected() && !client.available()){
+  uint16_t maxWait = HTTP_MAX_DATA_WAIT;
+  while(client.connected() && !client.available() && maxWait--){
     delay(1);
   }
 
@@ -136,7 +137,12 @@ void ESP8266WebServer::send(int code, const char* content_type, String content)
 
   if (!content_type)
     content_type = "text/html";
+  
+  String len(content.length());
   sendHeader("Content-Type", content_type, true);
+  sendHeader("Content-Length", len.c_str());
+  sendHeader("Connection", "close");
+  sendHeader("Access-Control-Allow-Origin", "*");
   
   response += _responseHeaders;
   response += "\r\n";
@@ -145,6 +151,14 @@ void ESP8266WebServer::send(int code, const char* content_type, String content)
   sendContent(response);
 }
 
+void ESP8266WebServer::send(int code, char* content_type, String content) {
+  send(code, (const char*)content_type, content);
+}
+
+void ESP8266WebServer::send(int code, String content_type, String content) {
+  send(code, (const char*)content_type.c_str(), content);
+}
+
 void ESP8266WebServer::sendContent(String content) {
   size_t size_to_send = content.length();
   size_t size_sent = 0;
@@ -158,6 +172,10 @@ void ESP8266WebServer::sendContent(String content) {
       break;
     }
   }
+  uint16_t maxWait = HTTP_MAX_CLOSE_WAIT;
+  while(_currentClient.connected() && maxWait--) {
+    delay(1);
+  }
 }
 
 String ESP8266WebServer::arg(const char* name) {

libraries/ESP8266WebServer/src/ESP8266WebServer.h

@@ -31,6 +31,8 @@ enum HTTPUploadStatus { UPLOAD_FILE_START, UPLOAD_FILE_WRITE, UPLOAD_FILE_END };
 
 #define HTTP_DOWNLOAD_UNIT_SIZE 1460
 #define HTTP_UPLOAD_BUFLEN 2048
+#define HTTP_MAX_DATA_WAIT 1000 //ms to wait for the client to send the request
+#define HTTP_MAX_CLOSE_WAIT 2000 //ms to wait for the client to close the connection
 
 typedef struct {
   HTTPUploadStatus status;
@@ -73,6 +75,8 @@ public:
   // content_type - HTTP content type, like "text/plain" or "image/png"
   // content - actual content body
   void send(int code, const char* content_type = NULL, String content = String(""));
+  void send(int code, char* content_type, String content);
+  void send(int code, String content_type, String content);
 
   void sendHeader(String name, String value, bool first = false);
   void sendContent(String content);
@@ -87,7 +91,12 @@ template<typename T> size_t streamFile(T &file, String contentType){
   head += "\r\n\r\n";
   _currentClient.print(head);
   head = String();
-  return _currentClient.write(file, HTTP_DOWNLOAD_UNIT_SIZE);
+  size_t res =  _currentClient.write(file, HTTP_DOWNLOAD_UNIT_SIZE);
+  uint16_t maxWait = HTTP_MAX_CLOSE_WAIT;
+  while(_currentClient.connected() && maxWait--) {
+    delay(1);
+  }
+  return res;
 }
   
 protected:

libraries/ESP8266WiFi/examples/WiFiMulti/WiFiMulti.ino

@@ -6,15 +6,15 @@
 #include <ESP8266WiFi.h>
 #include <ESP8266WiFiMulti.h>
 
-ESP8266WiFiMulti WiFiMulti = ESP8266WiFiMulti();
+ESP8266WiFiMulti wifiMulti;
 
 void setup() {
     Serial.begin(115200);
     delay(10);
 	
-    WiFiMulti.addAP("ssid_from_AP_1", "your_password_for_AP_1");
-    WiFiMulti.addAP("ssid_from_AP_2", "your_password_for_AP_2");
-    WiFiMulti.addAP("ssid_from_AP_3", "your_password_for_AP_3");
+    wifiMulti.addAP("ssid_from_AP_1", "your_password_for_AP_1");
+    wifiMulti.addAP("ssid_from_AP_2", "your_password_for_AP_2");
+    wifiMulti.addAP("ssid_from_AP_3", "your_password_for_AP_3");
 
 	Serial.println("Connecting Wifi...");
     if(wifiMulti.run() == WL_CONNECTED) {

libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h

@@ -28,6 +28,8 @@
 #define WIFICLIENTMULTI_H_
 
 #include "ESP8266WiFi.h"
+#undef min
+#undef max
 #include <vector>
 
 //#define DEBUG_WIFI_MULTI(...) os_printf( __VA_ARGS__ )

platform.txt

@@ -6,12 +6,13 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=ESP8266 Modules
-version=1.6.1
+version=1.6.4
 
-compiler.tools.path={runtime.platform.path}/tools/
-compiler.path={compiler.tools.path}xtensa-lx106-elf/bin/
-compiler.sdk.path={compiler.tools.path}sdk/
+runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf
+runtime.tools.esptool.path={runtime.platform.path}/tools
 
+compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
+compiler.sdk.path={runtime.platform.path}/tools/sdk/
 compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include"
 
 compiler.c.cmd=xtensa-lx106-elf-gcc
@@ -33,7 +34,6 @@ compiler.ar.cmd=xtensa-lx106-elf-ar
 compiler.ar.flags=cru
 
 compiler.elf2hex.cmd=esptool
-
 compiler.elf2hex.flags=
 
 compiler.size.cmd=xtensa-lx106-elf-size
@@ -74,7 +74,7 @@ recipe.objcopy.eep.pattern=
 ## Create hex
 #recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
 
-recipe.objcopy.hex.pattern="{compiler.tools.path}{compiler.esptool.cmd}" -eo "{build.path}/{build.project_name}.elf" -bo "{build.path}/{build.project_name}_00000.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bs .data -bs .rodata -bc -ec -eo "{build.path}/{build.project_name}.elf" -es .irom0.text "{build.path}/{build.project_name}_10000.bin" -ec
+recipe.objcopy.hex.pattern="{runtime.tools.esptool.path}/{compiler.esptool.cmd}" -eo "{build.path}/{build.project_name}.elf" -bo "{build.path}/{build.project_name}_00000.bin" -bm {build.flash_mode} -bf {build.flash_freq} -bz {build.flash_size} -bs .text -bs .data -bs .rodata -bc -ec -eo "{build.path}/{build.project_name}.elf" -es .irom0.text "{build.path}/{build.project_name}_10000.bin" -ec
 
 ## Compute size
 recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"