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

Show up to 99:59 in digital time #4572

Merged
merged 3 commits into from
Aug 9, 2016
Merged

Show up to 99:59 in digital time #4572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30b1c73
Show up to 99:59 in digital time
thinkyhead Aug 9, 2016
45f6716
Simplify the delay in kill()
thinkyhead Aug 9, 2016
8100a4d
Fix a compile error in EMERGENCY_PARSER sanity check
thinkyhead Aug 9, 2016
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
2 changes: 1 addition & 1 deletion Marlin/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Marlin/SanityCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Marlin/duration_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down