bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Rework some code to use timestamp_t struct (saves 72 bytes)

Browse Source
This commit is contained in:
João Brázio
2016-07-22 15:47:56 +01:00
committed by Scott Lahteine
parent 9388dcfa49
commit 23043a1e05
2 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Marlin/printcounter.cpp
View File

@ -22,6 +22,7 @@
#include "Marlin.h"
#include "printcounter.h"
#include "timestamp_t.h"
PrintCounter::PrintCounter(): super() {
this->loadStats();
@ -92,6 +93,9 @@ void PrintCounter::saveStats() {
}
void PrintCounter::showStats() {
char buffer[21];
timestamp_t time;
SERIAL_PROTOCOLPGM(MSG_STATS);
SERIAL_ECHOPGM("Prints: ");
@ -107,17 +111,11 @@ void PrintCounter::showStats() {
SERIAL_EOL;
SERIAL_PROTOCOLPGM(MSG_STATS);
uint32_t t = this->data.printTime / 60;
time.timestamp = this->data.printTime;
time.toString(buffer);
SERIAL_ECHOPGM("Total time: ");
SERIAL_ECHO(t / 60 / 24);
SERIAL_ECHOPGM("d ");
SERIAL_ECHO((t / 60) % 24);
SERIAL_ECHOPGM("h ");
SERIAL_ECHO(t % 60);
SERIAL_ECHOPGM("min");
SERIAL_ECHO(buffer);
#if ENABLED(DEBUG_PRINTCOUNTER)
SERIAL_ECHOPGM(" (");
@ -125,17 +123,11 @@ void PrintCounter::showStats() {
SERIAL_ECHOPGM(")");
#endif
uint32_t l = this->data.longestPrint / 60;
time.timestamp = this->data.longestPrint;
time.toString(buffer);
SERIAL_ECHOPGM(", Longest job: ");
SERIAL_ECHO(l / 60 / 24);
SERIAL_ECHOPGM("d ");
SERIAL_ECHO((l / 60) % 24);
SERIAL_ECHOPGM("h ");
SERIAL_ECHO(l % 60);
SERIAL_ECHOPGM("min");
SERIAL_ECHO(buffer);
#if ENABLED(DEBUG_PRINTCOUNTER)
SERIAL_ECHOPGM(" (");