Michal
/
printer-monitor
mirror of https://github.com/Qrome/printer-monitor
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qrome - updated access to PROGMEM data for ESP8266 Core 2.5.2 support

pull/99/head
David Payne 2019-05-29 15:59:04 -07:00
parent d59fa0da47
commit 993fdf6809
1 changed files with 1362 additions and 1362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
printermonitor/printermonitor.ino
View File

@ -526,7 +526,7 @@ void handleWeatherConfigure() {
html = getHeader(); html = getHeader();
server.sendContent(html); server.sendContent(html);
String form = (const char*)WEATHER_FORM; String form = FPSTR(WEATHER_FORM);
String isWeatherChecked = ""; String isWeatherChecked = "";
if (DISPLAYWEATHER) { if (DISPLAYWEATHER) {
isWeatherChecked = "checked='checked'"; isWeatherChecked = "checked='checked'";
@ -540,7 +540,7 @@ void handleWeatherConfigure() {
checked = "checked='checked'"; checked = "checked='checked'";
} }
form.replace("%METRIC%", checked); form.replace("%METRIC%", checked);
String options = (const char*)LANG_OPTIONS; String options = FPSTR(LANG_OPTIONS);
options.replace(">"+String(WeatherLanguage)+"<", " selected>"+String(WeatherLanguage)+"<"); options.replace(">"+String(WeatherLanguage)+"<", " selected>"+String(WeatherLanguage)+"<");
form.replace("%LANGUAGEOPTIONS%", options); form.replace("%LANGUAGEOPTIONS%", options);
server.sendContent(form); server.sendContent(form);
@ -621,7 +621,7 @@ void handleConfigure() {
server.sendContent(form); server.sendContent(form);
form = (const char*)CLOCK_FORM; form = FPSTR(CLOCK_FORM);
String isClockChecked = ""; String isClockChecked = "";
if (DISPLAYCLOCK) { if (DISPLAYCLOCK) {
@ -655,9 +655,9 @@ void handleConfigure() {
server.sendContent(form); server.sendContent(form);
form = (const char*)THEME_FORM; form = FPSTR(THEME_FORM);
String themeOptions = (const char*)COLOR_THEMES; String themeOptions = FPSTR(COLOR_THEMES);
themeOptions.replace(">"+String(themeColor)+"<", " selected>"+String(themeColor)+"<"); themeOptions.replace(">"+String(themeColor)+"<", " selected>"+String(themeColor)+"<");
form.replace("%THEME_OPTIONS%", themeOptions); form.replace("%THEME_OPTIONS%", themeOptions);
form.replace("%UTCOFFSET%", String(UtcOffset)); form.replace("%UTCOFFSET%", String(UtcOffset));
@ -712,7 +712,7 @@ String getHeader() {
} }
String getHeader(boolean refresh) { String getHeader(boolean refresh) {
String menu = (const char*)WEB_ACTIONS; String menu = FPSTR(WEB_ACTIONS);
String html = "<!DOCTYPE HTML>"; String html = "<!DOCTYPE HTML>";
html += "<html><head><title>Printer Monitor</title><link rel='icon' href='data:;base64,='>"; html += "<html><head><title>Printer Monitor</title><link rel='icon' href='data:;base64,='>";