Browse Source

Simplify filament_change_beep function

Scott Lahteine 8 years ago
parent
commit
bfe6f71794
1 changed files with 6 additions and 12 deletions
  1. 6
    12
      Marlin/Marlin_main.cpp

+ 6
- 12
Marlin/Marlin_main.cpp View File

@@ -7294,18 +7294,12 @@ inline void gcode_M503() {
7294 7294
   unsigned long int runout_beep = 0;
7295 7295
 
7296 7296
   void filament_change_beep() {
7297
-    millis_t ms = millis(); 
7298
-    if (ms >= next_buzz) { 
7299
-      if (runout_beep <= FILAMENT_CHANGE_NUMBER_OF_ALERT_BEEPS ) { // Only beep as long as we are supposed to! 
7300
-      BUZZ(300, 2000); 
7301
-      next_buzz = ms + 2500; // Beep every 2.5s while waiting 
7302
-      runout_beep++; 
7303
-      } 
7304
-      else if (runout_beep > FILAMENT_CHANGE_NUMBER_OF_ALERT_BEEPS  && 
7305
-               runout_beep <= (FILAMENT_CHANGE_NUMBER_OF_ALERT_BEEPS + 5)) { // End with a burst of short beeps 
7306
-        BUZZ(200, 2000); 
7307
-        next_buzz = ms + 400; // Beep  
7308
-        runout_beep++; 
7297
+    const millis_t ms = millis();
7298
+    if (ELAPSED(ms, next_buzz)) {
7299
+      if (runout_beep <= FILAMENT_CHANGE_NUMBER_OF_ALERT_BEEPS + 5) { // Only beep as long as we're supposed to
7300
+        next_buzz = ms + (runout_beep <= FILAMENT_CHANGE_NUMBER_OF_ALERT_BEEPS ? 2500 : 400);
7301
+        BUZZ(300, 2000);
7302
+        runout_beep++;
7309 7303
       }
7310 7304
     }
7311 7305
   }

Loading…
Cancel
Save