Revert "Manually add missing changes from Add M576: Buffer monitoring MarlinFirmware#19674"

This reverts commit 8444d59.

Author: tomc

Marlin/Configuration_adv.h

@@ -2211,14 +2211,6 @@
 // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary.
 #define ADVANCED_OK
 
-/**
- * Buffer monitoring
- * 
- * To help diagnose print quality issues stemming from command buffers being empty,
- * we add M576 which enables reporting of buffer empty
- */
-//#define BUFFER_MONITORING
-
 // Printrun may have trouble receiving long strings all at once.
 // This option inserts short delays between lines of serial output.
 #define SERIAL_OVERRUN_PROTECTION

Marlin/src/gcode/gcode.cpp

@@ -851,10 +851,6 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 575: M575(); break;                                  // M575: Set serial baudrate
       #endif
 
-      #if ENABLED(BUFFER_MONITORING)                              // M576: Buffer monitoring
-        case 576: M576(); break;
-      #endif
-
       #if ENABLED(ADVANCED_PAUSE_FEATURE)
         case 600: M600(); break;                                  // M600: Pause for Filament Change
         case 603: M603(); break;                                  // M603: Configure Filament Change

Marlin/src/gcode/gcode.h

@@ -972,8 +972,6 @@ class GcodeSuite {
     static void M575();
   #endif
 
-  TERN_(BUFFER_MONITORING, static void M576());
-  
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
     static void M600();
     static void M603();

Marlin/src/gcode/queue.cpp

@@ -68,22 +68,8 @@ GCodeQueue::RingBuffer GCodeQueue::ring_buffer = { 0 };
 #endif
 
 /**
- * Track buffer underruns
+ * Serial command injection
  */
-#if ENABLED(BUFFER_MONITORING)
-  uint32_t GCodeQueue::command_buffer_underruns = 0;
-  bool GCodeQueue::command_buffer_empty = false;
-  millis_t GCodeQueue::max_command_buffer_empty_duration = 0;
-  millis_t GCodeQueue::command_buffer_empty_at = 0;
-
-  uint32_t GCodeQueue::planner_buffer_underruns = 0;
-  bool GCodeQueue::planner_buffer_empty = false;
-  millis_t GCodeQueue::max_planner_buffer_empty_duration = 0;
-  millis_t GCodeQueue::planner_buffer_empty_at = 0;
-
-  uint8_t GCodeQueue::auto_buffer_report_interval;
-  millis_t GCodeQueue::next_buffer_report_ms;
-#endif
 
 /**
  * Next Injected PROGMEM Command pointer. (nullptr == empty)
@@ -635,27 +621,7 @@ void GCodeQueue::advance() {
   if (process_injected_command_P() || process_injected_command()) return;
 
   // Return if the G-code buffer is empty
-  if (ring_buffer.empty()) {
-    #if ENABLED(BUFFER_MONITORING)
-      if (!command_buffer_empty) {
-        command_buffer_empty = true;
-        command_buffer_underruns++;
-        command_buffer_empty_at = millis();
-      }
-    #endif
-    return;
-  }
-
-  #if ENABLED(BUFFER_MONITORING)
-    if (command_buffer_empty) {
-      static millis_t command_buffer_empty_duration;
-      command_buffer_empty_duration = millis() - command_buffer_empty_at;
-      if (command_buffer_empty_duration > max_command_buffer_empty_duration) {
-        max_command_buffer_empty_duration = command_buffer_empty_duration;
-      }
-      command_buffer_empty = false;
-    }
-  #endif
+  if (ring_buffer.empty()) return;
 
   #if ENABLED(SDSUPPORT)
 
@@ -698,52 +664,3 @@ void GCodeQueue::advance() {
   // The queue may be reset by a command handler or by code invoked by idle() within a handler
   ring_buffer.advance_pos(ring_buffer.index_r, -1);
 }
-
-#if ENABLED(BUFFER_MONITORING)
-void GCodeQueue::report_buffer_statistics() {
-  SERIAL_ECHO("M576");
-  SERIAL_ECHOLNPAIR(SP_P_STR, int(planner.moves_free()),
-                    SP_B_STR, int(BUFSIZE - length),
-                    " PU", queue.planner_buffer_underruns,
-                    " PD", queue.max_planner_buffer_empty_duration,
-                    " BU", queue.command_buffer_underruns,
-                    " BD", queue.max_command_buffer_empty_duration,
-                    );
-
-  command_buffer_underruns = 0;
-  max_command_buffer_empty_duration = 0;
-
-  planner_buffer_underruns = 0;
-  max_planner_buffer_empty_duration = 0;
-}
-
-void GCodeQueue::auto_report_buffer_statistics() {
-  // Bit of a hack to try to catch planner buffer underruns without having logic
-  // running inside Stepper::block_phase_isr
-  if (planner.movesplanned() == 0) {
-    if (!planner_buffer_empty) { // if the planner buffer wasn't empty, but now it is
-      planner_buffer_empty = true;
-      planner_buffer_underruns++;
-      planner_buffer_empty_at = millis();
-    }
-  } else if (planner_buffer_empty) { // if the planner buffer was empty, but now it ain't
-    static millis_t planner_buffer_empty_duration;
-    planner_buffer_empty_duration = millis() - planner_buffer_empty_at;
-
-    // if it's longer than the currently tracked max duration, replace it
-    if (planner_buffer_empty_duration > max_planner_buffer_empty_duration) {
-      max_planner_buffer_empty_duration = planner_buffer_empty_duration;
-    }
-
-    planner_buffer_empty = false;
-  }
-
-  if (queue.auto_buffer_report_interval && ELAPSED(millis(), queue.next_buffer_report_ms)) {
-    queue.next_buffer_report_ms = millis() + 1000UL * queue.auto_buffer_report_interval;
-    PORT_REDIRECT(SERIAL_BOTH);
-    report_buffer_statistics();
-    PORT_RESTORE();
-  }
-}
-
-#endif

Marlin/src/gcode/queue.h

@@ -236,6 +236,8 @@ class GCodeQueue {
    */
   static inline void set_current_line_number(long n) { serial_state[ring_buffer.command_port().index].last_N = n; }
 
+private:
+
   static void get_serial_commands();
 
   #if ENABLED(SDSUPPORT)