diff --git a/esp8266/webinterface.cpp b/esp8266/webinterface.cpp index 838220de..3ea6f27f 100644 --- a/esp8266/webinterface.cpp +++ b/esp8266/webinterface.cpp @@ -252,7 +252,7 @@ const char DIV_STATUS[]PROGMEM ="
"; const char STATUS_1[]PROGMEM ="\n\n"; -const char PRINTER_1a[]PROGMEM ="\n"; +const char PRINTER_1a[]PROGMEM ="
  
\n"; const char PRINTER_1b[]PROGMEM ="
  
\n"; const char PRINTER_1c[]PROGMEM ="
\n"; const char PRINTER_1d[]PROGMEM ="
  \n"; @@ -260,9 +260,10 @@ const char PRINTER_1e[]PROGMEM ="

\n"; const char PRINTER_1g[]PROGMEM ="

\n"; const char PRINTER_1h[]PROGMEM ="
\n"; - -const char PRINTER_2[]PROGMEM ="\n"; +const char PRINTER_1_a_1[]PROGMEM="
   "; +const char PRINTER_2[]PROGMEM ="
\n\n"; const char PRINTER_4[]PROGMEM ="\n"; const char DIV_ERRORMSG[]PROGMEM ="
\n"; const char DIV_INFOMSG[]PROGMEM ="
\n"; const char DIV_STATUSMSG[]PROGMEM ="
\n"; +const char COMMAND_ID[]PROGMEM ="COM"; +const char PARAM_ID[]PROGMEM ="PARAM"; #define TEMP_SVG(temperature,target,description) buffer2send+=(PROGMEM2CHAR(TEMP_SVG_1));buffer2send+=(PROGMEM2CHAR(TEMP_SVG_2));buffer2send+=(PROGMEM2CHAR(TEMP_SVG_3));buffer2send+=(PROGMEM2CHAR(TEMP_SVG_4));buffer2send+=(PROGMEM2CHAR(TEMP_SVG_5));buffer2send+=String(target+10); buffer2send+=(PROGMEM2CHAR(TEMP_SVG_6));buffer2send+=String(target+10); buffer2send+=(PROGMEM2CHAR(TEMP_SVG_7));buffer2send+=(PROGMEM2CHAR(TEMP_SVG_8));buffer2send+=String(temperature+5);buffer2send+=(PROGMEM2CHAR(TEMP_SVG_9));buffer2send+=String(temperature+15);buffer2send+=(PROGMEM2CHAR(TEMP_SVG_10));buffer2send+=String(temperature+10);buffer2send+=(PROGMEM2CHAR(TEMP_SVG_11));buffer2send+=String(temperature+5);buffer2send+=(PROGMEM2CHAR(TEMP_SVG_12));buffer2send+=String(temperature+15);buffer2send+=(PROGMEM2CHAR(TEMP_SVG_13));buffer2send+=String(temperature+10);buffer2send+=(PROGMEM2CHAR(TEMP_SVG_14));buffer2send+=description;buffer2send+=(PROGMEM2CHAR(TEMP_SVG_15));buffer2send+=(PROGMEM2CHAR(TEMP_SVG_16)); @@ -1452,6 +1455,9 @@ void handle_web_interface_printer() buffer2send+=(PROGMEM2CHAR(PRINTER_1f)); buffer2send+=(PROGMEM2CHAR(PRINTER_1g)); buffer2send+=(PROGMEM2CHAR(PRINTER_1h)); + buffer2send+=(PROGMEM2CHAR(PRINTER_1_a_1)); + buffer2send+=stmp.c_str(); + buffer2send+=(PROGMEM2CHAR(PRINTER_1_a_2)); buffer2send+=(PROGMEM2CHAR(PRINTER_2)); buffer2send+=stmp.c_str(); buffer2send+=(PROGMEM2CHAR(PRINTER_3)); @@ -1614,6 +1620,17 @@ void handle_web_interface_status() } +void handle_web_command() +{ +if (web_interface->WebServer.hasArg(PROGMEM2CHAR(COMMAND_ID))) + { String cmd = web_interface->WebServer.arg(PROGMEM2CHAR(COMMAND_ID)); + String param = web_interface->WebServer.arg(PROGMEM2CHAR(PARAM_ID)); + if (cmd=="M112") + { + Serial.println(cmd.c_str()); + } + } +} //URI Decoding function //no check if dst buffer is big enough to receive string so //use same size as src is a recommendation @@ -1660,6 +1677,7 @@ WEBINTERFACE_CLASS::WEBINTERFACE_CLASS (int port):WebServer(port) WebServer.on("/CONFIGSTA",HTTP_ANY, handle_web_interface_configSTA); WebServer.on("/STATUS",HTTP_ANY, handle_web_interface_status); WebServer.on("/PRINTER",HTTP_ANY, handle_web_interface_printer); + WebServer.on("/CMD",HTTP_ANY, handle_web_command); WebServer.onNotFound( handle_not_found); answer4M105="T:0 /0 "; answer4M114="X:0.0 Y:0.0 Z:0.0"; diff --git a/page5.png b/page5.png index 9d3aa71e..d73bfccb 100644 Binary files a/page5.png and b/page5.png differ