From 03cf2b577be63a8f630c2ad9547d0e2ab3b73e00 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 6 Oct 2023 19:15:28 -0500 Subject: [PATCH] misc. formatting, grid condition --- Marlin/src/core/utility.h | 2 +- Marlin/src/lcd/e3v2/jyersui/dwin.cpp | 2 +- Marlin/src/lcd/extui/dgus_e3s1pro/DGUSScreenHandler.cpp | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h index 891a4e4383..c3324443ba 100644 --- a/Marlin/src/core/utility.h +++ b/Marlin/src/core/utility.h @@ -33,7 +33,7 @@ void safe_delay(millis_t ms); // Delay ensuring that temperatures are inline void serial_delay(const millis_t) {} #endif -#if (GRID_MAX_POINTS_X) && (GRID_MAX_POINTS_Y) +#if GRID_MAX_POINTS // 16x16 bit arrays template diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp index e6768e1ef4..343252df4c 100644 --- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp @@ -4480,7 +4480,7 @@ void JyersDWIN::printScreenControl() { #endif TERN_(HAS_FAN, thermalManager.fan_speed[0] = pausefan); planner.synchronize(); - TERN_(HAS_MEDIA, queue.inject(F("M24"))); + TERN_(HAS_MEDIA, queue.inject(FPSTR(M24_STR))); #endif } else { diff --git a/Marlin/src/lcd/extui/dgus_e3s1pro/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_e3s1pro/DGUSScreenHandler.cpp index 37c52d86cd..94c881f384 100644 --- a/Marlin/src/lcd/extui/dgus_e3s1pro/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/dgus_e3s1pro/DGUSScreenHandler.cpp @@ -107,8 +107,7 @@ void DGUSScreenHandler::loop() { } #if ENABLED(POWER_LOSS_RECOVERY) - if (booted && powerLossRecoveryAvailable) - { + if (booted && powerLossRecoveryAvailable) { triggerScreenChange(DGUS_ScreenID::POWERCONTINUE); powerLossRecoveryAvailable = false; } @@ -355,11 +354,8 @@ void DGUSScreenHandler::addCurrentPageStringLength(size_t stringLength, size_t t void DGUSScreenHandler::sdCardRemoved() { sdPrintFilename = noFileSelected; - - if (getCurrentScreen() >= DGUS_ScreenID::FILE1 - && getCurrentScreen() <= DGUS_ScreenID::FILE4) { + if (WITHIN(getCurrentScreen(), DGUS_ScreenID::FILE1, DGUS_ScreenID::FILE4)) triggerTempScreenChange(DGUS_ScreenID::SDCARDCHECK, DGUS_ScreenID::HOME); - } } void DGUSScreenHandler::sdCardError() {}