Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix menu homing feedrate display #27518

Merged
merged 2 commits into from
Nov 12, 2024
Merged

fix menu homing feedrate display #27518

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82b75e8
fix menu
ellensp Nov 8, 2024
f1efaaa
engage classicrocker883 levels of pedanticism
ellensp Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Marlin/src/lcd/menu/menu_configuration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,17 +410,17 @@ void menu_advanced_settings();

#if ENABLED(MENUS_ALLOW_INCH_UNITS)
#define _EDIT_HOMING_FR(A) do{ \
const float minfr = MMS_TO_MMM(planner.settings.min_feedrate_mm_s); \
const float maxfr = MMS_TO_MMM(planner.settings.max_feedrate_mm_s[_AXIS(A)]); \
editable.decimal = A##_AXIS_UNIT(homing_feedrate_mm_m.A); \
EDIT_ITEM(float5, MSG_HOMING_FEEDRATE_N, &editable.decimal, \
A##_AXIS_UNIT(10), A##_AXIS_UNIT(maxfr), []{ \
EDIT_ITEM_FAST_N(float5, _AXIS(A), MSG_HOMING_FEEDRATE_N, &editable.decimal, \
A##_AXIS_UNIT(minfr), A##_AXIS_UNIT(maxfr), []{ \
homing_feedrate_mm_m.A = parser.axis_value_to_mm(_AXIS(A), editable.decimal); \
}); \
}while(0);
#else
#define _EDIT_HOMING_FR(A) do{ \
EDIT_ITEM(float5, MSG_HOMING_FEEDRATE_N, &homing_feedrate_mm_m.A, 10, MMS_TO_MMM(planner.settings.max_feedrate_mm_s[_AXIS(A)])); \
}while(0);
#define _EDIT_HOMING_FR(A) \
EDIT_ITEM_FAST_N(float5, _AXIS(A), MSG_HOMING_FEEDRATE_N, &homing_feedrate_mm_m.A, MMS_TO_MMM(planner.settings.min_feedrate_mm_s), MMS_TO_MMM(planner.settings.max_feedrate_mm_s[_AXIS(A)]));
#endif

MAIN_AXIS_MAP(_EDIT_HOMING_FR);
Expand Down
Loading