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

6.4.1.21 Fix exception on GUI 

6.4.1.21 20190309
 * Fix exception on GUI Configure Logging and Configure Other (#5424)
This commit is contained in:
Theo Arends 2019-03-09 14:39:48 +01:00
parent aec3842bee
commit ecbe6ac618
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sonoff/_changelog.ino
View File

@ -1,4 +1,7 @@
/* 6.4.1.20 20190304 /* 6.4.1.21 20190309
* Fix exception on GUI Configure Logging and Configure Other (#5424)
*
* 6.4.1.20 20190304
* Changed webserver content handling from single String to small Chunks increasing RAM * Changed webserver content handling from single String to small Chunks increasing RAM
* Changed logging message handling * Changed logging message handling
* Fix additional characters in fallbacktopic, hostname and mqttclient on core 2.5.0 (#5359, #5417) * Fix additional characters in fallbacktopic, hostname and mqttclient on core 2.5.0 (#5359, #5417)

2
sonoff/sonoff_version.h
View File

@ -20,7 +20,7 @@
#ifndef _SONOFF_VERSION_H_ #ifndef _SONOFF_VERSION_H_
#define _SONOFF_VERSION_H_ #define _SONOFF_VERSION_H_
#define VERSION 0x06040114 #define VERSION 0x06040115
#define D_PROGRAMNAME "Sonoff-Tasmota" #define D_PROGRAMNAME "Sonoff-Tasmota"
#define D_AUTHOR "Theo Arends" #define D_AUTHOR "Theo Arends"

6
sonoff/xdrv_01_webserver.ino
View File

@ -1368,7 +1368,7 @@ void HandleLoggingConfiguration(void)
(i == llevel) ? " selected" : "", i, i, (i == llevel) ? " selected" : "", i, i,
GetTextIndexed(stemp1, sizeof(stemp1), i, kLoggingLevels)); GetTextIndexed(stemp1, sizeof(stemp1), i, kLoggingLevels));
} }
WSContentSend(PSTR("</select></p>")); WSContentSend(F("</select></p>"));
} }
WSContentSend_P(HTTP_FORM_LOG2, Settings.syslog_host, Settings.syslog_port, Settings.tele_period); WSContentSend_P(HTTP_FORM_LOG2, Settings.syslog_host, Settings.syslog_port, Settings.tele_period);
WSContentSend(FPSTR(HTTP_FORM_END)); WSContentSend(FPSTR(HTTP_FORM_END));
@ -1436,7 +1436,7 @@ void HandleOtherConfiguration(void)
} }
#ifdef USE_EMULATION #ifdef USE_EMULATION
WSContentSend(PSTR("<p></p><fieldset><legend><b>&nbsp;" D_EMULATION "&nbsp;</b></legend><p>")); // Keep close to Friendlynames so do not use <br/> WSContentSend(F("<p></p><fieldset><legend><b>&nbsp;" D_EMULATION "&nbsp;</b></legend><p>")); // Keep close to Friendlynames so do not use <br/>
for (uint8_t i = 0; i < EMUL_MAX; i++) { for (uint8_t i = 0; i < EMUL_MAX; i++) {
WSContentSend_P(PSTR("<input id='r%d' name='b2' type='radio' value='%d'%s><b>%s</b> %s<br/>"), // Different id only used for labels WSContentSend_P(PSTR("<input id='r%d' name='b2' type='radio' value='%d'%s><b>%s</b> %s<br/>"), // Different id only used for labels
i, i, i, i,
@ -1444,7 +1444,7 @@ void HandleOtherConfiguration(void)
GetTextIndexed(stemp, sizeof(stemp), i, kEmulationOptions), GetTextIndexed(stemp, sizeof(stemp), i, kEmulationOptions),
(i == EMUL_NONE) ? "" : (i == EMUL_WEMO) ? D_SINGLE_DEVICE : D_MULTI_DEVICE); (i == EMUL_NONE) ? "" : (i == EMUL_WEMO) ? D_SINGLE_DEVICE : D_MULTI_DEVICE);
} }
WSContentSend(PSTR("</p></fieldset>")); WSContentSend(F("</p></fieldset>"));
#endif // USE_EMULATION #endif // USE_EMULATION
WSContentSend(FPSTR(HTTP_FORM_END)); WSContentSend(FPSTR(HTTP_FORM_END));