3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-24 12:35:51 +00:00
Code Issues Releases Wiki Activity

Init print_job_timer in setup() instead of "early" (#9937)

Browse Source
This commit is contained in:
Bob-the-Kuhn 2018-03-04 16:12:30 -06:00 committed by Scott Lahteine
parent beeed580b8
commit 025118da3e
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/Marlin.cpp
View File

@ -730,7 +730,11 @@ void setup() {
// Load data from EEPROM if available (or use defaults)
// This also updates variables in the planner, elsewhere
(void)settings.load();
#if ENABLED(PRINTCOUNTER)
print_job_timer.init();
#endif
#if HAS_M206_COMMAND
// Initialize current position based on home_offset
COPY(current_position, home_offset);

5
Marlin/src/libs/stopwatch.h
View File

@ -52,6 +52,11 @@ class Stopwatch {
*/
Stopwatch();
/**
* @brief Initialize the stopwatch
*/
inline void init() {}
/**
* @brief Stops the stopwatch
* @details Stops the running timer, it will silently ignore the request if

4
Marlin/src/module/printcounter.cpp
View File

@ -28,10 +28,6 @@
#include "../Marlin.h"
PrintCounter::PrintCounter(): super() {
this->loadStats();
}
millis_t PrintCounter::deltaDuration() {
#if ENABLED(DEBUG_PRINTCOUNTER)
PrintCounter::debug(PSTR("deltaDuration"));

8
Marlin/src/module/printcounter.h
View File

@ -99,10 +99,14 @@ class PrintCounter: public Stopwatch {
millis_t deltaDuration();
public:
/**
* @brief Class constructor
* @brief Initialize the print counter
*/
PrintCounter();
inline void init() {
super::init();
this->loadStats();
}
/**
* @brief Checks if Print Statistics has been loaded