mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix WebSend compile warning 

Fix WebSend compile warning
This commit is contained in:
Theo Arends 2019-02-21 09:48:58 +01:00
parent 280dd25a8b
commit cfd3f3f4f5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sonoff/xdrv_01_webserver.ino
View File

@ -2179,7 +2179,7 @@ int WebSend(char *buffer)
user = Trim(user); // user = |admin| user = Trim(user); // user = |admin|
if (password) { password = Trim(password); } // password = |joker| if (password) { password = Trim(password); } // password = |joker|
} }
command = Trim(command); // command = |POWER1 ON| or |/any/link/starting/with/a/slash.php?log=123| command = Trim(command); // command = |POWER1 ON| or |/any/link/starting/with/a/slash.php?log=123|
if (command[0] != '/') { if (command[0] != '/') {
url += F("/cm?"); // url = |http://192.168.178.86/cm?| url += F("/cm?"); // url = |http://192.168.178.86/cm?|
@ -2197,8 +2197,14 @@ int WebSend(char *buffer)
//snprintf_P(log_data, sizeof(log_data), PSTR("DBG: Uri |%s|"), url.c_str()); //snprintf_P(log_data, sizeof(log_data), PSTR("DBG: Uri |%s|"), url.c_str());
//AddLog(LOG_LEVEL_DEBUG); //AddLog(LOG_LEVEL_DEBUG);
#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2)
HTTPClient http; HTTPClient http;
if (http.begin(UrlEncode(url))) { // UrlEncode(url) = |http://192.168.178.86/cm?cmnd=POWER1%20ON| if (http.begin(UrlEncode(url))) { // UrlEncode(url) = |http://192.168.178.86/cm?cmnd=POWER1%20ON|
#else
WiFiClient http_client;
HTTPClient http;
if (http.begin(client, UrlEncode(url))) { // UrlEncode(url) = |http://192.168.178.86/cm?cmnd=POWER1%20ON|
#endif
int http_code = http.GET(); // Start connection and send HTTP header int http_code = http.GET(); // Start connection and send HTTP header
if (http_code > 0) { // http_code will be negative on error if (http_code > 0) { // http_code will be negative on error
if (http_code == HTTP_CODE_OK || http_code == HTTP_CODE_MOVED_PERMANENTLY) { if (http_code == HTTP_CODE_OK || http_code == HTTP_CODE_MOVED_PERMANENTLY) {
@ -2209,8 +2215,7 @@ int WebSend(char *buffer)
for (uint16_t i = 0; i < result.length(); i++) { for (uint16_t i = 0; i < result.length(); i++) {
char text = result.charAt(i); char text = result.charAt(i);
if (text > 31) { // Remove control characters like linefeed if (text > 31) { // Remove control characters like linefeed
mqtt_data[j] = result.charAt(i); mqtt_data[j++] = text;
j++;
if (j == sizeof(mqtt_data) -2) { break; } if (j == sizeof(mqtt_data) -2) { break; }
} }
} }
@ -2222,7 +2227,7 @@ int WebSend(char *buffer)
} else { } else {
status = 2; // Connection failed status = 2; // Connection failed
} }
http.end(); http.end(); // Clean up connection data
} else { } else {
status = 3; // Host not found or connection error status = 3; // Host not found or connection error
} }