zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ExtUI Pause/Stop on all Pause/Stop (#15188)

Browse source
This commit is contained in:
InsanityAutomation 2019-09-08 02:47:07 -04:00 committed by Scott Lahteine
parent 1c3a1ab2c6
commit 0693767efa
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/gcode/stats/M75-M78.cpp
View file

@ -24,10 +24,6 @@
#include "../../module/printcounter.h" #include "../../module/printcounter.h"
#include "../../lcd/ultralcd.h" #include "../../lcd/ultralcd.h"
#if ENABLED(EXTENSIBLE_UI)
#include "../../lcd/extensible_ui/ui_api.h"
#endif
/** /**
* M75: Start print timer * M75: Start print timer
*/ */
@ -40,9 +36,6 @@ void GcodeSuite::M75() {
*/ */
void GcodeSuite::M76() { void GcodeSuite::M76() {
print_job_timer.pause(); print_job_timer.pause();
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onPrintTimerPaused();
#endif
} }
/** /**
@ -50,9 +43,6 @@ void GcodeSuite::M76() {
*/ */
void GcodeSuite::M77() { void GcodeSuite::M77() {
print_job_timer.stop(); print_job_timer.stop();
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onPrintTimerStopped();
#endif
} }
#if ENABLED(PRINTCOUNTER) #if ENABLED(PRINTCOUNTER)

6
Marlin/src/libs/stopwatch.cpp
View file

@ -39,6 +39,9 @@ bool Stopwatch::stop() {
#endif #endif
if (isRunning() || isPaused()) { if (isRunning() || isPaused()) {
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onPrintTimerStopped();
#endif
state = STOPPED; state = STOPPED;
stopTimestamp = millis(); stopTimestamp = millis();
return true; return true;
@ -52,6 +55,9 @@ bool Stopwatch::pause() {
#endif #endif
if (isRunning()) { if (isRunning()) {
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onPrintTimerPaused();
#endif
state = PAUSED; state = PAUSED;
stopTimestamp = millis(); stopTimestamp = millis();
return true; return true;