diff --git a/src/Network/WebServer.cpp b/src/Network/WebServer.cpp index 8985be5..9aecd47 100644 --- a/src/Network/WebServer.cpp +++ b/src/Network/WebServer.cpp @@ -14,7 +14,7 @@ void WebServer::setup() { this->server = new ESP8266WebServer(this->globalDataController->getSystemSettings()->webserverPort); this->serverUpdater = new ESP8266HTTPUpdateServer(); - this->server->on("/", []() { obj->displayPrinterStatus(); }); + this->server->on("/", []() { obj->handleMainPage(); }); this->server->on("/systemreset", []() { obj->handleSystemReset(); }); this->server->on("/forgetwifi", []() { obj->handleWifiReset(); }); this->server->on("/configurestation/show", []() { obj->handleConfigureStation(); }); @@ -28,8 +28,6 @@ void WebServer::setup() { this->server->on("/configuresensor/update", []() { obj->handleConfigureSensor(); }); this->server->on("/update", HTTP_GET, []() { obj->handleUpdatePage(); }); - this->server->on("/updateconfig", []() { obj->handleUpdateConfig(); }); - this->server->onNotFound([]() { obj->redirectHome(); }); this->serverUpdater->setup( this->server, @@ -64,33 +62,13 @@ void WebServer::redirectHome() { } void WebServer::displayPrinterStatus() { - WebserverMemoryVariables::sendHeader(this->server, this->globalDataController, "Status", "Monitor", true); - + /*BasePrinterClient *printerClient = this->globalDataController->getPrinterClient(); String html = ""; - String displayTime = - this->globalDataController->getTimeClient()->getAmPmHours() + ":" + - this->globalDataController->getTimeClient()->getMinutes() + ":" + - this->globalDataController->getTimeClient()->getSeconds() + " " + - this->globalDataController->getTimeClient()->getAmPm(); - if (this->globalDataController->getClockSettings()->is24h) { - displayTime = - this->globalDataController->getTimeClient()->getHours() + ":" + - this->globalDataController->getTimeClient()->getMinutes() + ":" + - this->globalDataController->getTimeClient()->getSeconds(); - } - - html += "
";
- if ((printerClient->getPrinterType() == "Repetier") || (printerClient->getPrinterType() == "Klipper")) {
- html += "Printer Name: " + printerClient->getPrinterName() + "
";
- }
- else {
- html += "Host Name: " + this->globalDataController->getPrinterHostName() + "
";
- }
+
if (printerClient->getError() != "") {
html += "Status: Offline
";
@@ -104,42 +82,9 @@ void WebServer::displayPrinterStatus() {
}
if (printerClient->isPrinting()) {
- html += "File: " + printerClient->getFileName() + "
";
- float fileSize = printerClient->getFileSize().toFloat();
- if (fileSize > 0) {
- fileSize = fileSize / 1024;
- html += "File Size: " + String(fileSize) + "KB
";
- }
- int filamentLength = printerClient->getFilamentLength().toInt();
- if (filamentLength > 0) {
- float fLength = float(filamentLength) / 1000;
- html += "Filament: " + String(fLength) + "m
";
- }
-
- html += "Tool Temperature: " + printerClient->getTempToolActual() + "° C
";
- if (printerClient->getTempBedActual() != 0 ) {
- html += "Bed Temperature: " + printerClient->getTempBedActual() + "° C
";
- }
- int val = printerClient->getProgressPrintTimeLeft().toInt();
- int hours = this->globalDataController->numberOfHours(val);
- int minutes = this->globalDataController->numberOfMinutes(val);
- int seconds = this->globalDataController->numberOfSeconds(val);
- html += "Est. Print Time Left: "
- + this->globalDataController->zeroPad(hours) + ":"
- + this->globalDataController->zeroPad(minutes) + ":"
- + this->globalDataController->zeroPad(seconds) + "
";
- val = printerClient->getProgressPrintTime().toInt();
- hours = this->globalDataController->numberOfHours(val);
- minutes = this->globalDataController->numberOfMinutes(val);
- seconds = this->globalDataController->numberOfSeconds(val);
- html += "Printing Time: " + this->globalDataController->zeroPad(hours) + ":" + this->globalDataController->zeroPad(minutes) + ":" + this->globalDataController->zeroPad(seconds) + "
";
- html += "";
- html += "
Please Configure Weather API
"; - if (weatherClient->getError() != "") { - html += "Weather Error: " + weatherClient->getError() + "
"; - } - } else { - html += "";
- html += weatherClient->getCondition(0) + " (" + weatherClient->getDescription(0) + ")
";
- html += weatherClient->getTempRounded(0) + weatherClient->getTempSymbol(true) + "
";
- html += " Map It!
";
- html += "