Merge pull request #2170 from thinkyhead/beep_M600_elsewise

Slight size reduction by adding idle()

Marlin/Marlin.h

@@ -116,6 +116,8 @@ FORCE_INLINE void serialprintPGM(const char *str) {
 
 void get_command();
 
+void idle(); // the standard idle routine calls manage_inactivity(false)
+
 void manage_inactivity(bool ignore_stepper_queue=false);
 
 #if defined(DUAL_X_CARRIAGE) && HAS_X_ENABLE && HAS_X2_ENABLE

Marlin/Marlin_main.cpp

@@ -726,11 +726,8 @@ void loop() {
     commands_in_queue--;
     cmd_queue_index_r = (cmd_queue_index_r + 1) % BUFSIZE;
   }
-  // Check heater every n milliseconds
-  manage_heater();
-  manage_inactivity();
   checkHitEndstops();
-  lcd_update();
+  idle();
 }
 
 void gcode_line_error(const char *err, bool doFlush=true) {
@@ -1998,11 +1995,7 @@ inline void gcode_G4() {
 
   if (!lcd_hasstatus()) LCD_MESSAGEPGM(MSG_DWELL);
 
-  while (millis() < codenum) {
+  while (millis() < codenum) idle();
-    manage_heater();
-    manage_inactivity();
-    lcd_update();
-  }
 }
 
 #ifdef FWRETRACT
@@ -2682,9 +2675,7 @@ inline void gcode_G28() {
 
           probePointCounter++;
 
-          manage_heater();
+          idle();
-          manage_inactivity();
-          lcd_update();
 
         } //xProbe
       } //yProbe
@@ -2885,21 +2876,13 @@ inline void gcode_G92() {
     st_synchronize();
     refresh_cmd_timeout();
     if (codenum > 0) {
-      codenum += previous_cmd_ms;  // keep track of when we started waiting
+      codenum += previous_cmd_ms;  // wait until this time for a click
-      while(millis() < codenum && !lcd_clicked()) {
+      while (millis() < codenum && !lcd_clicked()) idle();
-        manage_heater();
-        manage_inactivity();
-        lcd_update();
-      }
       lcd_ignore_click(false);
     }
     else {
       if (!lcd_detected()) return;
-      while (!lcd_clicked()) {
+      while (!lcd_clicked()) idle();
-        manage_heater();
-        manage_inactivity();
-        lcd_update();
-      }
     }
     if (IS_SD_PRINTING)
       LCD_MESSAGEPGM(MSG_RESUMING);
@@ -3522,9 +3505,9 @@ inline void gcode_M109() {
         #endif
         temp_ms = millis();
       }
-      manage_heater();
+
-      manage_inactivity();
+      idle();
-      lcd_update();
+
       #ifdef TEMP_RESIDENCY_TIME
         // start/restart the TEMP_RESIDENCY_TIME timer whenever we reach target temp for the first time
         // or when current temp falls outside the hysteresis after target temp was reached
@@ -3572,9 +3555,7 @@ inline void gcode_M109() {
         SERIAL_PROTOCOL_F(degBed(), 1);
         SERIAL_EOL;
       }
-      manage_heater();
+      idle();
-      manage_inactivity();
-      lcd_update();
     }
     LCD_MESSAGEPGM(MSG_BED_DONE);
     refresh_cmd_timeout();
@@ -4253,11 +4234,7 @@ inline void gcode_M226() {
             break;
         }
 
-        while(digitalRead(pin_number) != target) {
+        while (digitalRead(pin_number) != target) idle();
-          manage_heater();
-          manage_inactivity();
-          lcd_update();
-        }
 
       } // pin_number > -1
     } // pin_state -1 0 1
@@ -6242,6 +6219,15 @@ void disable_all_steppers() {
   disable_e3();
 }
 
+/**
+ * Standard idle routine keeps the machine alive
+ */
+void idle() {
+  manage_heater();
+  manage_inactivity();
+  lcd_update();
+}
+
 /**
  * Manage several activities:
  *  - Check for Filament Runout

Marlin/planner.cpp

@@ -478,11 +478,7 @@ float junction_deviation = 0.1;
 
   // If the buffer is full: good! That means we are well ahead of the robot. 
   // Rest here until there is room in the buffer.
-  while(block_buffer_tail == next_buffer_head) {
+  while (block_buffer_tail == next_buffer_head) idle();
-    manage_heater(); 
-    manage_inactivity(); 
-    lcd_update();
-  }
 
   #ifdef MESH_BED_LEVELING
     if (mbl.active) z += mbl.get_z(x, y);

Marlin/stepper.cpp

@@ -1046,14 +1046,10 @@ void st_init() {
 }
 
 
-// Block until all buffered steps are executed
+/**
-void st_synchronize() {
+ * Block until all buffered steps are executed
-  while (blocks_queued()) {
+ */
-    manage_heater();
+void st_synchronize() { while (blocks_queued()) idle(); }
-    manage_inactivity();
-    lcd_update();
-  }
-}
 
 void st_set_position(const long &x, const long &y, const long &z, const long &e) {
   CRITICAL_SECTION_START;