🎨 Use ExtUI API where applicable

MarlinFirmware · Oct 3, 2021 · fcbd99d · fcbd99d
1 parent 209e5c2
commit fcbd99d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -2566,7 +2566,7 @@
 //  - Copy the downloaded DWIN_SET folder to the SD card.
 //
 // RELOADED (T5UID1)
-//  - Download https://github.com/Desuuuu/DGUS-reloaded
+//  - Download https://github.com/Desuuuu/DGUS-reloaded/releases
 //  - Copy the downloaded DWIN_SET folder to the SD card.
 //
 //#define DGUS_LCD_UI_ORIGIN

diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -63,13 +63,13 @@ void DGUSRxHandler::ScreenChange(DGUS_VP &vp, void *data_ptr) {
   }
 
   if (vp.addr == DGUS_Addr::SCREENCHANGE_Idle
-      && (printingIsActive() || printingIsPaused())) {
+      && (ExtUI::isPrinting() || ExtUI::isPrintingPaused())) {
     dgus_screen_handler.SetStatusMessagePGM(PSTR("Impossible while printing"));
     return;
   }
 
   if (vp.addr == DGUS_Addr::SCREENCHANGE_Printing
-      && (!printingIsActive() && !printingIsPaused())) {
+      && (!ExtUI::isPrinting() && !ExtUI::isPrintingPaused())) {
     dgus_screen_handler.SetStatusMessagePGM(PSTR("Impossible while idle"));
     return;
   }
@@ -166,7 +166,7 @@ void DGUSRxHandler::PrintAbort(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  if (!printingIsActive() && !printingIsPaused()) {
+  if (!ExtUI::isPrinting() && !ExtUI::isPrintingPaused()) {
     dgus_screen_handler.TriggerFullUpdate();
     return;
   }
@@ -183,7 +183,7 @@ void DGUSRxHandler::PrintPause(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  if (!printingIsActive()) {
+  if (!ExtUI::isPrinting()) {
     dgus_screen_handler.TriggerFullUpdate();
     return;
   }
@@ -200,7 +200,7 @@ void DGUSRxHandler::PrintResume(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  if (!printingIsPaused()) {
+  if (!ExtUI::isPrintingPaused()) {
     dgus_screen_handler.TriggerFullUpdate();
     return;
   }
@@ -984,20 +984,11 @@ void DGUSRxHandler::WaitAbort(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  if (!printingIsPaused()
-      #if ENABLED(ADVANCED_PAUSE_FEATURE)
-        || !did_pause_print
-      #endif
-  ) {
+  if (!ExtUI::isPrintingPaused()) {
     dgus_screen_handler.TriggerFullUpdate();
     return;
   }
 
-  #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    did_pause_print = 0;
-  #endif
-
-  ExtUI::setUserConfirmed();
   ExtUI::stopPrint();
 
   dgus_screen_handler.TriggerFullUpdate();

diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSSetupHandler.cpp
@@ -47,7 +47,7 @@
 #endif
 
 bool DGUSSetupHandler::PrintStatus() {
-  if (printingIsActive() || printingIsPaused()) {
+  if (ExtUI::isPrinting() || ExtUI::isPrintingPaused()) {
     return true;
   }
 
@@ -56,7 +56,7 @@ bool DGUSSetupHandler::PrintStatus() {
 }
 
 bool DGUSSetupHandler::PrintAdjust() {
-  if (printingIsActive() || printingIsPaused()) {
+  if (ExtUI::isPrinting() || ExtUI::isPrintingPaused()) {
     return true;
   }
 

diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
@@ -214,7 +214,7 @@ void DGUSTxHandler::Percent(DGUS_VP &vp) {
 void DGUSTxHandler::StatusIcons(DGUS_VP &vp) {
   uint16_t icons = 0;
 
-  if (printingIsActive()) {
+  if (ExtUI::isPrinting()) {
     icons |= (uint16_t)DGUS_Data::StatusIcon::PAUSE;
 
     dgus_display.EnableControl(DGUS_Screen::PRINT_STATUS,
@@ -227,7 +227,7 @@ void DGUSTxHandler::StatusIcons(DGUS_VP &vp) {
                                 DGUS_Control::PAUSE);
   }
 
-  if (printingIsPaused()) {
+  if (ExtUI::isPrintingPaused()) {
     icons |= (uint16_t)DGUS_Data::StatusIcon::RESUME;
 
     dgus_display.EnableControl(DGUS_Screen::PRINT_STATUS,
@@ -561,11 +561,7 @@ void DGUSTxHandler::FilamentUsed(DGUS_VP &vp) {
 void DGUSTxHandler::WaitIcons(DGUS_VP &vp) {
   uint16_t icons = 0;
 
-  if (printingIsPaused()
-    #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      && did_pause_print
-    #endif
-  ) {
+  if (ExtUI::isPrintingPaused()) {
     icons |= (uint16_t)DGUS_Data::WaitIcon::ABORT;
 
     dgus_display.EnableControl(DGUS_Screen::WAIT,