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

show times longer than 24 hours correctly, remove unused 'days' variables

pull/58/head
Teemu Toivola 2018-11-27 20:16:33 +02:00
parent 1720d10ded
commit 56aed0752a
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
printermonitor/printermonitor.ino
View File

@ -35,13 +35,11 @@ SOFTWARE.
/* Useful Constants */ /* Useful Constants */
#define SECS_PER_MIN (60UL) #define SECS_PER_MIN (60UL)
#define SECS_PER_HOUR (3600UL) #define SECS_PER_HOUR (3600UL)
#define SECS_PER_DAY (SECS_PER_HOUR * 24L)
/* Useful Macros for getting elapsed time */ /* Useful Macros for getting elapsed time */
#define numberOfSeconds(_time_) (_time_ % SECS_PER_MIN) #define numberOfSeconds(_time_) (_time_ % SECS_PER_MIN)
#define numberOfMinutes(_time_) ((_time_ / SECS_PER_MIN) % SECS_PER_MIN) #define numberOfMinutes(_time_) ((_time_ / SECS_PER_MIN) % SECS_PER_MIN)
#define numberOfHours(_time_) (( _time_% SECS_PER_DAY) / SECS_PER_HOUR) #define numberOfHours(_time_) (_time_ / SECS_PER_HOUR)
#define elapsedDays(_time_) ( _time_ / SECS_PER_DAY)
// Initialize the oled display for I2C_DISPLAY_ADDRESS // Initialize the oled display for I2C_DISPLAY_ADDRESS
// SDA_PIN and SCL_PIN // SDA_PIN and SCL_PIN
@ -682,14 +680,12 @@ void displayPrinterStatus() {
html += "Bed Temperature: " + printerClient.getTempBedActual() + "&#176; C<br>"; html += "Bed Temperature: " + printerClient.getTempBedActual() + "&#176; C<br>";
int val = printerClient.getProgressPrintTimeLeft().toInt(); int val = printerClient.getProgressPrintTimeLeft().toInt();
int days = elapsedDays(val);
int hours = numberOfHours(val); int hours = numberOfHours(val);
int minutes = numberOfMinutes(val); int minutes = numberOfMinutes(val);
int seconds = numberOfSeconds(val); int seconds = numberOfSeconds(val);
html += "Est. Print Time Left: " + zeroPad(hours) + ":" + zeroPad(minutes) + ":" + zeroPad(seconds) + "<br>"; html += "Est. Print Time Left: " + zeroPad(hours) + ":" + zeroPad(minutes) + ":" + zeroPad(seconds) + "<br>";
val = printerClient.getProgressPrintTime().toInt(); val = printerClient.getProgressPrintTime().toInt();
days = elapsedDays(val);
hours = numberOfHours(val); hours = numberOfHours(val);
minutes = numberOfMinutes(val); minutes = numberOfMinutes(val);
seconds = numberOfSeconds(val); seconds = numberOfSeconds(val);
@ -787,7 +783,6 @@ void drawScreen2(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int
//display->setTextAlignment(TEXT_ALIGN_LEFT); //display->setTextAlignment(TEXT_ALIGN_LEFT);
display->setFont(ArialMT_Plain_24); display->setFont(ArialMT_Plain_24);
int val = printerClient.getProgressPrintTimeLeft().toInt(); int val = printerClient.getProgressPrintTimeLeft().toInt();
int days = elapsedDays(val);
int hours = numberOfHours(val); int hours = numberOfHours(val);
int minutes = numberOfMinutes(val); int minutes = numberOfMinutes(val);
int seconds = numberOfSeconds(val); int seconds = numberOfSeconds(val);
@ -804,7 +799,6 @@ void drawScreen3(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int
//display->setTextAlignment(TEXT_ALIGN_LEFT); //display->setTextAlignment(TEXT_ALIGN_LEFT);
display->setFont(ArialMT_Plain_24); display->setFont(ArialMT_Plain_24);
int val = printerClient.getProgressPrintTime().toInt(); int val = printerClient.getProgressPrintTime().toInt();
int days = elapsedDays(val);
int hours = numberOfHours(val); int hours = numberOfHours(val);
int minutes = numberOfMinutes(val); int minutes = numberOfMinutes(val);
int seconds = numberOfSeconds(val); int seconds = numberOfSeconds(val);
@ -1169,4 +1163,4 @@ void enableDisplay(boolean enable) {
Serial.println("Display was turned OFF: " + timeClient.getFormattedTime()); Serial.println("Display was turned OFF: " + timeClient.getFormattedTime());
displayOffEpoch = lastEpoch; displayOffEpoch = lastEpoch;
} }
} }