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

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

This commit is contained in:
Gennaro Tortone 2018-01-25 20:33:20 +01:00
parent dd5ad2e6df cfdbe8af95
commit dc519d7a12
2 changed files with 2648 additions and 1409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4053
arduino/version 2.4.0/boards.txt
View File

File diff suppressed because it is too large Load Diff

4
sonoff/xsns_interface.ino
View File

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