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

Fix pause/resume SD print

Browse Source 
Followup to #12551, addressing #12566
This commit is contained in:
Scott Lahteine
2018-11-30 19:22:56 -06:00
parent 2224a4d61a
commit 261c6f4b96
6 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/libs/stopwatch.cpp
View File

@ -71,13 +71,13 @@ bool Stopwatch::start() {
else return false;
}
void Stopwatch::resume(const millis_t duration) {
void Stopwatch::resume(const millis_t with_time) {
#if ENABLED(DEBUG_STOPWATCH)
Stopwatch::debug(PSTR("resume"));
#endif
reset();
if ((accumulator = duration)) state = RUNNING;
if ((accumulator = with_time)) state = RUNNING;
}
void Stopwatch::reset() {

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

@ -75,7 +75,7 @@ class Stopwatch {
* @brief Resume the stopwatch
* @details Resume a timer from a given duration
*/
static void resume(const millis_t duration);
static void resume(const millis_t with_time);
/**
* @brief Reset the stopwatch