0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🧑‍💻 Tweak limit_and_warn

Browse source
This commit is contained in:
Scott Lahteine 2024-01-15 22:22:08 -06:00
parent 8d4ab15748
commit 1f1ca34ea6
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Marlin/src/module/planner.cpp
View file

@ -3320,16 +3320,12 @@ void Planner::refresh_positioning() {
} }
// Apply limits to a variable and give a warning if the value was out of range // Apply limits to a variable and give a warning if the value was out of range
inline void limit_and_warn(float &val, const AxisEnum axis, PGM_P const setting_name, const xyze_float_t &max_limit) { inline void limit_and_warn(float &val, const AxisEnum axis, FSTR_P const setting_name, const xyze_float_t &max_limit) {
const uint8_t lim_axis = TERN_(HAS_EXTRUDERS, axis > E_AXIS ? E_AXIS :) axis; const uint8_t lim_axis = TERN_(HAS_EXTRUDERS, axis > E_AXIS ? E_AXIS :) axis;
const float before = val; const float before = val;
LIMIT(val, 0.1f, max_limit[lim_axis]); LIMIT(val, 0.1f, max_limit[lim_axis]);
if (before != val) { if (before != val)
SERIAL_CHAR(AXIS_CHAR(lim_axis)); SERIAL_ECHOLN(C(AXIS_CHAR(lim_axis)), F(" Max "), setting_name, F(" limited to "), val);
SERIAL_ECHOPGM(" Max ");
SERIAL_ECHOPGM_P(setting_name);
SERIAL_ECHOLNPGM(" limited to ", val);
}
} }
/** /**
@ -3348,7 +3344,7 @@ void Planner::set_max_acceleration(const AxisEnum axis, float inMaxAccelMMS2) {
constexpr xyze_float_t max_accel_edit = DEFAULT_MAX_ACCELERATION; constexpr xyze_float_t max_accel_edit = DEFAULT_MAX_ACCELERATION;
const xyze_float_t max_acc_edit_scaled = max_accel_edit * 2; const xyze_float_t max_acc_edit_scaled = max_accel_edit * 2;
#endif #endif
limit_and_warn(inMaxAccelMMS2, axis, PSTR("Acceleration"), max_acc_edit_scaled); limit_and_warn(inMaxAccelMMS2, axis, F("Acceleration"), max_acc_edit_scaled);
#endif #endif
settings.max_acceleration_mm_per_s2[axis] = inMaxAccelMMS2; settings.max_acceleration_mm_per_s2[axis] = inMaxAccelMMS2;
@ -3371,7 +3367,7 @@ void Planner::set_max_feedrate(const AxisEnum axis, float inMaxFeedrateMMS) {
constexpr xyze_float_t max_fr_edit = DEFAULT_MAX_FEEDRATE; constexpr xyze_float_t max_fr_edit = DEFAULT_MAX_FEEDRATE;
const xyze_float_t max_fr_edit_scaled = max_fr_edit * 2; const xyze_float_t max_fr_edit_scaled = max_fr_edit * 2;
#endif #endif
limit_and_warn(inMaxFeedrateMMS, axis, PSTR("Feedrate"), max_fr_edit_scaled); limit_and_warn(inMaxFeedrateMMS, axis, F("Feedrate"), max_fr_edit_scaled);
#endif #endif
settings.max_feedrate_mm_s[axis] = inMaxFeedrateMMS; settings.max_feedrate_mm_s[axis] = inMaxFeedrateMMS;
} }
@ -3394,7 +3390,7 @@ void Planner::set_max_feedrate(const AxisEnum axis, float inMaxFeedrateMMS) {
(DEFAULT_ZJERK) * 2, (DEFAULT_EJERK) * 2 } (DEFAULT_ZJERK) * 2, (DEFAULT_EJERK) * 2 }
#endif #endif
; ;
limit_and_warn(inMaxJerkMMS, axis, PSTR("Jerk"), max_jerk_edit); limit_and_warn(inMaxJerkMMS, axis, F("Jerk"), max_jerk_edit);
#endif #endif
max_jerk[axis] = inMaxJerkMMS; max_jerk[axis] = inMaxJerkMMS;
} }