3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-29 23:07:42 +00:00
Code Issues Releases Wiki Activity

misc. formatting, grid condition

Browse Source
This commit is contained in:
Scott Lahteine 2023-10-06 19:15:28 -05:00
parent b3b6f23320
commit 03cf2b577b
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/core/utility.h
View File

@ -33,7 +33,7 @@ void safe_delay(millis_t ms); // Delay ensuring that temperatures are
inline void serial_delay(const millis_t) {} inline void serial_delay(const millis_t) {}
#endif #endif
#if (GRID_MAX_POINTS_X) && (GRID_MAX_POINTS_Y) #if GRID_MAX_POINTS
// 16x16 bit arrays // 16x16 bit arrays
template <int W, int H> template <int W, int H>

2
Marlin/src/lcd/e3v2/jyersui/dwin.cpp
View File

@ -4480,7 +4480,7 @@ void JyersDWIN::printScreenControl() {
#endif #endif
TERN_(HAS_FAN, thermalManager.fan_speed[0] = pausefan); TERN_(HAS_FAN, thermalManager.fan_speed[0] = pausefan);
planner.synchronize(); planner.synchronize();
TERN_(HAS_MEDIA, queue.inject(F("M24"))); TERN_(HAS_MEDIA, queue.inject(FPSTR(M24_STR)));
#endif #endif
} }
else { else {

8
Marlin/src/lcd/extui/dgus_e3s1pro/DGUSScreenHandler.cpp
View File

@ -107,8 +107,7 @@ void DGUSScreenHandler::loop() {
} }
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
if (booted && powerLossRecoveryAvailable) if (booted && powerLossRecoveryAvailable) {
{
triggerScreenChange(DGUS_ScreenID::POWERCONTINUE); triggerScreenChange(DGUS_ScreenID::POWERCONTINUE);
powerLossRecoveryAvailable = false; powerLossRecoveryAvailable = false;
} }
@ -355,11 +354,8 @@ void DGUSScreenHandler::addCurrentPageStringLength(size_t stringLength, size_t t
void DGUSScreenHandler::sdCardRemoved() { void DGUSScreenHandler::sdCardRemoved() {
sdPrintFilename = noFileSelected; sdPrintFilename = noFileSelected;
if (WITHIN(getCurrentScreen(), DGUS_ScreenID::FILE1, DGUS_ScreenID::FILE4))
if (getCurrentScreen() >= DGUS_ScreenID::FILE1
&& getCurrentScreen() <= DGUS_ScreenID::FILE4) {
triggerTempScreenChange(DGUS_ScreenID::SDCARDCHECK, DGUS_ScreenID::HOME); triggerTempScreenChange(DGUS_ScreenID::SDCARDCHECK, DGUS_ScreenID::HOME);
}
} }
void DGUSScreenHandler::sdCardError() {} void DGUSScreenHandler::sdCardError() {}