Merge branch 'master' into pr-305-rf-cal-phy-data

Author: mhightower83

doc/ota_updates/readme.rst

@@ -501,7 +501,7 @@ In case OTA update fails dead after entering modifications in your sketch, you c
 HTTP Server
 -----------
 
-``ESPhttpUpdate`` class can check for updates and download a binary file from HTTP web server. It is possible to download updates from every IP or domain address on the network or Internet.
+``ESP8266HTTPUpdate`` class can check for updates and download a binary file from HTTP web server. It is possible to download updates from every IP or domain address on the network or Internet.
 
 Note that by default this class closes all other connections except the one used by the update, this is because the update method blocks. This means that if there's another application receiving data then TCP packets will build up in the buffer leading to out of memory errors causing the OTA update to fail. There's also a limited number of receive buffers available and all may be used up by other applications.
 
@@ -523,6 +523,8 @@ Simple updater downloads the file every time the function is called.
 
 .. code:: cpp
 
+    #include <ESP8266httpUpdate.h>
+    
     WiFiClient client;
     ESPhttpUpdate.update(client, "192.168.0.2", 80, "/arduino.bin");
 
@@ -535,6 +537,8 @@ The server-side script can respond as follows: - response code 200, and send the
 
 .. code:: cpp
 
+    #include <ESP8266httpUpdate.h>
+    
     WiFiClient client;
     t_httpUpdate_return ret = ESPhttpUpdate.update(client, "192.168.0.2", 80, "/esp/update/arduino.php", "optional current version string here");
     switch(ret) {

libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp

@@ -353,15 +353,32 @@ bool ESP8266WiFiSTAClass::reconnect() {
 }
 
 /**
- * Disconnect from the network
- * @param wifioff
+ * Disconnect from the network with clearing saved credentials
+ * @param wifioff Bool indicating whether STA should be disabled.
  * @return  one value of wl_status_t enum
  */
 bool ESP8266WiFiSTAClass::disconnect(bool wifioff) {
+    // Disconnect with clearing saved credentials.
+    return disconnect(wifioff, true);
+}
+
+/**
+ * Disconnect from the network
+ * @param wifioff Bool indicating whether STA should be disabled. 
+ * @param eraseCredentials Bool indicating whether saved credentials should be erased.
+ * @return  one value of wl_status_t enum
+ */
+bool ESP8266WiFiSTAClass::disconnect(bool wifioff, bool eraseCredentials) {
     bool ret = false;
+
+    // Read current config.
     struct station_config conf;
-    *conf.ssid = 0;
-    *conf.password = 0;
+    wifi_station_get_config(&conf);
+
+    if (eraseCredentials) {
+        memset(&conf.ssid, 0, sizeof(conf.ssid));
+        memset(&conf.password, 0, sizeof(conf.password));
+    }
 
     // API Reference: wifi_station_disconnect() need to be called after system initializes and the ESP8266 Station mode is enabled.
     if (WiFi.getMode() & WIFI_STA)

libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h

@@ -48,7 +48,9 @@ class ESP8266WiFiSTAClass: public LwipIntf {
         bool config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1 = (uint32_t)0x00000000, IPAddress dns2 = (uint32_t)0x00000000);
 
         bool reconnect();
+
         bool disconnect(bool wifioff = false);
+        bool disconnect(bool wifioff, bool eraseCredentials);
 
         bool isConnected();
 

libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp

@@ -208,6 +208,9 @@ HTTPUpdateResult ESP8266HTTPUpdate::handleUpdate(HTTPClient& http, const String&
     DEBUG_HTTP_UPDATE("[httpUpdate] Server header:\n");
     DEBUG_HTTP_UPDATE("[httpUpdate]  - code: %d\n", code);
     DEBUG_HTTP_UPDATE("[httpUpdate]  - len: %d\n", len);
+    if(code != HTTP_CODE_OK) {
+        DEBUG_HTTP_UPDATE("[httpUpdate]  - payload: %s\n", http.getString().c_str());
+    }
 
     String md5;
     if (_md5Sum.length()) {

libraries/Servo/src/Servo.cpp

@@ -58,7 +58,7 @@ Servo::~Servo() {
 
 uint8_t Servo::attach(int pin)
 {
-  return attach(pin, DEFAULT_MIN_PULSE_WIDTH, DEFAULT_MAX_PULSE_WIDTH);
+  return attach(pin, _minUs, _maxUs);
 }
 
 uint8_t Servo::attach(int pin, uint16_t minUs, uint16_t maxUs)
@@ -94,7 +94,6 @@ void Servo::detach()
     delay(REFRESH_INTERVAL / 1000); // long enough to complete active period under all circumstances.
     stopWaveform(_pin);
     _attached = false;
-    _valueUs = DEFAULT_NEUTRAL_PULSE_WIDTH;
   }
 }
 

libraries/Servo/src/Servo.h

@@ -29,7 +29,8 @@
 //
 //   attach(pin)  - Attaches a servo motor to an i/o pin.
 //   attach(pin, min, max) - Attaches to a pin setting min and max values in microseconds
-//   default min is 1000, max is 2000
+//   attach(pin, min, max, value) - Attaches to a pin setting min, max, and current values in microseconds
+//   default min is 1000, max is 2000, and value is 1500.
 //
 //   write()     - Sets the servo angle in degrees.  (invalid angle that is valid as pulse in microseconds is treated as microseconds)
 //   writeMicroseconds() - Sets the servo pulse width in microseconds