Merge pull request #33 from esp8266/esp8266

pull master

Author: ficeto

README.md

@@ -2,6 +2,7 @@ Arduino-compatible IDE with ESP8266 support
 ===========================================
 
 ![Linux build status](http://img.shields.io/travis/igrr/Arduino.svg)
+[![Donate](http://img.shields.io/paypal/donate.png?color=yellow)](https://www.paypal.com/webscr?cmd=_s-xclick&hosted_button_id=4M56YCWV6PX66)
 
 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.
 
@@ -14,6 +15,8 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
 - 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).
 
+### [Change log](hardware/esp8266com/esp8266/changes.md)
+
 ### Building latest version from source ###
 ```
 $ git clone https://github.com/esp8266/Arduino.git
@@ -41,7 +44,7 @@ GPIO16 can be ```INPUT```, ```OUTPUT``` or ```INPUT_PULLDOWN```.
 ```analogRead(A0)``` reads the value of the ADC channel connected to the TOUT pin.
 
 ```analogWrite(pin, value)``` enables software PWM on the given pin. PWM may be used on pins 0 to 15.
-Call ```analogWrite(pin, 0)``` to disable PWM on the pin.
+Call ```analogWrite(pin, 0)``` to disable PWM on the pin. ```value``` may be in range from 0 to ```PWMRANGE```, which is currently equal to 1023.
 
 Pin interrupts are supported through ```attachInterrupt```, ```detachInterrupt``` functions.
 Interrupts may be attached to any GPIO pin, except GPIO16. Standard Arduino interrupt
@@ -85,7 +88,7 @@ Both ```Serial``` and ```Serial1``` objects support 5, 6, 7, 8 data bits, odd (O
 #### Progmem ####
 
 The Program memory features work much the same way as on a regular Arduino; placing read only data and strings in read only memory and freeing heap for your application.
-The important difference is that on the esp8266 the literal strings are not pooled.  This means that the same literal string defined inside a ```F("")``` and/or ```PSTR("")``` will take up space for each instance in the code.  So you will need to manage the duplicate strings yourself.
+The important difference is that on the esp8266 the literal strings are not pooled.  This means that the same literal string defined inside a ```F("")``` and/or ```PSTR("")``` will take up space for each instance in the code. So you will need to manage the duplicate strings yourself.
 
 #### WiFi(ESP8266WiFi library) ####
 
@@ -171,8 +174,8 @@ Several APIs may be used to get flash chip info:
 #### 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
-Note that if you have OneWire library in your Arduino/libraries folder, it will be used
-instead of the one that comes with the Arduino IDE (this one).
+Note that if you already have OneWire library in your Arduino/libraries folder, it will be used
+instead of the one that comes with this package.
 
 #### mDNS responder (ESP8266mDNS library) ####
 
@@ -185,11 +188,12 @@ See attached example and library README file for details.
 Libraries that don't rely on low-level access to AVR registers should work well. Here are a few libraries that were verified to work:
 
 - [aREST](https://github.com/marcoschwartz/aREST) REST API handler library.
-- [PubSubClient](https://github.com/knolleary/pubsubclient) MQTT library. Use this [sample](https://gist.github.com/igrr/7f7e7973366fc01d6393) to get started.
+- [PubSubClient](https://github.com/Imroy/pubsubclient) MQTT library by @Imroy.
 - [DHT11](https://github.com/adafruit/DHT-sensor-library) - initialize DHT as follows: ```DHT dht(DHTPIN, DHTTYPE, 15);```
 - [DallasTemperature](https://github.com/milesburton/Arduino-Temperature-Control-Library.git)
 - [NeoPixelBus](https://github.com/Makuna/NeoPixelBus) - Arduino NeoPixel library compatible with esp8266.
 - [RTC](https://github.com/Makuna/Rtc) - Arduino Library for Ds1307 & Ds3231 compatible with esp8266.
+- [Blynk](https://github.com/blynkkk/blynk-library) - easy IoT framework for Makers (check out the [Kickstarter page](http://tiny.cc/blynk-kick)).
 
 #### Upload via serial port ####
 Pick the correct serial port.
@@ -253,3 +257,7 @@ Espressif SDK included in this build is under Espressif Public License.
 Esptool written by Christian Klippel is licensed under GPLv2, currently maintained by Ivan Grokhotkov: https://github.com/igrr/esptool-ck.
 
 ESP8266 core support, ESP8266WiFi, Ticker, ESP8266WebServer libraries were written by Ivan Grokhotkov, [email protected].
+
+[SPI Flash File System (SPIFFS)](https://github.com/pellepl/spiffs) written by Peter Andersson is used in this project. It is distributed under MIT license.
+
+

build/build_board_manager_package.sh

@@ -81,10 +81,10 @@ cat << EOF > package_esp8266com_index.json
         },
         {
             "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"
+            "url":"http://arduino.esp8266.com/esptool-0.4.4-5-g744c44d-osx.tar.gz",
+            "archiveFileName":"esptool-0.4.4-5-g744c44d-osx.tar.gz",
+            "checksum":"SHA-256:d8bc920e046fcc668b31cda63ac5553b4c07a6db12bfd0abc9005fc94628afcb",
+            "size":"12133"
         },
         {
             "host":"x86_64-pc-linux-gnu",
@@ -115,10 +115,10 @@ cat << EOF > package_esp8266com_index.json
         },
         {
            "host":"x86_64-apple-darwin",
-           "url":"http://arduino.esp8266.com/osx-xtensa-lx106-elf-gb404fb9.tar.gz",
-           "archiveFileName":"osx-xtensa-lx106-elf-gb404fb9.tar.gz",
-           "checksum":"SHA-256:540be2ca32637584463a4a4d04717f6c79c7355e336b8c3578b0947218cf92b9",
-           "size":"35189446"
+           "url":"http://arduino.esp8266.com/osx-xtensa-lx106-elf-gb404fb9-2.tar.gz",
+           "archiveFileName":"osx-xtensa-lx106-elf-gb404fb9-2.tar.gz",
+           "checksum":"SHA-256:0cf150193997bd1355e0f49d3d49711730035257bc1aee1eaaad619e56b9e4e6",
+           "size":"35385382"
         },
         {
            "host":"x86_64-pc-linux-gnu",

hardware/esp8266com/esp8266/changes.md

@@ -1,21 +1,30 @@
+# Change log
 
+## 1.6.4-673-g8cd3697
+May 22, 2015
 
-# Current version
+### Tools
+
+- Add 32-bit Linux toolchain.
+- Rebuild toolchain and esptool with support for OS X down to 10.6.
+
+### Libraries
 
-- Add 32-bit Linux toolchain
 - Better connection handling in ESP8266WebServer.
   The server now sends Content-Length and Connection: close headers,
   then waits for the client to disconnect. By not closing the connection
-  actively, server avoids TIME_WAIT TCP state, and the TCP stack is able to 
+  actively, server avoids TIME_WAIT TCP state, and TCP stack is able to 
   release the memory immediately, without waiting for 2xMSL period. 
   If the client doesn't disconnect in 2000ms, the server closes the connection
   actively.
 - Add Hash library, which has a function to calculate SHA1 hash.
+- SD, Adafruit_ILI9341, and OneWire libraries are now bundled.
+- Fix incorrect sector calculation in EEPROM library.
 
 ---
 
-# 1.6.4-g545ffde
-19 May, 2015
+## 1.6.4-628-g545ffde
+May 19, 2015
 
-- Initial release of board manager package
+- Initial release of Boards Manager package for ESP8266 platform.
 

hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp

@@ -38,8 +38,9 @@ extern "C" void esp_schedule();
 extern "C" void esp_yield();
 
 ESP8266WiFiClass::ESP8266WiFiClass()
+: _useApMode(false)
+, _useClientMode(false)
 {
-
 }
 
 void ESP8266WiFiClass::mode(WiFiMode m)
@@ -49,34 +50,56 @@ void ESP8266WiFiClass::mode(WiFiMode m)
     ETS_UART_INTR_ENABLE();
 }
 
-
-int ESP8266WiFiClass::begin(const char* ssid)
-{
-    return begin(ssid, 0);
+int ESP8266WiFiClass::begin(char* ssid, char *passphrase, int32_t channel, uint8_t bssid[6]){
+    return begin((const char*) ssid, (const char*) passphrase, channel, bssid);
 }
 
+int ESP8266WiFiClass::begin(const char* ssid, const char *passphrase, int32_t channel, uint8_t bssid[6]){
+    _useClientMode = true;
 
-int ESP8266WiFiClass::begin(const char* ssid, const char *passphrase)
-{
-    if ((wifi_get_opmode() & 1) == 0)//1 and 3 have STA enabled
-    {
+    if(_useApMode) {
         // turn on AP+STA mode
         mode(WIFI_AP_STA);
+    } else {
+        // turn on STA mode
+        mode(WIFI_STA);
+    }
+
+    if(!ssid || strlen(ssid) > 31) {
+        // fail SSID to long or missing!
+        return WL_CONNECT_FAILED;
+    }
+
+    if(passphrase && strlen(passphrase) > 63) {
+        // fail passphrase to long!
+        return WL_CONNECT_FAILED;
     }
 
     struct station_config conf;
     strcpy(reinterpret_cast<char*>(conf.ssid), ssid);
-    if (passphrase)
+
+    if (passphrase) {
         strcpy(reinterpret_cast<char*>(conf.password), passphrase);
-    else
+    } else {
         *conf.password = 0;
+    }
 
-    conf.bssid_set = 0;
+    if (bssid) {
+        conf.bssid_set = 1;
+        memcpy((void *) &conf.bssid[0], (void *) bssid, 6);
+    } else {
+        conf.bssid_set = 0;
+    }
 
     ETS_UART_INTR_DISABLE();
     wifi_station_set_config(&conf);
     wifi_station_connect();
     ETS_UART_INTR_ENABLE();
+
+    if(channel > 0 && channel <= 13) {
+        wifi_set_channel(channel);
+    }
+
     wifi_station_dhcpc_start();
     return status();
 }
@@ -120,10 +143,22 @@ void ESP8266WiFiClass::softAP(const char* ssid)
 
 void ESP8266WiFiClass::softAP(const char* ssid, const char* passphrase, int channel)
 {
-    if (wifi_get_opmode() < WIFI_AP)//will be OFF or STA
-    {
+    if(_useClientMode) {
         // turn on AP+STA mode
         mode(WIFI_AP_STA);
+    } else {
+        // turn on STA mode
+        mode(WIFI_AP);
+    }
+
+    if(!ssid || strlen(ssid) > 31) {
+        // fail SSID to long or missing!
+        return;
+    }
+
+    if(passphrase && strlen(passphrase) > 63) {
+        // fail passphrase to long!
+        return;
     }
 
     struct softap_config conf;
@@ -209,22 +244,16 @@ char* ESP8266WiFiClass::SSID()
     return reinterpret_cast<char*>(conf.ssid);
 }
 
-// uint8_t* ESP8266WiFiClass::BSSID(uint8_t* bssid)
-// {
-//  uint8_t* _bssid = WiFiDrv::getCurrentBSSID();
-//  memcpy(bssid, _bssid, WL_MAC_ADDR_LENGTH);
-//     return bssid;
-// }
-
-// int32_t ESP8266WiFiClass::RSSI()
-// {
-//     return WiFiDrv::getCurrentRSSI();
-// }
+uint8_t* ESP8266WiFiClass::BSSID(void)
+{
+    static struct station_config conf;
+    wifi_station_get_config(&conf);
+    return reinterpret_cast<uint8_t*>(conf.bssid);
+}
 
-// uint8_t ESP8266WiFiClass::encryptionType()
-// {
-//     return WiFiDrv::getCurrentEncryptionType();
-// }
+int32_t ESP8266WiFiClass::Channel(void) {
+    return wifi_get_channel();
+}
 
 extern "C"
 {
@@ -298,7 +327,7 @@ int8_t ESP8266WiFiClass::scanNetworks()
 
 void * ESP8266WiFiClass::_getScanInfoByIndex(int i)
 {
-    if (!ESP8266WiFiClass::_scanResult || i > ESP8266WiFiClass::_scanCount)
+    if (!ESP8266WiFiClass::_scanResult || (size_t)i > ESP8266WiFiClass::_scanCount)
     {
         return 0;
     }
@@ -315,6 +344,49 @@ const char* ESP8266WiFiClass::SSID(uint8_t i)
     return 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;
+}
+
+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));