From 30b1c731b5c35f1db76cbb381e599326c6e74f7b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 8 Aug 2016 21:26:34 -0700
Subject: [PATCH 1/3] Show up to 99:59 in digital time

---
 Marlin/duration_t.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);

From 45f67164b6914af18423a5c1d6c27c12e9972fc7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 8 Aug 2016 21:49:34 -0700
Subject: [PATCH 2/3] Simplify the delay in kill()

---
 Marlin/Marlin_main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();

From 8100a4dace69b6029846b437ecb370bead8486f1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 8 Aug 2016 21:49:57 -0700
Subject: [PATCH 3/3] Fix a compile error in EMERGENCY_PARSER sanity check

---
 Marlin/SanityCheck.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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