ExtUI Pause/Stop on all Pause/Stop (#15188)
This commit is contained in:
		
				
					committed by
					
						 Scott Lahteine
						Scott Lahteine
					
				
			
			
				
	
			
			
			
						parent
						
							1c3a1ab2c6
						
					
				
				
					commit
					0693767efa
				
			| @@ -24,10 +24,6 @@ | ||||
| #include "../../module/printcounter.h" | ||||
| #include "../../lcd/ultralcd.h" | ||||
|  | ||||
| #if ENABLED(EXTENSIBLE_UI) | ||||
|   #include "../../lcd/extensible_ui/ui_api.h" | ||||
| #endif | ||||
|  | ||||
| /** | ||||
|  * M75: Start print timer | ||||
|  */ | ||||
| @@ -40,9 +36,6 @@ void GcodeSuite::M75() { | ||||
|  */ | ||||
| void GcodeSuite::M76() { | ||||
|   print_job_timer.pause(); | ||||
|   #if ENABLED(EXTENSIBLE_UI) | ||||
|     ExtUI::onPrintTimerPaused(); | ||||
|   #endif | ||||
| } | ||||
|  | ||||
| /** | ||||
| @@ -50,9 +43,6 @@ void GcodeSuite::M76() { | ||||
|  */ | ||||
| void GcodeSuite::M77() { | ||||
|  print_job_timer.stop(); | ||||
|  #if ENABLED(EXTENSIBLE_UI) | ||||
|    ExtUI::onPrintTimerStopped(); | ||||
|  #endif | ||||
| } | ||||
|  | ||||
| #if ENABLED(PRINTCOUNTER) | ||||
|   | ||||
| @@ -39,6 +39,9 @@ bool Stopwatch::stop() { | ||||
|   #endif | ||||
|  | ||||
|   if (isRunning() || isPaused()) { | ||||
|     #if ENABLED(EXTENSIBLE_UI) | ||||
|       ExtUI::onPrintTimerStopped(); | ||||
|     #endif | ||||
|     state = STOPPED; | ||||
|     stopTimestamp = millis(); | ||||
|     return true; | ||||
| @@ -52,6 +55,9 @@ bool Stopwatch::pause() { | ||||
|   #endif | ||||
|  | ||||
|   if (isRunning()) { | ||||
|     #if ENABLED(EXTENSIBLE_UI) | ||||
|       ExtUI::onPrintTimerPaused(); | ||||
|     #endif | ||||
|     state = PAUSED; | ||||
|     stopTimestamp = millis(); | ||||
|     return true; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user