diff --git a/doc/ota_updates.md b/doc/ota_updates.md index 708981966..d607c4e11 100644 --- a/doc/ota_updates.md +++ b/doc/ota_updates.md @@ -52,8 +52,8 @@ or it return header 304 to notify the ESP that no Update is needed. ```cpp t_httpUpdate_return ret = ESPhttpUpdate.update("192.168.0.2", 80, "/esp/update/arduino.php", "optional current version string here"); switch(ret) { - case HTTP_UPDATE_FAILD: - Serial.println("[update] Update fail."); + case HTTP_UPDATE_FAILED: + Serial.println("[update] Update failed."); break; case HTTP_UPDATE_NO_UPDATES: Serial.println("[update] Update no Update."); diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp index b3c522579..149a5c653 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp @@ -472,7 +472,7 @@ int8_t ESP8266WiFiClass::scanComplete() { return ESP8266WiFiClass::_scanCount; } - return WIFI_SCAN_FAILD; + return WIFI_SCAN_FAILED; } void ESP8266WiFiClass::scanDelete() @@ -527,7 +527,7 @@ int8_t ESP8266WiFiClass::scanNetworks(bool async) esp_yield(); return ESP8266WiFiClass::_scanCount; } else { - return WIFI_SCAN_FAILD; + return WIFI_SCAN_FAILED; } } @@ -702,12 +702,12 @@ void wifi_wps_status_cb(wps_cb_status status) switch (status) { case WPS_CB_ST_SUCCESS: if(!wifi_wps_disable()) { - DEBUGV("wps disable faild\n"); + DEBUGV("wps disable failed\n"); } wifi_station_connect(); break; case WPS_CB_ST_FAILED: - DEBUGV("wps FAILD\n"); + DEBUGV("wps FAILED\n"); break; case WPS_CB_ST_TIMEOUT: DEBUGV("wps TIMEOUT\n"); @@ -738,23 +738,23 @@ bool ESP8266WiFiClass::beginWPSConfig(void) { DEBUGV("wps begin\n"); if(!wifi_wps_disable()) { - DEBUGV("wps disable faild\n"); + DEBUGV("wps disable failed\n"); return false; } // so far only WPS_TYPE_PBC is supported (SDK 1.2.0) if(!wifi_wps_enable(WPS_TYPE_PBC)) { - DEBUGV("wps enable faild\n"); + DEBUGV("wps enable failed\n"); return false; } if(!wifi_set_wps_cb((wps_st_cb_t) &wifi_wps_status_cb)) { - DEBUGV("wps cb faild\n"); + DEBUGV("wps cb failed\n"); return false; } if(!wifi_wps_start()) { - DEBUGV("wps start faild\n"); + DEBUGV("wps start failed\n"); return false; } diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFi.h b/libraries/ESP8266WiFi/src/ESP8266WiFi.h index 4fcc21f26..143d61cb5 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFi.h +++ b/libraries/ESP8266WiFi/src/ESP8266WiFi.h @@ -33,7 +33,7 @@ extern "C" { #include "WiFiServer.h" #define WIFI_SCAN_RUNNING (-1) -#define WIFI_SCAN_FAILD (-2) +#define WIFI_SCAN_FAILED (-2) enum WiFiMode { WIFI_OFF = 0, WIFI_STA = 1, WIFI_AP = 2, WIFI_AP_STA = 3 }; diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp index f874441bd..23b82e648 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp @@ -133,13 +133,13 @@ wl_status_t ESP8266WiFiMulti::run(void) { DEBUG_WIFI_MULTI("[WIFI] Channel: %d\n", WiFi.channel()); break; case WL_NO_SSID_AVAIL: - DEBUG_WIFI_MULTI("[WIFI] Connecting Faild AP not found.\n"); + DEBUG_WIFI_MULTI("[WIFI] Connecting Failed AP not found.\n"); break; case WL_CONNECT_FAILED: - DEBUG_WIFI_MULTI("[WIFI] Connecting Faild.\n"); + DEBUG_WIFI_MULTI("[WIFI] Connecting Failed.\n"); break; default: - DEBUG_WIFI_MULTI("[WIFI] Connecting Faild (%d).\n", status); + DEBUG_WIFI_MULTI("[WIFI] Connecting Failed (%d).\n", status); break; } } else { diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp index e4e062ff0..85dafa45f 100644 --- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp +++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp @@ -35,12 +35,12 @@ ESP8266HTTPUpdate::~ESP8266HTTPUpdate(void) { t_httpUpdate_return ESP8266HTTPUpdate::update(const char * host, uint16_t port, const char * url, const char * current_version) { - t_httpUpdate_return ret = HTTP_UPDATE_FAILD; + t_httpUpdate_return ret = HTTP_UPDATE_FAILED; WiFiClient tcp; DEBUG_HTTP_UPDATE("[httpUpdate] connected to %s:%u %s .... ", host, port, url); if(!tcp.connect(host, port)) { - DEBUG_HTTP_UPDATE("faild.\n"); + DEBUG_HTTP_UPDATE("failed.\n"); return ret; } DEBUG_HTTP_UPDATE("ok.\n"); @@ -125,7 +125,7 @@ t_httpUpdate_return ESP8266HTTPUpdate::update(const char * host, uint16_t port, case 200: ///< OK (Start Update) if(len > 0) { if(len > ESP.getFreeSketchSpace()) { - ret = HTTP_UPDATE_FAILD; + ret = HTTP_UPDATE_FAILED; DEBUG_HTTP_UPDATE("[httpUpdate] FreeSketchSpace to low (%d) needed: %d\n", ESP.getFreeSketchSpace(), len); } else { @@ -140,13 +140,13 @@ t_httpUpdate_return ESP8266HTTPUpdate::update(const char * host, uint16_t port, tcp.stop(); ESP.restart(); } else { - ret = HTTP_UPDATE_FAILD; + ret = HTTP_UPDATE_FAILED; DEBUG_HTTP_UPDATE("[httpUpdate] Update failed\n"); } } } else { - ret = HTTP_UPDATE_FAILD; - DEBUG_HTTP_UPDATE("[httpUpdate]Content-Length is 0?!\n"); + ret = HTTP_UPDATE_FAILED; + DEBUG_HTTP_UPDATE("[httpUpdate] Content-Length is 0?!\n"); } break; case 304: @@ -157,7 +157,7 @@ t_httpUpdate_return ESP8266HTTPUpdate::update(const char * host, uint16_t port, ///< Forbidden // todo handle login default: - ret = HTTP_UPDATE_FAILD; + ret = HTTP_UPDATE_FAILED; DEBUG_HTTP_UPDATE("[httpUpdate] Code is (%d)\n", code); break; } diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h index a167f9fe4..334b0e43c 100644 --- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h +++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h @@ -38,7 +38,7 @@ #endif typedef enum { - HTTP_UPDATE_FAILD, + HTTP_UPDATE_FAILED, HTTP_UPDATE_NO_UPDATES, HTTP_UPDATE_OK } t_httpUpdate_return;