zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix planner compile error (#16272)

Browse source
This commit is contained in:
Markus Towara 2019-12-21 05:04:49 +01:00 committed by Scott Lahteine
parent 0b6c2d893e
commit 856013cc0f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2764,8 +2764,8 @@ void Planner::set_max_acceleration(const uint8_t axis, float targetValue) {
constexpr xyze_float_t max_accel_edit = MAX_ACCEL_EDIT_VALUES; constexpr xyze_float_t max_accel_edit = MAX_ACCEL_EDIT_VALUES;
const xyze_float_t &max_acc_edit_scaled = max_accel_edit; const xyze_float_t &max_acc_edit_scaled = max_accel_edit;
#else #else
constexpr xyze_float_t max_accel_edit = DEFAULT_MAX_ACCELERATION, constexpr xyze_float_t max_accel_edit = DEFAULT_MAX_ACCELERATION;
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(targetValue, axis, PSTR("Acceleration"), max_acc_edit_scaled); limit_and_warn(targetValue, axis, PSTR("Acceleration"), max_acc_edit_scaled);
#endif #endif
@ -2781,8 +2781,8 @@ void Planner::set_max_feedrate(const uint8_t axis, float targetValue) {
constexpr xyze_float_t max_fr_edit = MAX_FEEDRATE_EDIT_VALUES; constexpr xyze_float_t max_fr_edit = MAX_FEEDRATE_EDIT_VALUES;
const xyze_float_t &max_fr_edit_scaled = max_fr_edit; const xyze_float_t &max_fr_edit_scaled = max_fr_edit;
#else #else
constexpr xyze_float_t max_fr_edit = DEFAULT_MAX_FEEDRATE, constexpr xyze_float_t max_fr_edit = DEFAULT_MAX_FEEDRATE;
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(targetValue, axis, PSTR("Feedrate"), max_fr_edit_scaled); limit_and_warn(targetValue, axis, PSTR("Feedrate"), max_fr_edit_scaled);
#endif #endif