From 4b943a0b04352ef857e0b62cce254da30d003475 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Tue, 30 Jan 2024 10:27:36 -0500 Subject: [PATCH] tweaks --- Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp | 15 +++++---------- Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h | 1 - 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp index 3ba160e8fe..c5fd548560 100644 --- a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp @@ -310,6 +310,10 @@ if(idleThrottling == 400) { rtscheck.RTS_SndData(28, RunoutMode); if(getRunoutMode(getActiveTool()) == 7) rtscheck.RTS_SndData(25, RunoutMode); + if(getFilamentRunoutEnabled(getActiveTool())) + rtscheck.RTS_SndData(3, RunoutToggle); /*On*/ + else + rtscheck.RTS_SndData(2, RunoutToggle); /*Off*/ #endif switch(babystepIncrementIndex) @@ -367,7 +371,7 @@ if(idleThrottling == 400) { rtscheck.RTS_SndData(2, LedToggle); /*Off*/ #endif - #if POWER_LOSS_RECOVERY + #if ENABLED(POWER_LOSS_RECOVERY) if(getPowerLossRecoveryEnabled()) rtscheck.RTS_SndData(3, PowerLossToggle); /*On*/ else @@ -376,15 +380,6 @@ if(idleThrottling == 400) { rtscheck.RTS_SndData(2, PowerLossToggle); /*Off*/ #endif - #if HAS_FILAMENT_SENSOR - if(getFilamentRunoutEnabled()) - rtscheck.RTS_SndData(3, RunoutToggle); /*On*/ - else - rtscheck.RTS_SndData(2, RunoutToggle); /*Off*/ - #else - rtscheck.RTS_SndData(2, RunoutToggle); /*Off*/ - #endif - } if (startprogress == 0) diff --git a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h index 5a8813dfa4..ba40127c9b 100644 --- a/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h +++ b/Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h @@ -74,7 +74,6 @@ namespace ExtUI { #define PrintscheduleIcon 0x100E #define Timehour 0x1010 #define Timemin 0x1012 -#define IconPrintstatus 0x1014 #define Percentage 0x1016 #define FanKeyIcon 0x101E #define Flowrate 0x1300