Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUG] fix reset of multiple SERVICE_INTERVAL #24888

Merged
merged 4 commits into from
Nov 21, 2022
Merged

[BUG] fix reset of multiple SERVICE_INTERVAL #24888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4137076
reset only the selected service
phigjm Oct 17, 2022
b14d137
format the code
phigjm Oct 17, 2022
2f9fb94
adjust spaces
thinkyhead Nov 19, 2022
114d4b6
Merge branch 'bugfix-2.1.x' into pr/24888
thinkyhead Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Marlin/src/module/printcounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 9 additions & 9 deletions Marlin/src/sd/cardreader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(' ');
Expand Down