Add gcode M27 auto report support

prusa3d · Feb 10, 2024 · 729a4da · 729a4da
1 parent 1c6ce37
commit 729a4da
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/lib/Marlin/Marlin/src/gcode/gcode.h b/lib/Marlin/Marlin/src/gcode/gcode.h
@@ -298,6 +298,13 @@
 
 enum AxisRelative : uint8_t { REL_X, REL_Y, REL_Z, REL_E, E_MODE_ABS, E_MODE_REL };
 
+#if ENABLED(SDSUPPORT) || ENABLED(SDCARD_GCODES)
+namespace M27_handler {
+  extern uint32_t sd_auto_report_delay;
+  void print_sd_status();
+} // namespace M27_handler
+#endif
+
 class GcodeSuite {
 public:
 

diff --git a/src/common/marlin_server.cpp b/src/common/marlin_server.cpp
@@ -401,6 +401,15 @@ void print_fan_spd() {
     }
 }
 
+void print_sd_report() {
+    static uint32_t last_sd_report = 0;
+    uint32_t current_time = ticks_s();
+    if (M27_handler::sd_auto_report_delay && (current_time - last_sd_report) >= M27_handler::sd_auto_report_delay) {
+        M27_handler::print_sd_status();
+        last_sd_report = current_time;
+    }
+}
+
 #ifdef MINDA_BROKEN_CABLE_DETECTION
 static void print_Z_probe_cnt() {
     if (DEBUGGING(INFO)) {
@@ -464,6 +473,10 @@ int cycle(void) {
 
     print_fan_spd();
 
+#if ENABLED(SDSUPPORT) || ENABLED(SDCARD_GCODES)
+    print_sd_report();
+#endif
+
 #ifdef MINDA_BROKEN_CABLE_DETECTION
     print_Z_probe_cnt();
 #endif

diff --git a/src/marlin_stubs/sdcard/M20-M30_M32-M34.cpp b/src/marlin_stubs/sdcard/M20-M30_M32-M34.cpp
@@ -58,20 +58,28 @@ void GcodeSuite::M26() {
     }
 }
 
+uint32_t M27_handler::sd_auto_report_delay = 0;
+
+void M27_handler::print_sd_status() {
+    if (media_print_get_state() != media_print_state_NONE) {
+        SERIAL_ECHOPGM(MSG_SD_PRINTING_BYTE);
+        SERIAL_ECHO(media_print_get_position());
+        SERIAL_CHAR('/');
+        SERIAL_ECHOLN(media_print_get_size());
+    } else {
+        SERIAL_ECHOLNPGM(MSG_SD_NOT_PRINTING);
+    }
+}
+
 // M27 - Report SD print status
 void GcodeSuite::M27() {
     if (parser.seen('C')) {
         SERIAL_ECHOPGM("Current file: ");
         SERIAL_ECHOLN(marlin_vars()->media_SFN_path.get_ptr());
+    } else if (parser.seen('S')) {
+        M27_handler::sd_auto_report_delay = parser.byteval('S');
     } else {
-        if (media_print_get_state() != media_print_state_NONE) {
-            SERIAL_ECHOPGM(MSG_SD_PRINTING_BYTE);
-            SERIAL_ECHO(media_print_get_position());
-            SERIAL_CHAR('/');
-            SERIAL_ECHOLN(media_print_get_size());
-        } else {
-            SERIAL_ECHOLNPGM(MSG_SD_NOT_PRINTING);
-        }
+        M27_handler::print_sd_status();
     }
 }