wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

update code base to Marlin 2.0.9.2

Browse Source
This commit is contained in:
Stefan Kalscheuer
2021-10-03 18:57:12 +02:00
parent b9d7ba838e
commit 7077da3591
2617 changed files with 332093 additions and 103438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Marlin/src/libs/stopwatch.cpp Executable file → Normal file
View File

@@ -16,7 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
@@ -34,14 +34,10 @@ millis_t Stopwatch::startTimestamp;
millis_t Stopwatch::stopTimestamp;
bool Stopwatch::stop() {
#if ENABLED(DEBUG_STOPWATCH)
Stopwatch::debug(PSTR("stop"));
#endif
Stopwatch::debug(PSTR("stop"));
if (isRunning() || isPaused()) {
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onPrintTimerStopped();
#endif
TERN_(EXTENSIBLE_UI, ExtUI::onPrintTimerStopped());
state = STOPPED;
stopTimestamp = millis();
return true;
@@ -50,14 +46,10 @@ bool Stopwatch::stop() {
}
bool Stopwatch::pause() {
#if ENABLED(DEBUG_STOPWATCH)
Stopwatch::debug(PSTR("pause"));
#endif
Stopwatch::debug(PSTR("pause"));
if (isRunning()) {
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onPrintTimerPaused();
#endif
TERN_(EXTENSIBLE_UI, ExtUI::onPrintTimerPaused());
state = PAUSED;
stopTimestamp = millis();
return true;
@@ -66,13 +58,9 @@ bool Stopwatch::pause() {
}
bool Stopwatch::start() {
#if ENABLED(DEBUG_STOPWATCH)
Stopwatch::debug(PSTR("start"));
#endif
Stopwatch::debug(PSTR("start"));
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onPrintTimerStarted();
#endif
TERN_(EXTENSIBLE_UI, ExtUI::onPrintTimerStarted());
if (!isRunning()) {
if (isPaused()) accumulator = duration();
@@ -86,18 +74,14 @@ bool Stopwatch::start() {
}
void Stopwatch::resume(const millis_t with_time) {
#if ENABLED(DEBUG_STOPWATCH)
Stopwatch::debug(PSTR("resume"));
#endif
Stopwatch::debug(PSTR("resume"));
reset();
if ((accumulator = with_time)) state = RUNNING;
}
void Stopwatch::reset() {
#if ENABLED(DEBUG_STOPWATCH)
Stopwatch::debug(PSTR("reset"));
#endif
Stopwatch::debug(PSTR("reset"));
state = STOPPED;
startTimestamp = 0;
@@ -106,8 +90,7 @@ void Stopwatch::reset() {
}
millis_t Stopwatch::duration() {
return ((isRunning() ? millis() : stopTimestamp)
- startTimestamp) / 1000UL + accumulator;
return accumulator + MS_TO_SEC((isRunning() ? millis() : stopTimestamp) - startTimestamp);
}
#if ENABLED(DEBUG_STOPWATCH)
@@ -115,7 +98,7 @@ millis_t Stopwatch::duration() {
void Stopwatch::debug(const char func[]) {
if (DEBUGGING(INFO)) {
SERIAL_ECHOPGM("Stopwatch::");
serialprintPGM(func);
SERIAL_ECHOPGM_P(func);
SERIAL_ECHOLNPGM("()");
}
}