jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-30 06:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into release-7.1

Browse Source
This commit is contained in:
Theo Arends 2019-11-25 18:01:09 +01:00
commit c676a5a3e4
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tasmota/xdrv_01_webserver.ino
View File

@ -130,7 +130,7 @@ const char HTTP_SCRIPT_ROOT[] PROGMEM =
"clearTimeout(lt);" "clearTimeout(lt);"
"rfsh=0;" "rfsh=0;"
"}" "}"
"}" "}";
#else // USE_SCRIPT_WEB_DISPLAY #else // USE_SCRIPT_WEB_DISPLAY
"function la(p){" "function la(p){"
"var a='';" "var a='';"
@ -149,9 +149,10 @@ const char HTTP_SCRIPT_ROOT[] PROGMEM =
"x.open('GET','.?m=1'+a,true);" // ?m related to WebServer->hasArg("m") "x.open('GET','.?m=1'+a,true);" // ?m related to WebServer->hasArg("m")
"x.send();" "x.send();"
"lt=setTimeout(la,%d);" // Settings.web_refresh "lt=setTimeout(la,%d);" // Settings.web_refresh
"}" "}";
#endif // USE_SCRIPT_WEB_DISPLAY #endif // USE_SCRIPT_WEB_DISPLAY
const char HTTP_SCRIPT_ROOT_PART2[] PROGMEM =
"function lc(v,i,p){" "function lc(v,i,p){"
"if(v=='h'||v=='d'){" // Hue or Brightness changed so change Saturation colors too "if(v=='h'||v=='d'){" // Hue or Brightness changed so change Saturation colors too
"var sl=eb('sl4').value;" "var sl=eb('sl4').value;"
@ -159,7 +160,6 @@ const char HTTP_SCRIPT_ROOT[] PROGMEM =
"}" "}"
"la('&'+v+i+'='+p);" "la('&'+v+i+'='+p);"
"}" "}"
"wl(la);"; "wl(la);";
const char HTTP_SCRIPT_WIFI[] PROGMEM = const char HTTP_SCRIPT_WIFI[] PROGMEM =
@ -766,9 +766,16 @@ void WSContentSend_P(const char* formatP, ...) // Content send snprintf_P ch
// This uses char strings. Be aware of sending %% if % is needed // This uses char strings. Be aware of sending %% if % is needed
va_list arg; va_list arg;
va_start(arg, formatP); va_start(arg, formatP);
vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg); int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
va_end(arg); va_end(arg);
#ifdef DEBUG_TASMOTA_CORE
if (len > (sizeof(mqtt_data) -1)) {
mqtt_data[33] = '\0';
DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
}
#endif
_WSContentSendBuffer(); _WSContentSendBuffer();
} }
@ -780,6 +787,13 @@ void WSContentSend_PD(const char* formatP, ...) // Content send snprintf_P ch
int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg); int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
va_end(arg); va_end(arg);
#ifdef DEBUG_TASMOTA_CORE
if (len > (sizeof(mqtt_data) -1)) {
mqtt_data[33] = '\0';
DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_PD size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
}
#endif
if (D_DECIMAL_SEPARATOR[0] != '.') { if (D_DECIMAL_SEPARATOR[0] != '.') {
for (uint32_t i = 0; i < len; i++) { for (uint32_t i = 0; i < len; i++) {
if ('.' == mqtt_data[i]) { if ('.' == mqtt_data[i]) {
@ -829,8 +843,16 @@ void WSContentSendStyle_P(const char* formatP, ...)
// This uses char strings. Be aware of sending %% if % is needed // This uses char strings. Be aware of sending %% if % is needed
va_list arg; va_list arg;
va_start(arg, formatP); va_start(arg, formatP);
vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg); int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg);
va_end(arg); va_end(arg);
#ifdef DEBUG_TASMOTA_CORE
if (len > (sizeof(mqtt_data) -1)) {
mqtt_data[33] = '\0';
DEBUG_CORE_LOG(PSTR("ERROR: WSContentSendStyle_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data);
}
#endif
_WSContentSendBuffer(); _WSContentSendBuffer();
} }
WSContentSend_P(HTTP_HEAD_STYLE3, WebColor(COL_TEXT), WSContentSend_P(HTTP_HEAD_STYLE3, WebColor(COL_TEXT),
@ -990,6 +1012,8 @@ void HandleRoot(void)
#else #else
WSContentSend_P(HTTP_SCRIPT_ROOT, Settings.web_refresh); WSContentSend_P(HTTP_SCRIPT_ROOT, Settings.web_refresh);
#endif #endif
WSContentSend_P(HTTP_SCRIPT_ROOT_PART2);
WSContentSendStyle(); WSContentSendStyle();
WSContentSend_P(PSTR("<div id='l1' name='l1'></div>")); WSContentSend_P(PSTR("<div id='l1' name='l1'></div>"));