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

Merge pull request #24 from Qrome/2.1 

2.1
pull/56/head V2.1
Qrome 2018-06-19 19:21:01 -07:00 committed by GitHub
parent abf551023a 8aa36bd8be
commit c605410058
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
printermonitor/printermonitor.ino
View File

@ -27,7 +27,7 @@ SOFTWARE.
#include "Settings.h" #include "Settings.h"
#define VERSION "2.0" #define VERSION "2.1"
#define HOSTNAME "OctMon-" #define HOSTNAME "OctMon-"
#define CONFIG "/conf.txt" #define CONFIG "/conf.txt"
@ -629,10 +629,13 @@ void displayPrinterStatus() {
html += "<div class='w3-cell-row' style='width:100%'><h2>Time: " + displayTime + "</h2></div><div class='w3-cell-row'>"; html += "<div class='w3-cell-row' style='width:100%'><h2>Time: " + displayTime + "</h2></div><div class='w3-cell-row'>";
html += "<div class='w3-cell w3-container' style='width:100%'><p>"; html += "<div class='w3-cell w3-container' style='width:100%'><p>";
html += "Host Name: " + OctoPrintHostName + "<br>";
if (printerClient.getError() != "") { if (printerClient.getError() != "") {
html += "Error: " + printerClient.getError() + "<br>"; html += "Error: " + printerClient.getError() + "<br>";
} }
html += "Status: " + printerClient.getState() + "<br>"; html += "Status: " + printerClient.getState() + "<br>";
if (printerClient.isPrinting()) {
html += "File: " + printerClient.getFileName() + "<br>"; html += "File: " + printerClient.getFileName() + "<br>";
float fileSize = printerClient.getFileSize().toFloat(); float fileSize = printerClient.getFileSize().toFloat();
if (fileSize > 0) { if (fileSize > 0) {
@ -663,6 +666,10 @@ void displayPrinterStatus() {
html += "Printing Time: " + zeroPad(hours) + ":" + zeroPad(minutes) + ":" + zeroPad(seconds) + "<br>"; html += "Printing Time: " + zeroPad(hours) + ":" + zeroPad(minutes) + ":" + zeroPad(seconds) + "<br>";
html += "<style>#myProgress {width: 100%;background-color: #ddd;}#myBar {width: " + printerClient.getProgressCompletion() + "%;height: 30px;background-color: #4CAF50;}</style>"; html += "<style>#myProgress {width: 100%;background-color: #ddd;}#myBar {width: " + printerClient.getProgressCompletion() + "%;height: 30px;background-color: #4CAF50;}</style>";
html += "<div id=\"myProgress\"><div id=\"myBar\" class=\"w3-medium w3-center\">" + printerClient.getProgressCompletion() + "%</div></div>"; html += "<div id=\"myProgress\"><div id=\"myBar\" class=\"w3-medium w3-center\">" + printerClient.getProgressCompletion() + "%</div></div>";
} else {
html += "<hr>";
}
html += "</p></div></div>"; html += "</p></div></div>";
server.sendContent(html); // spit out what we got server.sendContent(html); // spit out what we got
@ -778,12 +785,15 @@ void drawScreen3(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int
void drawClock(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) { void drawClock(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
display->setTextAlignment(TEXT_ALIGN_CENTER); display->setTextAlignment(TEXT_ALIGN_CENTER);
display->setFont(ArialMT_Plain_24);
String displayTime = timeClient.getAmPmHours() + ":" + timeClient.getMinutes() + ":" + timeClient.getSeconds(); String displayTime = timeClient.getAmPmHours() + ":" + timeClient.getMinutes() + ":" + timeClient.getSeconds();
if (IS_24HOUR) { if (IS_24HOUR) {
displayTime = timeClient.getHours() + ":" + timeClient.getMinutes() + ":" + timeClient.getSeconds(); displayTime = timeClient.getHours() + ":" + timeClient.getMinutes() + ":" + timeClient.getSeconds();
} }
display->drawString(64 + x, 10 + y, displayTime); display->setFont(ArialMT_Plain_16);
display->drawString(64 + x, 0 + y, OctoPrintHostName);
display->setFont(ArialMT_Plain_24);
display->drawString(64 + x, 17 + y, displayTime);
} }
void drawWeather(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) { void drawWeather(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
@ -867,14 +877,15 @@ void drawHeaderOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) {
void drawClockHeaderOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) { void drawClockHeaderOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) {
display->setColor(WHITE); display->setColor(WHITE);
display->setFont(ArialMT_Plain_16); display->setFont(ArialMT_Plain_16);
String time = timeClient.getAmPm();
display->setTextAlignment(TEXT_ALIGN_LEFT); display->setTextAlignment(TEXT_ALIGN_LEFT);
display->drawString(0, 48, time); if (!IS_24HOUR) {
display->setFont(ArialMT_Plain_16); display->drawString(0, 48, timeClient.getAmPm());
display->setTextAlignment(TEXT_ALIGN_CENTER); display->setTextAlignment(TEXT_ALIGN_CENTER);
display->drawString(64, 48, "offline"); display->drawString(64, 48, "offline");
} else {
display->drawString(0,48, "offline");
}
display->setTextAlignment(TEXT_ALIGN_LEFT); display->setTextAlignment(TEXT_ALIGN_LEFT);
display->drawRect(0, 43, 128, 2); display->drawRect(0, 43, 128, 2);
drawRssi(display); drawRssi(display);