From ffd6c1594785b1c3ae08943f3971b11c6a7d5e80 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 18 May 2015 20:06:24 +0300 Subject: [PATCH 01/11] Make platform.txt compatible with board manager package --- platform.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/platform.txt b/platform.txt index a408813f4..a776b7e9c 100644 --- a/platform.txt +++ b/platform.txt @@ -6,12 +6,15 @@ # 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/ +#board-manager-package-compat-begin +runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf-gcc +runtime.tools.esptool.path={runtime.platform.path}/tools +#board-manager-package-compat-end +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 +36,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 +76,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" @@ -86,9 +88,8 @@ recipe.size.regex=^(?:\.text|\.data|\.rodata|\.irom0\.text|)\s+([0-9]+).* tools.esptool.cmd=esptool tools.esptool.cmd.windows=esptool.exe -tools.esptool.path={runtime.platform.path}/tools tools.esptool.upload.protocol=esp tools.esptool.upload.params.verbose=-vv tools.esptool.upload.params.quiet= -tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" -ca 0x00000 -cf "{build.path}/{build.project_name}_00000.bin" -ca 0x10000 -cf "{build.path}/{build.project_name}_10000.bin" +tools.esptool.upload.pattern="{runtime.tools.esptool.path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" -ca 0x00000 -cf "{build.path}/{build.project_name}_00000.bin" -ca 0x10000 -cf "{build.path}/{build.project_name}_10000.bin" From 18349b2090687649617405841b0899fb497119da Mon Sep 17 00:00:00 2001 From: ficeto Date: Mon, 18 May 2015 21:45:00 +0300 Subject: [PATCH 02/11] fix buffer and block size --- cores/esp8266/Esp.cpp | 6 ++++++ cores/esp8266/FileSystem.cpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp index af6d99468..cb5533690 100644 --- a/cores/esp8266/Esp.cpp +++ b/cores/esp8266/Esp.cpp @@ -175,6 +175,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; } diff --git a/cores/esp8266/FileSystem.cpp b/cores/esp8266/FileSystem.cpp index 0399e4fce..34c4b43fa 100644 --- a/cores/esp8266/FileSystem.cpp +++ b/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; From 3540c150283ee30576ffc05c24428839c6278ea8 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 18 May 2015 21:52:15 +0300 Subject: [PATCH 03/11] Fix tools path --- platform.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/platform.txt b/platform.txt index a776b7e9c..c2cfa053e 100644 --- a/platform.txt +++ b/platform.txt @@ -8,10 +8,8 @@ name=ESP8266 Modules version=1.6.4 -#board-manager-package-compat-begin -runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf-gcc +runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf runtime.tools.esptool.path={runtime.platform.path}/tools -#board-manager-package-compat-end compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/ compiler.sdk.path={runtime.platform.path}/tools/sdk/ @@ -88,8 +86,9 @@ recipe.size.regex=^(?:\.text|\.data|\.rodata|\.irom0\.text|)\s+([0-9]+).* tools.esptool.cmd=esptool tools.esptool.cmd.windows=esptool.exe +tools.esptool.path={runtime.platform.path}/tools tools.esptool.upload.protocol=esp tools.esptool.upload.params.verbose=-vv tools.esptool.upload.params.quiet= -tools.esptool.upload.pattern="{runtime.tools.esptool.path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" -ca 0x00000 -cf "{build.path}/{build.project_name}_00000.bin" -ca 0x10000 -cf "{build.path}/{build.project_name}_10000.bin" +tools.esptool.upload.pattern="{path}/{cmd}" {upload.verbose} -cd {upload.resetmethod} -cb {upload.speed} -cp "{serial.port}" -ca 0x00000 -cf "{build.path}/{build.project_name}_00000.bin" -ca 0x10000 -cf "{build.path}/{build.project_name}_10000.bin" From ba65783177ac8ca9be3c8b93a0c3cc7474b2f31e Mon Sep 17 00:00:00 2001 From: ficeto Date: Mon, 18 May 2015 22:34:34 +0300 Subject: [PATCH 04/11] add method to get the actual size of the flash --- cores/esp8266/Esp.cpp | 5 +++++ cores/esp8266/Esp.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp index cb5533690..67e6a41af 100644 --- a/cores/esp8266/Esp.cpp +++ b/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; diff --git a/cores/esp8266/Esp.h b/cores/esp8266/Esp.h index 9750dd312..5e356459e 100644 --- a/cores/esp8266/Esp.h +++ b/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); From d4d4beb0d5f07c7a925885eb34deb1245df9d3db Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 18 May 2015 22:52:14 +0300 Subject: [PATCH 05/11] Fix issue with min/max fix #263 --- cores/esp8266/Arduino.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h index dbc003b1d..767ea4f28 100644 --- a/cores/esp8266/Arduino.h +++ b/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); From 655beb1c3c11e25de44d64cc6d11e9a05ab9d4f5 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 19 May 2015 00:35:00 +0300 Subject: [PATCH 06/11] Update README.md [ci skip] --- README.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index bf6cba3b3..e45a9461f 100644 --- a/README.md +++ b/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 x64. +- 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 ### From 48c061beee02e075da40c60bf85ede755dd51663 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 19 May 2015 01:31:10 +0300 Subject: [PATCH 07/11] temporary fix of min/max --- libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h index a3926a406..9a412ebb1 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h @@ -28,6 +28,8 @@ #define WIFICLIENTMULTI_H_ #include "ESP8266WiFi.h" +#undef min +#undef max #include //#define DEBUG_WIFI_MULTI(...) os_printf( __VA_ARGS__ ) From 85ebee75b4ec66663b3c3f814457f6f3826b5b86 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 19 May 2015 09:23:47 +0300 Subject: [PATCH 08/11] Fix case in WiFiMulti example --- libraries/ESP8266WiFi/examples/WiFiMulti/WiFiMulti.ino | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/ESP8266WiFi/examples/WiFiMulti/WiFiMulti.ino b/libraries/ESP8266WiFi/examples/WiFiMulti/WiFiMulti.ino index 5a1057893..70803254d 100644 --- a/libraries/ESP8266WiFi/examples/WiFiMulti/WiFiMulti.ino +++ b/libraries/ESP8266WiFi/examples/WiFiMulti/WiFiMulti.ino @@ -6,15 +6,15 @@ #include #include -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) { From 7073d719b353523391869da6da634f68b224f6a0 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 19 May 2015 09:25:40 +0300 Subject: [PATCH 09/11] Add 32-bit linux tools --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e45a9461f..99c9de21b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This project brings support for ESP8266 chip to the Arduino environment. ESP8266 ### Installing with Boards Manager ### -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 x64. +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. From 555813545caddcc168d77451f389702922652c72 Mon Sep 17 00:00:00 2001 From: ficeto Date: Tue, 19 May 2015 14:06:34 +0300 Subject: [PATCH 10/11] Make the web server not waste heap added some helper methods as well --- .../ESP8266WebServer/src/ESP8266WebServer.cpp | 20 ++++++++++++++++++- .../ESP8266WebServer/src/ESP8266WebServer.h | 11 +++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp index 391cc556c..054929971 100644 --- a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp +++ b/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) { diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h index d957e15ba..9f2b16480 100644 --- a/libraries/ESP8266WebServer/src/ESP8266WebServer.h +++ b/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 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: From c06b727fad785528b556e1876843b975fab6953e Mon Sep 17 00:00:00 2001 From: ficeto Date: Tue, 19 May 2015 15:30:46 +0300 Subject: [PATCH 11/11] better analogRead --- cores/esp8266/core_esp8266_wiring_analog.c | 27 +++------------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/cores/esp8266/core_esp8266_wiring_analog.c b/cores/esp8266/core_esp8266_wiring_analog.c index bb5151018..53451b713 100644 --- a/cores/esp8266/core_esp8266_wiring_analog.c +++ b/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; }