m221 report update

Implemented M221 report on M503
ThomasToka · Jul 19, 2023 · 0773c09 · 0773c09
1 parent 6c4ef51
commit 0773c09
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
@@ -597,6 +597,10 @@
 #define SUPERSCRIPT_TWO   TERN(NOT_EXTENDED_ISO10646_1_5X7, "^2", "²")
 #define SUPERSCRIPT_THREE TERN(NOT_EXTENDED_ISO10646_1_5X7, "^3", "³")
 
+#if ENABLED(E3S1PRO_RTS)
+  #define STR_FLOW_RATE "Extruder Flowrate"
+#endif
+
 #include "multi_language.h"   // Allow multiple languages
 
 #include "../lcd/language/language_en.h"

diff --git a/Marlin/src/gcode/config/M221.cpp b/Marlin/src/gcode/config/M221.cpp
@@ -44,4 +44,11 @@ void GcodeSuite::M221() {
   }
 }
 
+#if ENABLED(E3S1PRO_RTS)
+  void GcodeSuite::M221_report(const bool forReplay/*=true*/) {
+    report_heading_etc(forReplay, F(STR_FLOW_RATE));
+    SERIAL_ECHOLNPGM("  M221 ", "S", planner.flow_percentage[0]," ; (%)");
+  }
+#endif
+
 #endif // EXTRUDERS
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
@@ -893,6 +893,11 @@ class GcodeSuite {
 
   #if HAS_EXTRUDERS
     static void M221();
+
+    #if ENABLED(E3S1PRO_RTS)    
+      static void M221_report(const bool forReplay=true);    
+    #endif
+
   #endif
 
   #if ENABLED(DIRECT_PIN_CONTROL)

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
@@ -3980,12 +3980,13 @@ void MarlinSettings::reset() {
 
     #if ENABLED(E3S1PRO_RTS)
       if (g_soundSetOffOn == 1 || g_soundSetOffOn == 0) {
-        SERIAL_ECHO_MSG("  Display sound: On");
+        SERIAL_ECHO_MSG("  Display sound: ON");
       }
       if(g_soundSetOffOn == 2){
-        SERIAL_ECHO_MSG("  Display sound: Off");
+        SERIAL_ECHO_MSG("  Display sound: OFF");
       }      
-      //SERIAL_ECHO_MSG("  x_min_pos_eeprom:", int(x_min_pos_eeprom));        
+      TERN_(HAS_EXTRUDERS, gcode.M221_report(forReplay));      
+      //SERIAL_ECHO_MSG("  x_min_pos_eeprom:", int(x_min_pos_eeprom));          
       //SERIAL_ECHO_MSG("  y_min_pos_eeprom:", int(y_min_pos_eeprom));    
     #endif