arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Merge pull request #976 from marvinroger/master

Browse Source 
Fix FAILD typo
This commit is contained in:
Ivan Grokhotkov 2015-11-06 17:03:42 +03:00
commit 66c69b32ad
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/ota_updates.md
View File

@ -52,8 +52,8 @@ or it return header 304 to notify the ESP that no Update is needed.
```cpp ```cpp
t_httpUpdate_return ret = ESPhttpUpdate.update("192.168.0.2", 80, "/esp/update/arduino.php", "optional current version string here"); t_httpUpdate_return ret = ESPhttpUpdate.update("192.168.0.2", 80, "/esp/update/arduino.php", "optional current version string here");
switch(ret) { switch(ret) {
case HTTP_UPDATE_FAILD: case HTTP_UPDATE_FAILED:
Serial.println("[update] Update fail."); Serial.println("[update] Update failed.");
break; break;
case HTTP_UPDATE_NO_UPDATES: case HTTP_UPDATE_NO_UPDATES:
Serial.println("[update] Update no Update."); Serial.println("[update] Update no Update.");

16
libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
View File

@ -472,7 +472,7 @@ int8_t ESP8266WiFiClass::scanComplete() {
return ESP8266WiFiClass::_scanCount; return ESP8266WiFiClass::_scanCount;
} }
return WIFI_SCAN_FAILD; return WIFI_SCAN_FAILED;
} }
void ESP8266WiFiClass::scanDelete() void ESP8266WiFiClass::scanDelete()
@ -527,7 +527,7 @@ int8_t ESP8266WiFiClass::scanNetworks(bool async)
esp_yield(); esp_yield();
return ESP8266WiFiClass::_scanCount; return ESP8266WiFiClass::_scanCount;
} else { } else {
return WIFI_SCAN_FAILD; return WIFI_SCAN_FAILED;
} }
} }
@ -702,12 +702,12 @@ void wifi_wps_status_cb(wps_cb_status status)
switch (status) { switch (status) {
case WPS_CB_ST_SUCCESS: case WPS_CB_ST_SUCCESS:
if(!wifi_wps_disable()) { if(!wifi_wps_disable()) {
DEBUGV("wps disable faild\n"); DEBUGV("wps disable failed\n");
} }
wifi_station_connect(); wifi_station_connect();
break; break;
case WPS_CB_ST_FAILED: case WPS_CB_ST_FAILED:
DEBUGV("wps FAILD\n"); DEBUGV("wps FAILED\n");
break; break;
case WPS_CB_ST_TIMEOUT: case WPS_CB_ST_TIMEOUT:
DEBUGV("wps TIMEOUT\n"); DEBUGV("wps TIMEOUT\n");
@ -738,23 +738,23 @@ bool ESP8266WiFiClass::beginWPSConfig(void) {
DEBUGV("wps begin\n"); DEBUGV("wps begin\n");
if(!wifi_wps_disable()) { if(!wifi_wps_disable()) {
DEBUGV("wps disable faild\n"); DEBUGV("wps disable failed\n");
return false; return false;
} }
// so far only WPS_TYPE_PBC is supported (SDK 1.2.0) // so far only WPS_TYPE_PBC is supported (SDK 1.2.0)
if(!wifi_wps_enable(WPS_TYPE_PBC)) { if(!wifi_wps_enable(WPS_TYPE_PBC)) {
DEBUGV("wps enable faild\n"); DEBUGV("wps enable failed\n");
return false; return false;
} }
if(!wifi_set_wps_cb((wps_st_cb_t) &wifi_wps_status_cb)) { 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; return false;
} }
if(!wifi_wps_start()) { if(!wifi_wps_start()) {
DEBUGV("wps start faild\n"); DEBUGV("wps start failed\n");
return false; return false;
} }

2
libraries/ESP8266WiFi/src/ESP8266WiFi.h
View File

@ -33,7 +33,7 @@ extern "C" {
#include "WiFiServer.h" #include "WiFiServer.h"
#define WIFI_SCAN_RUNNING (-1) #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 }; enum WiFiMode { WIFI_OFF = 0, WIFI_STA = 1, WIFI_AP = 2, WIFI_AP_STA = 3 };

6
libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp
View File

@ -133,13 +133,13 @@ wl_status_t ESP8266WiFiMulti::run(void) {
DEBUG_WIFI_MULTI("[WIFI] Channel: %d\n", WiFi.channel()); DEBUG_WIFI_MULTI("[WIFI] Channel: %d\n", WiFi.channel());
break; break;
case WL_NO_SSID_AVAIL: 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; break;
case WL_CONNECT_FAILED: case WL_CONNECT_FAILED:
DEBUG_WIFI_MULTI("[WIFI] Connecting Faild.\n"); DEBUG_WIFI_MULTI("[WIFI] Connecting Failed.\n");
break; break;
default: default:
DEBUG_WIFI_MULTI("[WIFI] Connecting Faild (%d).\n", status); DEBUG_WIFI_MULTI("[WIFI] Connecting Failed (%d).\n", status);
break; break;
} }
} else { } else {

14
libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
View File

@ -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 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; WiFiClient tcp;
DEBUG_HTTP_UPDATE("[httpUpdate] connected to %s:%u %s .... ", host, port, url); DEBUG_HTTP_UPDATE("[httpUpdate] connected to %s:%u %s .... ", host, port, url);
if(!tcp.connect(host, port)) { if(!tcp.connect(host, port)) {
DEBUG_HTTP_UPDATE("faild.\n"); DEBUG_HTTP_UPDATE("failed.\n");
return ret; return ret;
} }
DEBUG_HTTP_UPDATE("ok.\n"); 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) case 200: ///< OK (Start Update)
if(len > 0) { if(len > 0) {
if(len > ESP.getFreeSketchSpace()) { 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); DEBUG_HTTP_UPDATE("[httpUpdate] FreeSketchSpace to low (%d) needed: %d\n", ESP.getFreeSketchSpace(), len);
} else { } else {
@ -140,13 +140,13 @@ t_httpUpdate_return ESP8266HTTPUpdate::update(const char * host, uint16_t port,
tcp.stop(); tcp.stop();
ESP.restart(); ESP.restart();
} else { } else {
ret = HTTP_UPDATE_FAILD; ret = HTTP_UPDATE_FAILED;
DEBUG_HTTP_UPDATE("[httpUpdate] Update failed\n"); DEBUG_HTTP_UPDATE("[httpUpdate] Update failed\n");
} }
} }
} else { } else {
ret = HTTP_UPDATE_FAILD; ret = HTTP_UPDATE_FAILED;
DEBUG_HTTP_UPDATE("[httpUpdate]Content-Length is 0?!\n"); DEBUG_HTTP_UPDATE("[httpUpdate] Content-Length is 0?!\n");
} }
break; break;
case 304: case 304:
@ -157,7 +157,7 @@ t_httpUpdate_return ESP8266HTTPUpdate::update(const char * host, uint16_t port,
///< Forbidden ///< Forbidden
// todo handle login // todo handle login
default: default:
ret = HTTP_UPDATE_FAILD; ret = HTTP_UPDATE_FAILED;
DEBUG_HTTP_UPDATE("[httpUpdate] Code is (%d)\n", code); DEBUG_HTTP_UPDATE("[httpUpdate] Code is (%d)\n", code);
break; break;
} }

2
libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
View File

@ -38,7 +38,7 @@
#endif #endif
typedef enum { typedef enum {
HTTP_UPDATE_FAILD, HTTP_UPDATE_FAILED,
HTTP_UPDATE_NO_UPDATES, HTTP_UPDATE_NO_UPDATES,
HTTP_UPDATE_OK HTTP_UPDATE_OK
} t_httpUpdate_return; } t_httpUpdate_return;