diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 1c2d540a15..995f6d803b 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -8671,7 +8671,7 @@ void kill(const char* lcd_msg) { UNUSED(lcd_msg); #endif - for (int i = 5; i--;) delay(100); // Wait a short time + delay(500); // Wait a short time cli(); // Stop interrupts thermalManager.disable_all_heaters(); diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index c8b9a8d723..cc8625e8f6 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -744,6 +744,6 @@ /** * emergency-command parser */ -#if ENABLED(EMERGENCY_PARSER) && ENABLED(USBCON) +#if ENABLED(EMERGENCY_PARSER) && defined(USBCON) #error "EMERGENCY_PARSER does not work on boards with AT90USB processors (USBCON)." #endif diff --git a/Marlin/duration_t.h b/Marlin/duration_t.h index 25ea9bb989..60e02a439c 100644 --- a/Marlin/duration_t.h +++ b/Marlin/duration_t.h @@ -145,7 +145,7 @@ struct duration_t { * 1193046:59 */ void toDigital(char *buffer) const { - int h = this->hour() % 24, + int h = this->hour(), m = this->minute() % 60; sprintf_P(buffer, PSTR("%02i:%02i"), h, m);