Browse Source

Merge pull request #4572 from thinkyhead/rc_digital_clock_100h

Show up to 99:59 in digital time
Scott Lahteine 9 years ago
parent
commit
1f15f0df5f
3 changed files with 3 additions and 3 deletions
  1. 1
    1
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/SanityCheck.h
  3. 1
    1
      Marlin/duration_t.h

+ 1
- 1
Marlin/Marlin_main.cpp View File

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

+ 1
- 1
Marlin/SanityCheck.h View File

@@ -744,6 +744,6 @@
744 744
 /**
745 745
  * emergency-command parser
746 746
  */
747
-#if ENABLED(EMERGENCY_PARSER) && ENABLED(USBCON)
747
+#if ENABLED(EMERGENCY_PARSER) && defined(USBCON)
748 748
   #error "EMERGENCY_PARSER does not work on boards with AT90USB processors (USBCON)."
749 749
 #endif

+ 1
- 1
Marlin/duration_t.h View File

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

Loading…
Cancel
Save