adjust, update, add G-code 'M203 P'

Author: thinkyhead

Marlin/Configuration.h

@@ -1311,6 +1311,8 @@
   #define MAX_FEEDRATE_EDIT_VALUES    { 600, 600, 10, 50 } // ...or, set your own edit limits
 #endif
 
+//#define MAX_PRINT_FEEDRATE_MM_S  1000   // (mm/s) Adjustable maximum feedrate for printing moves
+
 /**
  * Default Max Acceleration (speed change with time) (linear=mm/(s^2), rotational=°/(s^2))
  * (Maximum start speed for accelerated moves)

Marlin/Configuration_adv.h

@@ -3907,11 +3907,6 @@
   #endif
 #endif
 
-//#define FEEDRATE_PRINTING_LIMIT
-#if ENABLED(FEEDRATE_PRINTING_LIMIT)
-  #define DEFAULT_FEEDRATE_PRINTING_LIMIT 0   // (mm/sec)
-#endif
-
 // @section reporting
 
 /**

Marlin/src/gcode/config/M200-M205.cpp

@@ -188,12 +188,20 @@ void GcodeSuite::M201_report(const bool forReplay/*=true*/) {
  *       With multiple extruders use T to specify which one.
  */
 void GcodeSuite::M203() {
-  if (!parser.seen("T" STR_AXES_LOGICAL))
+  if (!parser.seen("T" TERN_(HAS_MAX_PRINT_FEEDRATE, "P") STR_AXES_LOGICAL))
     return M203_report();
 
   const int8_t target_extruder = get_target_extruder_from_command();
   if (target_extruder < 0) return;
 
+  #if HAS_MAX_PRINT_FEEDRATE
+    // Set the max Printing feedrate, applying only to moves with extrusion.
+    if (parser.seenval('P')) {
+      const float p = parser.value_linear_units();
+      if (p == 0 || p > 100) planner.settings.max_print_feedrate_mm_s = p;
+    }
+  #endif
+
   LOOP_LOGICAL_AXES(i)
     if (parser.seenval(AXIS_CHAR(i))) {
       const AxisEnum a = TERN(HAS_EXTRUDERS, (i == E_AXIS ? E_AXIS_N(target_extruder) : (AxisEnum)i), (AxisEnum)i);
@@ -225,6 +233,10 @@ void GcodeSuite::M203_report(const bool forReplay/*=true*/) {
     SERIAL_ECHOPGM_P(SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS]));
   #endif
 
+  #if HAS_MAX_PRINT_FEEDRATE
+    SERIAL_ECHOPGM_P(SP_P_STR, LINEAR_UNIT(planner.settings.max_print_feedrate_mm_s));
+  #endif
+
   #if NUM_AXES || (HAS_EXTRUDERS && DISABLED(DISTINCT_E_FACTORS))
     SERIAL_EOL();
   #endif

Marlin/src/inc/Conditionals-1-axes.h

@@ -73,6 +73,7 @@
   #undef FILAMENT_RUNOUT_SENSOR
   #undef FILAMENT_RUNOUT_DISTANCE_MM
   #undef DISABLE_OTHER_EXTRUDERS
+  #undef MAX_PRINT_FEEDRATE_MM_S
 #endif
 
 #define E_OPTARG(N) OPTARG(HAS_MULTI_EXTRUDER, N)

Marlin/src/inc/Conditionals-3-etc.h

@@ -677,3 +677,7 @@
 #if ALL(SPI_FLASH, HAS_MEDIA, MARLIN_DEV_MODE)
   #define SPI_FLASH_BACKUP 1
 #endif
+
+#ifdef MAX_PRINT_FEEDRATE_MM_S
+  #define HAS_MAX_PRINT_FEEDRATE 1
+#endif

Marlin/src/lcd/language/language_en.h

@@ -431,11 +431,11 @@ namespace LanguageNarrow_en {
   LSTR MSG_JUNCTION_DEVIATION             = _UxGT("Junction Dev");
   LSTR MSG_STEP_SMOOTHING                 = _UxGT("Step Smoothing");
   LSTR MSG_MAX_SPEED                      = _UxGT("Max Speed (mm/s)");
+  LSTR MSG_MAX_PRINT_SPEED                = _UxGT("Max Print Speed");
   LSTR MSG_VMAX_A                         = _UxGT("Max ") STR_A _UxGT(" Speed");
   LSTR MSG_VMAX_B                         = _UxGT("Max ") STR_B _UxGT(" Speed");
   LSTR MSG_VMAX_C                         = _UxGT("Max ") STR_C _UxGT(" Speed");
   LSTR MSG_VMAX_N                         = _UxGT("Max @ Speed");
-  LSTR MSG_MAX_PRINTING_SPEED             = _UxGT("Max Printing Speed (mm/s)");
   LSTR MSG_VMAX_E                         = _UxGT("Max E Speed");
   LSTR MSG_VMAX_EN                        = _UxGT("Max * Speed");
   LSTR MSG_VMIN                           = _UxGT("Min Velocity");

Marlin/src/lcd/menu/menu_advanced.cpp

@@ -136,8 +136,9 @@ void menu_backlash();
       }
     #endif
 
-    #if ENABLED(FEEDRATE_PRINTING_LIMIT)
-      EDIT_ITEM_FAST(float5, MSG_MAX_PRINTING_SPEED, &planner.max_printing_feedrate_mm_s, 0, MAX(planner.settings.max_feedrate_mm_s[0]*1.414, planner.settings.max_feedrate_mm_s[1]*1.414));
+    #if HAS_MAX_PRINT_FEEDRATE
+      const float max_rate = 1.4142135f * MAX(planner.settings.max_feedrate_mm_s[X_AXIS], planner.settings.max_feedrate_mm_s[Y_AXIS]);
+      EDIT_ITEM_FAST(float5, MSG_MAX_PRINT_SPEED, &planner.max_print_feedrate_mm_s, 0, max_rate);
     #endif
 
     #if ENABLED(CONFIGURE_FILAMENT_CHANGE)

Marlin/src/module/planner.cpp

@@ -189,8 +189,8 @@ uint32_t Planner::max_acceleration_steps_per_s2[DISTINCT_AXES]; // (steps/s^2) D
         Planner::volumetric_extruder_feedrate_limit[EXTRUDERS]; // pre calculated extruder feedrate limit based on volumetric_extruder_limit; pre-calculated to reduce computation in the planner
 #endif
 
-#if ENABLED(FEEDRATE_PRINTING_LIMIT)
-  feedRate_t Planner::max_printing_feedrate_mm_s;   // (mm/s)
+#if HAS_MAX_PRINT_FEEDRATE
+  feedRate_t Planner::max_print_feedrate_mm_s;   // (mm/s) M203 P - Maximum feedrate when printing
 #endif
 
 #ifdef MAX7219_DEBUG_SLOWDOWN
@@ -2314,15 +2314,16 @@ bool Planner::_populate_block(
       }
     #endif
 
-    #if ENABLED(FEEDRATE_PRINTING_LIMIT)
-      if (max_printing_feedrate_mm_s > 0 && current_speed.e > 0) {
-        feedRate_t ps2 = (current_speed[0] * current_speed[0]) + (current_speed[1] * current_speed[1]);
-        if (ps2 > max_printing_feedrate_mm_s * max_printing_feedrate_mm_s)
-          NOMORE(speed_factor, max_printing_feedrate_mm_s / SQRT(ps2));
+    #if HAS_MAX_PRINT_FEEDRATE
+      if (max_print_feedrate_mm_s > 0 && current_speed.e) {
+        const feedRate_t ps2 = HYPOT2(current_speed.x, current_speed.y);
+        if (ps2 > sq(max_print_feedrate_mm_s))
+          NOMORE(speed_factor, max_print_feedrate_mm_s / SQRT(ps2)); // Multiply by ISQRT?
       }
     #endif
 
   }
+
   #endif // HAS_EXTRUDERS
 
   #ifdef XY_FREQUENCY_LIMIT

Marlin/src/module/planner.h

@@ -471,8 +471,8 @@ class Planner {
                    volumetric_extruder_feedrate_limit[EXTRUDERS]; // (mm/s) Feedrate limit calculated from volume limit
     #endif
 
-    #if ENABLED(FEEDRATE_PRINTING_LIMIT)
-      static feedRate_t max_printing_feedrate_mm_s;   // (mm/s) Maximum feedrate when printing
+    #if HAS_MAX_PRINT_FEEDRATE
+      static feedRate_t max_print_feedrate_mm_s;      // (mm/s) M203 P - Maximum feedrate when printing
     #endif
 
     static planner_settings_t settings;

Marlin/src/module/settings.cpp

@@ -476,8 +476,11 @@ typedef struct SettingsDataStruct {
   float planner_filament_size[EXTRUDERS];               // M200 T D  planner.filament_size[]
   float planner_volumetric_extruder_limit[EXTRUDERS];   // M200 T L  planner.volumetric_extruder_limit[]
 
-  #if ENABLED(FEEDRATE_PRINTING_LIMIT)
-    feedRate_t max_printing_feedrate_mm_s;
+  //
+  // Max Print Feedrate
+  //
+  #if HAS_MAX_PRINT_FEEDRATE
+    feedRate_t max_print_feedrate_mm_s;                 // M203 P  planner.max_print_feedrate_mm_s
   #endif
 
   //
@@ -1352,6 +1355,13 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(homing_feedrate_mm_m);
     #endif
 
+    //
+    // Max Print Feedrate
+    //
+    #if HAS_MAX_PRINT_FEEDRATE
+      EEPROM_WRITE(planner.max_print_feedrate_mm_s);
+    #endif
+
     //
     // Volumetric & Filament Size
     //
@@ -1381,10 +1391,6 @@ void MarlinSettings::postprocess() {
       #endif
     }
 
-    #if ENABLED(FEEDRATE_PRINTING_LIMIT)
-      EEPROM_WRITE(planner.max_printing_feedrate_mm_s);
-    #endif
-
     //
     // TMC Configuration
     //
@@ -2452,6 +2458,13 @@ void MarlinSettings::postprocess() {
         EEPROM_READ(homing_feedrate_mm_m);
       #endif
 
+      //
+      // Max Print Feedrate
+      //
+      #if HAS_MAX_PRINT_FEEDRATE
+        EEPROM_READ(planner.max_print_feedrate_mm_s);
+      #endif
+
       //
       // Volumetric & Filament Size
       //
@@ -2476,12 +2489,6 @@ void MarlinSettings::postprocess() {
         #endif
       }
 
-      #if ENABLED(FEEDRATE_PRINTING_LIMIT)
-        feedRate_t max_printing_feedrate_mm_s;
-        EEPROM_READ(max_printing_feedrate_mm_s);
-        if (!validating) planner.max_printing_feedrate_mm_s = max_printing_feedrate_mm_s;
-      #endif
-
       //
       // TMC Stepper Settings
       //
@@ -3698,6 +3705,13 @@ void MarlinSettings::reset() {
   //
   TERN_(EDITABLE_HOMING_FEEDRATE, homing_feedrate_mm_m = xyz_feedrate_t(HOMING_FEEDRATE_MM_M));
 
+  //
+  // Max Print Feedrate
+  //
+  #if HAS_MAX_PRINT_FEEDRATE
+    planner.max_print_feedrate_mm_s = MAX_PRINT_FEEDRATE_MM_S;
+  #endif
+
   //
   // Volumetric & Filament Size
   //
@@ -3711,10 +3725,6 @@ void MarlinSettings::reset() {
     #endif
   #endif
 
-  #if ENABLED(FEEDRATE_PRINTING_LIMIT)
-    planner.max_printing_feedrate_mm_s = DEFAULT_FEEDRATE_PRINTING_LIMIT;
-  #endif
-
   endstops.enable_globally(ENABLED(ENDSTOPS_ALWAYS_ON_DEFAULT));
 
   reset_stepper_drivers();