From f0ca858dc57489b2ae1c1f90f79bd1e2f33fd980 Mon Sep 17 00:00:00 2001 From: Robert Stein Date: Tue, 22 Dec 2020 22:55:39 +0100 Subject: [PATCH] Clean up --- src/Network/WebServer.cpp | 87 ++++++++---------------- src/Network/WebServer.h | 1 - src/Network/WebserverMemoryVariables.cpp | 6 +- src/Sensors/BaseSensorClient.h | 23 +++++++ src/Sensors/SensorClient.h | 2 - src/Sensors/SensorDataStruct.h | 13 ++++ 6 files changed, 71 insertions(+), 61 deletions(-) create mode 100644 src/Sensors/BaseSensorClient.h delete mode 100644 src/Sensors/SensorClient.h create mode 100644 src/Sensors/SensorDataStruct.h diff --git a/src/Network/WebServer.cpp b/src/Network/WebServer.cpp index 9aecd47..474c648 100644 --- a/src/Network/WebServer.cpp +++ b/src/Network/WebServer.cpp @@ -42,63 +42,6 @@ void WebServer::setup() { this->debugController->printLn("Server started"); } -void WebServer::handleClient() { - this->server->handleClient(); -} - -void WebServer::redirectTarget(String targetUri) { - // Send them back to the Root Directory - this->server->sendHeader("Location", targetUri, true); - this->server->sendHeader("Cache-Control", "no-cache, no-store"); - this->server->sendHeader("Pragma", "no-cache"); - this->server->sendHeader("Expires", "-1"); - this->server->send(302, "text/plain", ""); - this->server->client().stop(); -} - - -void WebServer::redirectHome() { - this->redirectTarget("/"); -} - -void WebServer::displayPrinterStatus() { - - /*BasePrinterClient *printerClient = this->globalDataController->getPrinterClient(); - String html = ""; - - - - - - if (printerClient->getError() != "") { - html += "Status: Offline
"; - html += "Reason: " + printerClient->getError() + "
"; - } else { - html += "Status: " + printerClient->getStateAsText(); - if (printerClient->isPSUoff() && this->globalDataController->hasPrinterPsu()) { - html += ", PSU off"; - } - html += "
"; - } - - if (printerClient->isPrinting()) { - - - - - html += "

"; - - html += "

Time: " + displayTime + "

"; - - this->server->sendContent(html); // spit out what we got - html = ""; - */ - - -} - - - void WebServer::findMDNS() { return; // nothing to do here @@ -133,6 +76,36 @@ void WebServer::findMDNS() { }*/ } + + + +/** + * @brief Handle clients of webserver + */ +void WebServer::handleClient() { + this->server->handleClient(); +} + +/** + * @brief Redirect incomming transmission to other taget + */ +void WebServer::redirectTarget(String targetUri) { + // Send them back to the Root Directory + this->server->sendHeader("Location", targetUri, true); + this->server->sendHeader("Cache-Control", "no-cache, no-store"); + this->server->sendHeader("Pragma", "no-cache"); + this->server->sendHeader("Expires", "-1"); + this->server->send(302, "text/plain", ""); + this->server->client().stop(); +} + +/** + * @brief Redirect incomming transmission to dashboard + */ +void WebServer::redirectHome() { + this->redirectTarget("/"); +} + /** * @brief Handle authentification on all subsites * @return boolean diff --git a/src/Network/WebServer.h b/src/Network/WebServer.h index eab5e22..ada6b81 100644 --- a/src/Network/WebServer.h +++ b/src/Network/WebServer.h @@ -24,7 +24,6 @@ public: boolean authentication(); void redirectHome(); void redirectTarget(String targetUri); - void displayPrinterStatus(); void handleSystemReset(); void handleWifiReset(); diff --git a/src/Network/WebserverMemoryVariables.cpp b/src/Network/WebserverMemoryVariables.cpp index 342e9d0..e1e8baf 100644 --- a/src/Network/WebserverMemoryVariables.cpp +++ b/src/Network/WebserverMemoryVariables.cpp @@ -205,9 +205,13 @@ void WebserverMemoryVariables::sendMainPage(ESP8266WebServer *server, GlobalData lineData.replace("%V%", String(printerConfigs[i].remoteAddress) + ":" + String(printerConfigs[i].remotePort)); server->sendContent(lineData); + String currentState = globalDataController->getPrinterStateAsText(&printerConfigs[i]); + if (printerConfigs[i].isPSUoff && printerConfigs[i].hasPsuControl) { + currentState += ", PSU off"; + } lineData = FPSTR(MAINPAGE_ROW_PRINTER_BLOCK_LINE); lineData.replace("%T%", "State"); - lineData.replace("%V%", globalDataController->getPrinterStateAsText(&printerConfigs[i])); + lineData.replace("%V%", currentState); server->sendContent(lineData); if (printerConfigs[i].state != PRINTER_STATE_STANDBY) { diff --git a/src/Sensors/BaseSensorClient.h b/src/Sensors/BaseSensorClient.h new file mode 100644 index 0000000..5e7d5fd --- /dev/null +++ b/src/Sensors/BaseSensorClient.h @@ -0,0 +1,23 @@ +#pragma once +#include +#include +#include +#include "Debug.h" +#include "../Network/JsonRequestClient.h" +#include "SensorDataStruct.h" +#include "../../include/MemoryHelper.h" + +/** + * @brief Basic function definitions for an sensor client like an interface + */ +class BaseSensorClient { +public: + virtual String getType() = 0; + + /** + * @brief Reset all dynamic variables for sensor + * @param sensorData Handle to sensor struct + */ + static void resetData(SensorDataStruct *sensorData) { + } +}; \ No newline at end of file diff --git a/src/Sensors/SensorClient.h b/src/Sensors/SensorClient.h deleted file mode 100644 index 3f59c93..0000000 --- a/src/Sensors/SensorClient.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once - diff --git a/src/Sensors/SensorDataStruct.h b/src/Sensors/SensorDataStruct.h new file mode 100644 index 0000000..7fd2f8c --- /dev/null +++ b/src/Sensors/SensorDataStruct.h @@ -0,0 +1,13 @@ +#pragma once +#include +#include +#include + +#define SENSOR_CLIENT_BME280 (int)0 +#define SENSOR_CLIENT_BME680 (int)1 +#define SENSOR_CLIENT_HTU21D (int)2 + +typedef struct { + int sensType; + char error[120]; +} SensorDataStruct;