Merge remote-tracking branch 'upstream/development' into development

This commit is contained in:
Gennaro Tortone 2018-01-25 20:33:20 +01:00
commit dc519d7a12
2 changed files with 2648 additions and 1409 deletions

File diff suppressed because it is too large Load Diff

View File

@ -119,13 +119,16 @@ boolean XsnsCall(byte Function)
boolean result = false;
for (byte x = 0; x < xsns_present; x++) {
#ifdef USE_WEBSERVER
if (FUNC_WEB_APPEND == Function) {
mqtt_data[0] = '\0';
}
#endif // USE_WEBSERVER
result = xsns_func_ptr[x](Function);
if (result) {
break;
}
#ifdef USE_WEBSERVER
if ((FUNC_WEB_APPEND == Function) && strlen(mqtt_data)) {
if (D_DECIMAL_SEPARATOR[0] != '.') {
for (int i = 0; i < strlen(mqtt_data); i++) {
@ -136,6 +139,7 @@ boolean XsnsCall(byte Function)
}
WebServer->sendContent(mqtt_data);
}
#endif // USE_WEBSERVER
}
return result;