From 21aec4427a4caab4d71e708172aa7083dec91f79 Mon Sep 17 00:00:00 2001
From: Desuuuu <contact@desuuuu.com>
Date: Fri, 10 Sep 2021 12:15:08 +0200
Subject: [PATCH] Use ExtUI API where applicable

---
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp | 21 ++++++-------------
 .../extui/dgus_reloaded/DGUSSetupHandler.cpp  |  4 ++--
 .../lcd/extui/dgus_reloaded/DGUSTxHandler.cpp | 10 +++------
 platformio.ini                                |  1 +
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index 987856bdbff6..1bbd6d12a735 100644
--- 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
index c09dc46cb2b2..88bc8187eabc 100644
--- 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
index 75463e94d7d9..6030db1eb1f5 100644
--- 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,
diff --git a/platformio.ini b/platformio.ini
index f55f5f5a9355..afb8b3212d7e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -74,6 +74,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/lcd/extui/anycubic_chiron>
   -<src/lcd/extui/anycubic_i3mega>
   -<src/lcd/extui/dgus> -<src/lcd/extui/dgus/fysetc> -<src/lcd/extui/dgus/hiprecy> -<src/lcd/extui/dgus/mks> -<src/lcd/extui/dgus/origin>
+  -<src/lcd/extui/dgus_reloaded>
   -<src/lcd/extui/example>
   -<src/lcd/extui/ftdi_eve_touch_ui>
   -<src/lcd/extui/malyan>