MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🩹 Fix SERVICE_INTERVAL reset (#24888)

Browse Source
This commit is contained in:
phigjm 2022-11-22 00:41:14 +01:00 committed by Scott Lahteine
parent 473d2b888a
commit 9772f7806b
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/module/printcounter.cpp
View File

@ -314,13 +314,13 @@ void PrintCounter::reset() {
void PrintCounter::resetServiceInterval(const int index) { void PrintCounter::resetServiceInterval(const int index) {
switch (index) { switch (index) {
#if SERVICE_INTERVAL_1 > 0 #if SERVICE_INTERVAL_1 > 0
case 1: data.nextService1 = SERVICE_INTERVAL_SEC_1; case 1: data.nextService1 = SERVICE_INTERVAL_SEC_1; break;
#endif #endif
#if SERVICE_INTERVAL_2 > 0 #if SERVICE_INTERVAL_2 > 0
case 2: data.nextService2 = SERVICE_INTERVAL_SEC_2; case 2: data.nextService2 = SERVICE_INTERVAL_SEC_2; break;
#endif #endif
#if SERVICE_INTERVAL_3 > 0 #if SERVICE_INTERVAL_3 > 0
case 3: data.nextService3 = SERVICE_INTERVAL_SEC_3; case 3: data.nextService3 = SERVICE_INTERVAL_SEC_3; break;
#endif #endif
} }
saveStats(); saveStats();

4
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
View File

@ -53,8 +53,8 @@
// //
//#define WIFI_SERIAL 1// USART1 //#define WIFI_SERIAL 1// USART1
#if ENABLED(MKS_WIFI_MODULE) #if ENABLED(MKS_WIFI_MODULE)
#define WIFI_IO0_PIN PB14 // MKS ESP WIFI IO0 PIN #define WIFI_IO0_PIN PB14 // MKS ESP WIFI IO0 PIN
#define WIFI_IO1_PIN PB15 // MKS ESP WIFI IO1 PIN #define WIFI_IO1_PIN PB15 // MKS ESP WIFI IO1 PIN
#define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN #define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN
#endif #endif

18
Marlin/src/sd/cardreader.cpp
View File

@ -330,15 +330,15 @@ void CardReader::printListing(SdFile parent, const char * const prepend, const
SERIAL_CHAR(' '); SERIAL_CHAR(' ');
SERIAL_ECHO(p.fileSize); SERIAL_ECHO(p.fileSize);
if (includeTime) { if (includeTime) {
SERIAL_CHAR(' '); SERIAL_CHAR(' ');
uint16_t crmodDate = p.lastWriteDate, crmodTime = p.lastWriteTime; uint16_t crmodDate = p.lastWriteDate, crmodTime = p.lastWriteTime;
if (crmodDate < p.creationDate || (crmodDate == p.creationDate && crmodTime < p.creationTime)) { if (crmodDate < p.creationDate || (crmodDate == p.creationDate && crmodTime < p.creationTime)) {
crmodDate = p.creationDate; crmodDate = p.creationDate;
crmodTime = p.creationTime; crmodTime = p.creationTime;
} }
SERIAL_ECHOPGM("0x", hex_word(crmodDate)); SERIAL_ECHOPGM("0x", hex_word(crmodDate));
print_hex_word(crmodTime); print_hex_word(crmodTime);
} }
#if ENABLED(LONG_FILENAME_HOST_SUPPORT) #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
if (includeLong) { if (includeLong) {
SERIAL_CHAR(' '); SERIAL_CHAR(' ');