From 56ed566e51e9dc41b6dfc3df3525487b49896e6c Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 19 May 2015 00:35:00 +0300 Subject: [PATCH 1/4] 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 39469f62491299b54bcac00cc26df99b11675679 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 19 May 2015 01:31:10 +0300 Subject: [PATCH 2/4] temporary fix of min/max --- .../esp8266/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h b/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h index a3926a406..9a412ebb1 100644 --- a/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h +++ b/hardware/esp8266com/esp8266/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 545ffdeb87c44bb54fb4678eabb932edd73ca72e Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 19 May 2015 09:23:47 +0300 Subject: [PATCH 3/4] Fix case in WiFiMulti example --- .../ESP8266WiFi/examples/WiFiMulti/WiFiMulti.ino | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/examples/WiFiMulti/WiFiMulti.ino b/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/examples/WiFiMulti/WiFiMulti.ino index 5a1057893..70803254d 100644 --- a/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/examples/WiFiMulti/WiFiMulti.ino +++ b/hardware/esp8266com/esp8266/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 9764c9614b93e713ccb57de9e392594c173ff34f Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 19 May 2015 09:25:40 +0300 Subject: [PATCH 4/4] Add 32-bit linux tools --- README.md | 2 +- build/build_board_manager_package.sh | 44 ++++++++++++++++++---------- 2 files changed, 30 insertions(+), 16 deletions(-) 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. diff --git a/build/build_board_manager_package.sh b/build/build_board_manager_package.sh index d006cba0f..3d6ba517f 100755 --- a/build/build_board_manager_package.sh +++ b/build/build_board_manager_package.sh @@ -64,25 +64,32 @@ cat << EOF > package_esp8266com_index.json "version":"0.4.4", "systems": [ { - "host":"i686-mingw32", - "url":"https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-win32.zip", - "archiveFileName":"esptool-0.4.4-win32.zip", - "checksum":"SHA-256:bc52165c847b194d8f079add982eae1c4b4466784bff8c8494241de602a003b3", - "size":"17262" + "host":"i686-mingw32", + "url":"https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-win32.zip", + "archiveFileName":"esptool-0.4.4-win32.zip", + "checksum":"SHA-256:bc52165c847b194d8f079add982eae1c4b4466784bff8c8494241de602a003b3", + "size":"17262" }, { - "host":"x86_64-apple-darwin", - "url":"https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-osx.tar.gz", - "archiveFileName":"esptool-0.4.4-osx.tar.gz", - "checksum":"SHA-256:bb2a58c3583f9dcb0d3e7611531a0f3a29c21a4a1c442987bb29d07408824dfe", - "size":"12145" + "host":"x86_64-apple-darwin", + "url":"https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-osx.tar.gz", + "archiveFileName":"esptool-0.4.4-osx.tar.gz", + "checksum":"SHA-256:bb2a58c3583f9dcb0d3e7611531a0f3a29c21a4a1c442987bb29d07408824dfe", + "size":"12145" }, { - "host":"x86_64-pc-linux-gnu", - "url":"https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-linux64.tar.gz", - "archiveFileName":"esptool-0.4.4-linux64.tar.gz", - "checksum":"SHA-256:beedf89db0bdce0bf6034232d86edebcfed0966ff1501545aca9cfbba1f92593", - "size":"12513" + "host":"x86_64-pc-linux-gnu", + "url":"https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-linux64.tar.gz", + "archiveFileName":"esptool-0.4.4-linux64.tar.gz", + "checksum":"SHA-256:beedf89db0bdce0bf6034232d86edebcfed0966ff1501545aca9cfbba1f92593", + "size":"12513" + }, + { + "host":"i686-pc-linux-gnu", + "url":"https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-linux32.tar.gz", + "archiveFileName":"esptool-0.4.4-linux32.tar.gz", + "checksum":"SHA-256:4aa81b97a470641771cf371e5d470ac92d3b177adbe8263c4aae66e607b67755", + "size":"12044" } ] }, @@ -110,6 +117,13 @@ cat << EOF > package_esp8266com_index.json "archiveFileName":"linux64-xtensa-lx106-elf-gb404fb9.tar.gz", "checksum":"SHA-256:46f057fbd8b320889a26167daf325038912096d09940b2a95489db92431473b7", "size":"30262903" + }, + { + "host":"i686-pc-linux-gnu", + "url":"http://arduino.esp8266.com/linux32-xtensa-lx106-elf.tar.gz", + "archiveFileName":"linux32-xtensa-lx106-elf.tar.gz", + "checksum":"SHA-256:b24817819f0078fb05895a640e806e0aca9aa96b47b80d2390ac8e2d9ddc955a", + "size":"32734156" } ] } ]