Merge pull request #9978 from thinkyhead/bf1_suppress_autoreport

[1.1.x] Capability to suppress auto-reporting
2018-03-07 03:33:26 -06:00
parent 1f77930e01 dc40b3ec00
commit 5a1ba9c32f
44 changed files with 229 additions and 203 deletions
--- a/Marlin/Conditionals_post.h
+++ b/Marlin/Conditionals_post.h
@@ -686,6 +686,7 @@
  #define HAS_TEMP_4 (PIN_EXISTS(TEMP_4) && TEMP_SENSOR_4 != 0 && TEMP_SENSOR_4 > -2)
  #define HAS_TEMP_HOTEND (HAS_TEMP_0 || ENABLED(HEATER_0_USES_MAX6675))
  #define HAS_TEMP_BED (PIN_EXISTS(TEMP_BED) && TEMP_SENSOR_BED != 0 && TEMP_SENSOR_BED > -2)
+  #define HAS_TEMP_SENSOR (HAS_TEMP_HOTEND || HAS_TEMP_BED)

  // Heaters
  #define HAS_HEATER_0 (PIN_EXISTS(HEATER_0))
@@ -748,6 +749,12 @@
  #define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
  #define HAS_MOTOR_CURRENT_PWM (PIN_EXISTS(MOTOR_CURRENT_PWM_XY) || PIN_EXISTS(MOTOR_CURRENT_PWM_Z) || PIN_EXISTS(MOTOR_CURRENT_PWM_E))

+  #if !HAS_TEMP_SENSOR
+    #undef AUTO_REPORT_TEMPERATURES
+  #endif
+
+  #define HAS_AUTO_REPORTING (ENABLED(AUTO_REPORT_TEMPERATURES) || ENABLED(AUTO_REPORT_SD_STATUS))
+
  /**
   * This setting is also used by M109 when trying to calculate
   * a ballpark safe margin to prevent wait-forever situation.
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1410,11 +1415,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -232,6 +232,10 @@ extern volatile bool wait_for_heatup;
  extern volatile bool wait_for_user;
 #endif

+#if HAS_AUTO_REPORTING
+  extern bool suspend_auto_report;
+#endif
+
 extern float current_position[XYZE], destination[XYZE];

 /**
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -510,6 +510,10 @@ volatile bool wait_for_heatup = true;
  volatile bool wait_for_user = false;
 #endif

+#if HAS_AUTO_REPORTING
+  bool suspend_auto_report; // = false
+#endif
+
 const char axis_codes[XYZE] = { 'X', 'Y', 'Z', 'E' };

 // Number of characters read in the current line of serial input
@@ -7706,7 +7710,7 @@ inline void gcode_M104() {
 inline void gcode_M105() {
  if (get_target_extruder_from_command(105)) return;

-  #if HAS_TEMP_HOTEND || HAS_TEMP_BED
+  #if HAS_TEMP_SENSOR
    SERIAL_PROTOCOLPGM(MSG_OK);
    thermalManager.print_heaterstates();
  #else // !HAS_TEMP_HOTEND && !HAS_TEMP_BED
@@ -7717,7 +7721,7 @@ inline void gcode_M105() {
  SERIAL_EOL();
 }

-#if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
+#if ENABLED(AUTO_REPORT_TEMPERATURES)

  /**
   * M155: Set temperature auto-report interval. M155 S<seconds>
@@ -11682,7 +11686,7 @@ void process_parsed_command() {

      case 105: gcode_M105(); KEEPALIVE_STATE(NOT_BUSY); return;  // M105: Report Temperatures (and say "ok")

-      #if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
+      #if ENABLED(AUTO_REPORT_TEMPERATURES)
        case 155: gcode_M155(); break;                            // M155: Set Temperature Auto-report Interval
      #endif

@@ -13454,10 +13458,6 @@ void idle(

  host_keepalive();

-  #if ENABLED(AUTO_REPORT_TEMPERATURES) && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
-    thermalManager.auto_report_temperatures();
-  #endif
-
  manage_inactivity(
    #if ENABLED(ADVANCED_PAUSE_FEATURE)
      no_stepper_sleep
@@ -13482,10 +13482,17 @@ void idle(
    }
  #endif

+  #if HAS_AUTO_REPORTING
+    if (!suspend_auto_report) {
+      #if ENABLED(AUTO_REPORT_TEMPERATURES)
+        thermalManager.auto_report_temperatures();
+      #endif
      #if ENABLED(AUTO_REPORT_SD_STATUS)
        card.auto_report_sd_status();
      #endif
    }
+  #endif
+}

 /**
 * Kill all activity and lock the machine.
--- a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
+++ b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Anet/A6/Configuration_adv.h
+++ b/Marlin/example_configurations/Anet/A6/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Anet/A8/Configuration_adv.h
+++ b/Marlin/example_configurations/Anet/A8/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/BIBO/TouchX/Configuration_adv.h
+++ b/Marlin/example_configurations/BIBO/TouchX/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Cartesio/Configuration_adv.h
+++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1412,11 +1417,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/CR-10S/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Creality/CR-10mini/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/CR-10mini/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Creality/Ender-2/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/Ender-2/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Creality/Ender-4/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/Ender-4/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Felix/Configuration_adv.h
+++ b/Marlin/example_configurations/Felix/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h
+++ b/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h
@@ -611,6 +611,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1408,11 +1413,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
+++ b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 //#define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h
+++ b/Marlin/example_configurations/JGAurora/A5/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
+++ b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h
+++ b/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/RigidBot/Configuration_adv.h
+++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/SCARA/Configuration_adv.h
+++ b/Marlin/example_configurations/SCARA/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Sanguinololu/Configuration_adv.h
+++ b/Marlin/example_configurations/Sanguinololu/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
+++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
+++ b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
@@ -625,6 +625,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1422,11 +1427,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
+++ b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/Wanhao/Duplicator
+++ b/Marlin/example_configurations/Wanhao/Duplicator
@@ -614,6 +614,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1411,11 +1416,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
@@ -614,6 +614,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1411,11 +1416,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/kossel/Configuration_adv.h
@@ -614,6 +614,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1411,11 +1416,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
@@ -614,6 +614,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1411,11 +1416,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/delta/generic/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h
@@ -614,6 +614,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1411,11 +1416,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
@@ -614,6 +614,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1411,11 +1416,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
@@ -619,6 +619,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1416,11 +1421,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
@@ -614,6 +614,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1411,11 +1416,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
+++ b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  #define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/makibox/Configuration_adv.h
+++ b/Marlin/example_configurations/makibox/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
@@ -612,6 +612,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1409,11 +1414,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/example_configurations/wt150/Configuration_adv.h
+++ b/Marlin/example_configurations/wt150/Configuration_adv.h
@@ -613,6 +613,11 @@
   */
  //#define SD_REPRINT_LAST_SELECTED_FILE

