melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4572 from thinkyhead/rc_digital_clock_100h

Browse Source 
Show up to 99:59 in digital time
This commit is contained in:
Scott Lahteine 2016-08-08 22:28:29 -07:00 committed by GitHub
commit 1f15f0df5f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin_main.cpp
View File

@ -8671,7 +8671,7 @@ void kill(const char* lcd_msg) {
UNUSED(lcd_msg); UNUSED(lcd_msg);
#endif #endif
for (int i = 5; i--;) delay(100); // Wait a short time delay(500); // Wait a short time
cli(); // Stop interrupts cli(); // Stop interrupts
thermalManager.disable_all_heaters(); thermalManager.disable_all_heaters();

2
Marlin/SanityCheck.h
View File

@ -744,6 +744,6 @@
/** /**
* emergency-command parser * 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)." #error "EMERGENCY_PARSER does not work on boards with AT90USB processors (USBCON)."
#endif #endif

2
Marlin/duration_t.h
View File

@ -145,7 +145,7 @@ struct duration_t {
* 1193046:59 * 1193046:59
*/ */
void toDigital(char *buffer) const { void toDigital(char *buffer) const {
int h = this->hour() % 24, int h = this->hour(),
m = this->minute() % 60; m = this->minute() % 60;
sprintf_P(buffer, PSTR("%02i:%02i"), h, m); sprintf_P(buffer, PSTR("%02i:%02i"), h, m);