3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add Stopwatch::resume method

Browse source
This commit is contained in:
Scott Lahteine 2018-04-16 22:53:06 -05:00
parent 1894b981af
commit e76545c450
2 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Marlin/stopwatch.cpp
View file

@ -71,6 +71,15 @@ bool Stopwatch::start() {
else return false;
}
void Stopwatch::resume(const millis_t duration) {
#if ENABLED(DEBUG_STOPWATCH)
Stopwatch::debug(PSTR("resume"));
#endif
reset();
if ((accumulator = duration)) state = RUNNING;
}
void Stopwatch::reset() {
#if ENABLED(DEBUG_STOPWATCH)
Stopwatch::debug(PSTR("reset"));
@ -82,16 +91,8 @@ void Stopwatch::reset() {
accumulator = 0;
}
bool Stopwatch::isRunning() {
return (state == RUNNING) ? true : false;
}
bool Stopwatch::isPaused() {
return (state == PAUSED) ? true : false;
}
millis_t Stopwatch::duration() {
return (((isRunning()) ? millis() : stopTimestamp)
return ((isRunning() ? millis() : stopTimestamp)
- startTimestamp) / 1000UL + accumulator;
}