+  /**
+   * Auto-report SdCard status with M27 S<seconds>
+   */
+  //#define AUTO_REPORT_SD_STATUS
+
 #endif // SDSUPPORT

 /**
@@ -1410,11 +1415,6 @@
 */
 #define AUTO_REPORT_TEMPERATURES

-/**
- * Auto-report SdCard status with M27 S<seconds>
- */
-//#define AUTO_REPORT_SD_STATUS
-
 /**
 * Include capabilities in M115 output
 */
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -416,7 +416,7 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS],

      // Report heater states every 2 seconds
      if (ELAPSED(ms, next_temp_ms)) {
-        #if HAS_TEMP_HOTEND || HAS_TEMP_BED
+        #if HAS_TEMP_SENSOR
          print_heaterstates();
          SERIAL_EOL();
        #endif
@@ -2235,7 +2235,7 @@ void Temperature::isr() {
  SBI(TIMSK0, OCIE0B); //re-enable Temperature ISR
 }

-#if HAS_TEMP_HOTEND || HAS_TEMP_BED
+#if HAS_TEMP_SENSOR

  void print_heater_state(const float &c, const float &t,
    #if ENABLED(SHOW_TEMP_ADC_VALUES)
@@ -2326,4 +2326,4 @@ void Temperature::isr() {

  #endif // AUTO_REPORT_TEMPERATURES

-#endif // HAS_TEMP_HOTEND || HAS_TEMP_BED
+#endif // HAS_TEMP_SENSOR
--- a/Marlin/temperature.h
+++ b/Marlin/temperature.h
@@ -571,7 +571,7 @@ class Temperature {

    #endif // HEATER_IDLE_HANDLER

-    #if HAS_TEMP_HOTEND || HAS_TEMP_BED
+    #if HAS_TEMP_SENSOR
      static void print_heaterstates();
      #if ENABLED(AUTO_REPORT_TEMPERATURES)
        static uint8_t auto_report_temp_interval;
--- a/Marlin/ubl.cpp
+++ b/Marlin/ubl.cpp
@@ -175,6 +175,10 @@
  // 2 : disply of the map data on a RepRap Graphical LCD Panel

  void unified_bed_leveling::display_map(const int map_type) {
+    #if HAS_AUTO_REPORTING
+      suspend_auto_report = true;
+    #endif
+
    constexpr uint8_t spaces = 8 * (GRID_MAX_POINTS_X - 2);

    SERIAL_PROTOCOLPGM("\nBed Topography Report");
@@ -242,6 +246,10 @@
      serial_echo_xy(GRID_MAX_POINTS_X - 1, 0);
      SERIAL_EOL();
    }
+
+    #if HAS_AUTO_REPORTING
+      suspend_auto_report = false;
+    #endif
  }

  bool unified_bed_leveling::sanity_check() {