@@ -3320,16 +3320,12 @@ void Planner::refresh_positioning() {
3320
3320
}
3321
3321
3322
3322
// Apply limits to a variable and give a warning if the value was out of range
3323
- inline void limit_and_warn (float &val, const AxisEnum axis, PGM_P const setting_name, const xyze_float_t &max_limit) {
3323
+ inline void limit_and_warn (float &val, const AxisEnum axis, FSTR_P const setting_name, const xyze_float_t &max_limit) {
3324
3324
const uint8_t lim_axis = TERN_ (HAS_EXTRUDERS, axis > E_AXIS ? E_AXIS :) axis;
3325
3325
const float before = val;
3326
3326
LIMIT (val, 0 .1f , max_limit[lim_axis]);
3327
- if (before != val) {
3328
- SERIAL_CHAR (AXIS_CHAR (lim_axis));
3329
- SERIAL_ECHOPGM (" Max " );
3330
- SERIAL_ECHOPGM_P (setting_name);
3331
- SERIAL_ECHOLNPGM (" limited to " , val);
3332
- }
3327
+ if (before != val)
3328
+ SERIAL_ECHOLN (C (AXIS_CHAR (lim_axis)), F (" Max " ), setting_name, F (" limited to " ), val);
3333
3329
}
3334
3330
3335
3331
/* *
@@ -3348,7 +3344,7 @@ void Planner::set_max_acceleration(const AxisEnum axis, float inMaxAccelMMS2) {
3348
3344
constexpr xyze_float_t max_accel_edit = DEFAULT_MAX_ACCELERATION;
3349
3345
const xyze_float_t max_acc_edit_scaled = max_accel_edit * 2 ;
3350
3346
#endif
3351
- limit_and_warn (inMaxAccelMMS2, axis, PSTR (" Acceleration" ), max_acc_edit_scaled);
3347
+ limit_and_warn (inMaxAccelMMS2, axis, F (" Acceleration" ), max_acc_edit_scaled);
3352
3348
#endif
3353
3349
settings.max_acceleration_mm_per_s2 [axis] = inMaxAccelMMS2;
3354
3350
@@ -3371,7 +3367,7 @@ void Planner::set_max_feedrate(const AxisEnum axis, float inMaxFeedrateMMS) {
3371
3367
constexpr xyze_float_t max_fr_edit = DEFAULT_MAX_FEEDRATE;
3372
3368
const xyze_float_t max_fr_edit_scaled = max_fr_edit * 2 ;
3373
3369
#endif
3374
- limit_and_warn (inMaxFeedrateMMS, axis, PSTR (" Feedrate" ), max_fr_edit_scaled);
3370
+ limit_and_warn (inMaxFeedrateMMS, axis, F (" Feedrate" ), max_fr_edit_scaled);
3375
3371
#endif
3376
3372
settings.max_feedrate_mm_s [axis] = inMaxFeedrateMMS;
3377
3373
}
@@ -3394,7 +3390,7 @@ void Planner::set_max_feedrate(const AxisEnum axis, float inMaxFeedrateMMS) {
3394
3390
(DEFAULT_ZJERK) * 2 , (DEFAULT_EJERK) * 2 }
3395
3391
#endif
3396
3392
;
3397
- limit_and_warn (inMaxJerkMMS, axis, PSTR (" Jerk" ), max_jerk_edit);
3393
+ limit_and_warn (inMaxJerkMMS, axis, F (" Jerk" ), max_jerk_edit);
3398
3394
#endif
3399
3395
max_jerk[axis] = inMaxJerkMMS;
3400
3396
}
0 commit comments