diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index 57aee5e0..da90bf4f 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -118,32 +118,8 @@ const char HTTP_DOCTYPE[] PROGMEM = ""; const char HTTP_META_GO_BACK[] PROGMEM = ""; const char HTTP_HEADER[] PROGMEM = "%s"; -const char HTTP_STYLE[] PROGMEM = ""; -const char HTTP_CSS[] PROGMEM = - "body,.c{text-align:center;}" - "div,input{padding:5px;font-size:1em;}" - "a{color:" D_HTTP_COLOR_TEXT "}" - "input:not([type=file]){width:90%;background-color:" D_HTTP_COLOR_INPUT ";color:" D_HTTP_COLOR_INPUT_TEXT ";}" - "input[type=checkbox],input[type=radio]{width:1em;}" - "select{background-color:" D_HTTP_COLOR_INPUT ";color:" D_HTTP_COLOR_INPUT_TEXT ";}" - "input:invalid{border:1px solid " D_HTTP_COLOR_INPUT_WARNING ";}" - //"#hue{width:100%;}" - "body{font-family:verdana;width:60%;margin:auto;background:" D_HTTP_COLOR_BACKGROUND ";color:" D_HTTP_COLOR_TEXT - ";}" - "button{border:0;border-radius:0.6rem;background-color:" D_HTTP_COLOR_BUTTON ";color:" D_HTTP_COLOR_BUTTON_TEXT - ";line-height:2.4rem;font-size:1.2rem;width:100%;}" - //".q{float:right;width:64px;text-align:right;}" - ".red{background-color:" D_HTTP_COLOR_BUTTON_RESET ";}" - "#doc{text-align:left;display:inline-block;color:" D_HTTP_COLOR_TEXT ";min-width:260px;}" - // ".button3{background-color:#f44336;}" - // ".button4{background-color:#e7e7e7;color:black;}" - // ".button5{background-color:#555555;}" - // ".button6{background-color:#4CAF50;}" - "td{font-size:0.87rem;padding-bottom:0px;padding-top:0px;}th{padding-top:0.5em;}"; -// const char HTTP_SCRIPT[] PROGMEM = ""; -const char HTTP_HEADER_END[] PROGMEM = "
"; +const char HTTP_HEADER_END[] PROGMEM = + ""; // String lcdFirmwareUrl = "http://haswitchplate.com/update/HASwitchPlate.tft"; //////////////////////////////////////////////////////////////////////////////////////////////////// -String getOption(int value, String label, bool selected) +String getOption(int value, String label, int current_value) { char buffer[128]; snprintf_P(buffer, sizeof(buffer), PSTR(""), value, - (selected ? PSTR(" selected") : ""), label.c_str()); + (value == current_value ? PSTR(" selected") : ""), label.c_str()); return buffer; } -String getOption(String value, String label, bool selected) +String getOption(String& value, String& label, String& current_value) { char buffer[128]; snprintf_P(buffer, sizeof(buffer), PSTR(""), value.c_str(), - (selected ? PSTR(" selected") : ""), label.c_str()); + (value == current_value ? PSTR(" selected") : ""), label.c_str()); return buffer; } -static void add_gpio_select_option(String& str, uint8_t gpio, uint8_t bcklpin) -{ - char buffer[10]; - snprintf_P(buffer, sizeof(buffer), PSTR("GPIO %d"), gpio); - str += getOption(gpio, buffer, bcklpin == gpio); -} - static void add_button(String& str, const __FlashStringHelper* label, const __FlashStringHelper* extra) { str += F("