From 9772f7806bf83d000f761c79e177a9e21573223e Mon Sep 17 00:00:00 2001 From: phigjm <39876427+phigjm@users.noreply.github.com> Date: Tue, 22 Nov 2022 00:41:14 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20SERVICE=5FINTERVAL=20reset?= =?UTF-8?q?=20(#24888)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/module/printcounter.cpp | 6 +++--- Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h | 4 ++-- Marlin/src/sd/cardreader.cpp | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp index ad6f4eff68..3b6239c667 100644 --- a/Marlin/src/module/printcounter.cpp +++ b/Marlin/src/module/printcounter.cpp @@ -314,13 +314,13 @@ void PrintCounter::reset() { void PrintCounter::resetServiceInterval(const int index) { switch (index) { #if SERVICE_INTERVAL_1 > 0 - case 1: data.nextService1 = SERVICE_INTERVAL_SEC_1; + case 1: data.nextService1 = SERVICE_INTERVAL_SEC_1; break; #endif #if SERVICE_INTERVAL_2 > 0 - case 2: data.nextService2 = SERVICE_INTERVAL_SEC_2; + case 2: data.nextService2 = SERVICE_INTERVAL_SEC_2; break; #endif #if SERVICE_INTERVAL_3 > 0 - case 3: data.nextService3 = SERVICE_INTERVAL_SEC_3; + case 3: data.nextService3 = SERVICE_INTERVAL_SEC_3; break; #endif } saveStats(); diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h index b3d6d48d9f..13e912d970 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h @@ -53,8 +53,8 @@ // //#define WIFI_SERIAL 1// USART1 #if ENABLED(MKS_WIFI_MODULE) - #define WIFI_IO0_PIN PB14 // MKS ESP WIFI IO0 PIN - #define WIFI_IO1_PIN PB15 // MKS ESP WIFI IO1 PIN + #define WIFI_IO0_PIN PB14 // MKS ESP WIFI IO0 PIN + #define WIFI_IO1_PIN PB15 // MKS ESP WIFI IO1 PIN #define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN #endif diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp index 085ae9541c..07255f7e7f 100644 --- a/Marlin/src/sd/cardreader.cpp +++ b/Marlin/src/sd/cardreader.cpp @@ -330,15 +330,15 @@ void CardReader::printListing(SdFile parent, const char * const prepend, const SERIAL_CHAR(' '); SERIAL_ECHO(p.fileSize); if (includeTime) { - SERIAL_CHAR(' '); - uint16_t crmodDate = p.lastWriteDate, crmodTime = p.lastWriteTime; - if (crmodDate < p.creationDate || (crmodDate == p.creationDate && crmodTime < p.creationTime)) { - crmodDate = p.creationDate; - crmodTime = p.creationTime; - } - SERIAL_ECHOPGM("0x", hex_word(crmodDate)); - print_hex_word(crmodTime); - } + SERIAL_CHAR(' '); + uint16_t crmodDate = p.lastWriteDate, crmodTime = p.lastWriteTime; + if (crmodDate < p.creationDate || (crmodDate == p.creationDate && crmodTime < p.creationTime)) { + crmodDate = p.creationDate; + crmodTime = p.creationTime; + } + SERIAL_ECHOPGM("0x", hex_word(crmodDate)); + print_hex_word(crmodTime); + } #if ENABLED(LONG_FILENAME_HOST_SUPPORT) if (includeLong) { SERIAL_CHAR(' ');