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

Enable MDNS and display snyc

pull/125/head
Robert Stein 2020-12-14 06:39:33 +01:00
parent 62d010a4da
commit 1ab8d23320
6 changed files with 102 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Display/OledDisplay.cpp
View File

@ -42,6 +42,10 @@ void OledDisplay::postSetup() {
}
}
void OledDisplay::handleUpdate() {
this->ui->update();
}
void OledDisplay::showBootScreen() {
this->oledDisplay->setTextAlignment(TEXT_ALIGN_CENTER);
this->oledDisplay->setContrast(255); // default is 255

1
src/Display/OledDisplay.h
View File

@ -22,6 +22,7 @@ public:
OledDisplay(OLEDDisplay *oledDisplay, GlobalDataController *globalDataController, DebugController *debugController);
void preSetup();
void postSetup();
void handleUpdate();
void showBootScreen();
void showApAccessScreen(String apSsid, String apIp);
void showWebserverSplashScreen(bool isEnabled);

2
src/Includes.h
View File

@ -30,9 +30,7 @@ DebugController debugController;
TimeClient timeClient(TIME_UTCOFFSET, &debugController);
OpenWeatherMapClient weatherClient(WEATHER_APIKEY, WEATHER_CITYID, 1, WEATHER_METRIC, WEATHER_LANGUAGE, &debugController);
GlobalDataController globalDataController(&timeClient, &weatherClient, &debugController);
#if WEBSERVER_ENABLED
WebServer webServer(&globalDataController, &debugController);
#endif
// Construct the correct printer client
#if (PRINTERCLIENT == REPETIER_CLIENT)

119
src/Network/WebServer.cpp
View File

@ -319,6 +319,7 @@ void WebServer::handleUpdateConfig() {
this->globalDataController->setUseLedFlash(this->server->hasArg("useFlash"));
this->globalDataController->writeSettings();
this->findMDNS();
this->globalDataController->getPrinterClient()->getPrinterJobResults();
this->globalDataController->getPrinterClient()->getPrinterPsuState();
@ -332,35 +333,37 @@ void WebServer::handleUpdateConfig() {
this->globalDataController->getTimeClient()->resetLastEpoch();
this->redirectHome();
}
// findMDNS();
// void findMDNS() {
// if (PrinterServer == "" || ENABLE_OTA == false) {
// return; // nothing to do here
// }
// // We now query our network for 'web servers' service
// // over tcp, and get the number of available devices
// int n = MDNS.queryService("http", "tcp");
// if (n == 0) {
// Serial.println("no services found - make sure Printer server is turned on");
// return;
// }
// Serial.println("*** Looking for " + PrinterHostName + " over mDNS");
// for (int i = 0; i < n; ++i) {
// // Going through every available service,
// // we're searching for the one whose hostname
// // matches what we want, and then get its IP
// Serial.println("Found: " + MDNS.hostname(i));
// if (MDNS.hostname(i) == PrinterHostName) {
// IPAddress serverIp = MDNS.IP(i);
// PrinterServer = serverIp.toString();
// PrinterPort = MDNS.port(i); // save the port
// Serial.println("*** Found Printer Server " + PrinterHostName + " http://" + PrinterServer + ":" + PrinterPort);
// writeSettings(); // update the settings
// }
// }
// }
void WebServer::findMDNS() {
if (this->globalDataController->getPrinterHostName() == "" || ENABLE_OTA == false) {
return; // nothing to do here
}
// We now query our network for 'web servers' service
// over tcp, and get the number of available devices
int n = MDNS.queryService("http", "tcp");
if (n == 0) {
this->debugController->printLn("no services found - make sure Printer server is turned on");
return;
}
this->debugController->printLn("*** Looking for " + this->globalDataController->getPrinterHostName() + " over mDNS");
for (int i = 0; i < n; ++i) {
// Going through every available service,
// we're searching for the one whose hostname
// matches what we want, and then get its IP
Serial.println("Found: " + MDNS.hostname(i));
if (MDNS.hostname(i) == this->globalDataController->getPrinterHostName()) {
IPAddress serverIp = MDNS.IP(i);
this->globalDataController->setPrinterServer(serverIp.toString());
this->globalDataController->setPrinterPort(MDNS.port(i));
this->debugController->printLn(
"*** Found Printer Server " + this->globalDataController->getPrinterHostName() +
" http://" + this->globalDataController->getPrinterServer() +
":" + this->globalDataController->getPrinterPort()
);
this->globalDataController->writeSettings(); // update the settings
}
}
}
void WebServer::handleUpdateWeather() {
if (!this->authentication()) {
@ -396,32 +399,7 @@ void WebServer::handleConfigure() {
html = this->getHeader();
this->server->sendContent(html);
CHANGE_FORM = "<form class='w3-container' action='/updateconfig' method='get'><h2>Station Config:</h2>"
"<p><label>" + printerClient->getPrinterType() + " API Key (get from your server)</label>"
"<input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterApiKey' id='PrinterApiKey' value='%OCTOKEY%' maxlength='60'></p>";
if ((printerClient->getPrinterType() == "OctoPrint") || (printerClient->getPrinterType() == "Klipper")) {
CHANGE_FORM += "<p><label>" + printerClient->getPrinterType() + " Host Name (usually octopi)</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterHostName' value='%OCTOHOST%' maxlength='60'></p>";
}
CHANGE_FORM += "<p><label>" + printerClient->getPrinterType() + " Address (do not include http://)</label>"
"<input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterAddress' id='PrinterAddress' value='%OCTOADDRESS%' maxlength='60'></p>"
"<p><label>" + printerClient->getPrinterType() + " Port</label>"
"<input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterPort' id='PrinterPort' value='%OCTOPORT%' maxlength='5' onkeypress='return isNumberKey(event)'></p>";
if (printerClient->getPrinterType() == "Repetier") {
CHANGE_FORM += "<input type='button' value='Test Connection' onclick='testRepetier()'>"
"<input type='hidden' id='selectedPrinter' value='" + printerClient->getPrinterName() + "'><p id='RepetierTest'></p>"
"<script>testRepetier();</script>";
}
else if (printerClient->getPrinterType() == "Klipper") {
CHANGE_FORM += "<input type='button' value='Test Connection' onclick='testKlipper()'>"
"<input type='hidden' id='selectedPrinter' value='" + printerClient->getPrinterName() + "'><p id='KlipperTest'></p>"
"<script>testKlipper();</script>";
}
else {
CHANGE_FORM += "<input type='button' value='Test Connection and API JSON Response' onclick='testOctoPrint()'><p id='OctoPrintTest'></p>";
}
CHANGE_FORM += "<p><label>" + printerClient->getPrinterType() + " User (only needed if you have haproxy or basic auth turned on)</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='octoUser' value='%OCTOUSER%' maxlength='30'></p>"
"<p><label>" + printerClient->getPrinterType() + " Password </label><input class='w3-input w3-border w3-margin-bottom' type='password' name='octoPass' value='%OCTOPASS%'></p>";
// send javascript functions
if (printerClient->getPrinterType() == "Repetier") {
html = "<script>function testRepetier(){var e=document.getElementById(\"RepetierTest\"),r=document.getElementById(\"PrinterAddress\").value,"
"t=document.getElementById(\"PrinterPort\").value;if(\"\"==r||\"\"==t)return e.innerHTML=\"* Address and Port are required\","
@ -437,10 +415,11 @@ void WebServer::handleConfigure() {
this->server->sendContent(html);
}
else if (printerClient->getPrinterType() == "Klipper") {
html = "<script>function testKlipper(){var e=document.getElementById(\"KlipperTest\"),r=document.getElementById(\"PrinterAddress\").value,"
// TODO: INVALID JAVASCRIPT HERE
/*html = "<script>function testKlipper(){var e=document.getElementById(\"KlipperTest\"),r=document.getElementById(\"PrinterAddress\").value,"
"t=document.getElementById(\"PrinterPort\").value;if(\"\"==r||\"\"==t)return e.innerHTML=\"* Address and Port are required\","
"void(e.style.background=\"\");var n=\"http://\"+r+\":\"+t;n+=\"/printer/info";
this->server->sendContent(html);
this->server->sendContent(html); */
}
else {
html = "<script>function testOctoPrint(){var e=document.getElementById(\"OctoPrintTest\"),t=document.getElementById(\"PrinterAddress\").value,"
@ -449,7 +428,32 @@ void WebServer::handleConfigure() {
this->server->sendContent(html);
}
String form = CHANGE_FORM;
String form = "<form class='w3-container' action='/updateconfig' method='get'><h2>Station Config:</h2>"
"<p><label>" + printerClient->getPrinterType() + " API Key (get from your server)</label>"
"<input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterApiKey' id='PrinterApiKey' value='%OCTOKEY%' maxlength='60'></p>";
if ((printerClient->getPrinterType() == "OctoPrint") || (printerClient->getPrinterType() == "Klipper")) {
form += "<p><label>" + printerClient->getPrinterType() + " Host Name</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterHostName' value='%OCTOHOST%' maxlength='60'></p>";
}
form += "<p><label>" + printerClient->getPrinterType() + " Address (do not include http://)</label>"
"<input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterAddress' id='PrinterAddress' value='%OCTOADDRESS%' maxlength='60'></p>"
"<p><label>" + printerClient->getPrinterType() + " Port</label>"
"<input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterPort' id='PrinterPort' value='%OCTOPORT%' maxlength='5' onkeypress='return isNumberKey(event)'></p>";
if (printerClient->getPrinterType() == "Repetier") {
form += "<input type='button' value='Test Connection' onclick='testRepetier()'>"
"<input type='hidden' id='selectedPrinter' value='" + printerClient->getPrinterName() + "'><p id='RepetierTest'></p>"
"<script>testRepetier();</script>";
}
else if (printerClient->getPrinterType() == "Klipper") {
form += "<input type='button' value='Test Connection' onclick='testKlipper()'>"
"<input type='hidden' id='selectedPrinter' value='" + printerClient->getPrinterName() + "'><p id='KlipperTest'></p>"
"<script>testKlipper();</script>";
}
else {
form += "<input type='button' value='Test Connection and API JSON Response' onclick='testOctoPrint()'><p id='OctoPrintTest'></p>";
}
form += "<p><label>" + printerClient->getPrinterType() + " User (only needed if you have haproxy or basic auth turned on)</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='octoUser' value='%OCTOUSER%' maxlength='30'></p>"
"<p><label>" + printerClient->getPrinterType() + " Password </label><input class='w3-input w3-border w3-margin-bottom' type='password' name='octoPass' value='%OCTOPASS%'></p>";
form.replace("%OCTOKEY%", this->globalDataController->getPrinterApiKey());
form.replace("%OCTOHOST%", this->globalDataController->getPrinterHostName());
@ -457,7 +461,6 @@ void WebServer::handleConfigure() {
form.replace("%OCTOPORT%", String(this->globalDataController->getPrinterPort()));
form.replace("%OCTOUSER%", this->globalDataController->getPrinterAuthUser());
form.replace("%OCTOPASS%", this->globalDataController->getPrinterAuthPass());
this->server->sendContent(form);
form = FPSTR(CLOCK_FORM);

2
src/Network/WebServer.h
View File

@ -4,6 +4,7 @@
#include <ESP8266WebServer.h>
#include <ESP8266HTTPUpdateServer.h>
#include <WiFiManager.h>
#include <ESP8266mDNS.h>
#include "../Global/GlobalDataController.h"
class WebServer {
@ -16,6 +17,7 @@ private:
public:
WebServer(GlobalDataController *globalDataController, DebugController *debugController);
void setup();
void findMDNS();
void handleClient();
boolean authentication();

51
src/main.cpp
View File

@ -1,13 +1,10 @@
#include "Includes.h"
#include <ArduinoOTA.h>
String lastMinute = "xx";
String lastSecond = "xx";
void configModeCallback(WiFiManager *myWiFiManager);
void setup() {
LittleFS.begin();
debugController.setup();
@ -73,6 +70,7 @@ void setup() {
#endif
globalDataController.flashLED(5, 100);
webServer.findMDNS();
debugController.printLn("*** Leaving setup()");
}
@ -81,20 +79,29 @@ void loop() {
// Handle update of time
if(timeClient.handleSync(globalDataController.getClockResyncMinutes()) && globalDataController.getWeatherShow()) {
// We sync time? Ok, sync weather also!
debugController.printLn("Updating weather...");
weatherClient.updateWeather();
}
if (lastMinute != timeClient.getMinutes() && !printerClient.isPrinting()) {
// Check status every 60 seconds
globalDataController.ledOnOff(true);
lastMinute = timeClient.getMinutes(); // reset the check value
printerClient.getPrinterJobResults();
printerClient.getPrinterPsuState();
globalDataController.ledOnOff(false);
} else if (printerClient.isPrinting()) {
if (lastSecond != timeClient.getSeconds() && timeClient.getSeconds().endsWith("0")) {
lastSecond = timeClient.getSeconds();
// every 10 seconds while printing get an update
globalDataController.ledOnOff(true);
printerClient.getPrinterJobResults();
printerClient.getPrinterPsuState();
globalDataController.ledOnOff(false);
}
}
// put your main code here, to run repeatedly:
displayClient.handleUpdate();
if (WEBSERVER_ENABLED) {
webServer.handleClient();
@ -104,20 +111,6 @@ void loop() {
}
}
void configModeCallback(WiFiManager *myWiFiManager) {
debugController.printLn("Entered config mode");
debugController.printLn(WiFi.softAPIP().toString());