Просмотр исходного кода

misc. formatting, grid condition

Scott Lahteine 1 год назад
Родитель
Сommit
03cf2b577b

+ 1 - 1
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 <int W, int H>

+ 1 - 1
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 {

+ 2 - 6
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() {}