From 4678bb49b924e0ae6454c412c7ed5d28b3f427fa Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sun, 3 Apr 2022 14:54:03 -0400
Subject: [PATCH] Update Creality_DWIN.cpp

---
 Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
index aa8a53445b..a39d9fe959 100644
--- a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
+++ b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
@@ -1784,10 +1784,8 @@ void RTSSHOW::RTS_HandleData()
         if(
         #if DISABLED(FILAMENT_RUNOUT_SENSOR) || ENABLED(FILAMENT_MOTION_SENSOR)
           true
-        #elif NUM_RUNOUT_SENSORS > 1
-          (getActiveTool() == E0 && READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE) || (getActiveTool() == E1 && READ(FIL_RUNOUT2_PIN) != FIL_RUNOUT2_STATE)
         #else
-          (getActiveTool() == E0 && READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE)
+          (getActiveTool() == E0 && !getFilamentRunoutState() )
         #endif
          || (ExtUI::pauseModeStatus != PAUSE_MESSAGE_PURGE && ExtUI::pauseModeStatus != PAUSE_MESSAGE_OPTION)
         ) {
@@ -2470,14 +2468,14 @@ void onLoadSettings(const char *buff)
   SetTouchScreenConfiguration();
 }
 
-void onConfigurationStoreWritten(bool success)
+void onSettingsStored(bool success)
 {
-	SERIAL_ECHOLNPGM_P(PSTR("==onConfigurationStoreWritten=="));
+	SERIAL_ECHOLNPGM_P(PSTR("==onSettingsStored=="));
 	// This is called after the entire EEPROM has been written,
 	// whether successful or not.
 }
 
-void onConfigurationStoreRead(bool success)
+void onSettingsLoaded(bool success)
 {
 	SERIAL_ECHOLNPGM_P(PSTR("==onConfigurationStoreRead=="));
   #if HAS_MESH && (ANY(MachineCR10SPro, MachineEnder5Plus, MachineCR10Max) || ENABLED(FORCE10SPRODISPLAY))
@@ -2539,7 +2537,7 @@ void onConfigurationStoreRead(bool success)
     onStatusChanged("PID Tune Finished");
   }
 #endif
-void onMeshLevelingStart() {
+void onLevelingStart() {
 
 }
 
@@ -2548,7 +2546,7 @@ void onSteppersEnabled()
 
 }
 
-void onPrintFinished()
+void onPrintDone()
 {
 
 }
@@ -2558,7 +2556,7 @@ void onHomingStart()
 
 }
 
-void onHomingComplete()
+void onHomingDone()
 {
 
 }