0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-01-22 17:52:57 +00:00

🚸 Fix menu homing feedrate display (#27518)

This commit is contained in:
ellensp 2024-11-13 11:22:42 +13:00 committed by GitHub
parent 472f1ece2a
commit 70c3060769
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -410,17 +410,17 @@ void menu_advanced_settings();
#if ENABLED(MENUS_ALLOW_INCH_UNITS) #if ENABLED(MENUS_ALLOW_INCH_UNITS)
#define _EDIT_HOMING_FR(A) do{ \ #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)]); \ const float maxfr = MMS_TO_MMM(planner.settings.max_feedrate_mm_s[_AXIS(A)]); \
editable.decimal = A##_AXIS_UNIT(homing_feedrate_mm_m.A); \ editable.decimal = A##_AXIS_UNIT(homing_feedrate_mm_m.A); \
EDIT_ITEM(float5, MSG_HOMING_FEEDRATE_N, &editable.decimal, \ EDIT_ITEM_FAST_N(float5, _AXIS(A), MSG_HOMING_FEEDRATE_N, &editable.decimal, \
A##_AXIS_UNIT(10), A##_AXIS_UNIT(maxfr), []{ \ A##_AXIS_UNIT(minfr), A##_AXIS_UNIT(maxfr), []{ \
homing_feedrate_mm_m.A = parser.axis_value_to_mm(_AXIS(A), editable.decimal); \ homing_feedrate_mm_m.A = parser.axis_value_to_mm(_AXIS(A), editable.decimal); \
}); \ }); \
}while(0); }while(0);
#else #else
#define _EDIT_HOMING_FR(A) do{ \ #define _EDIT_HOMING_FR(A) \
EDIT_ITEM(float5, MSG_HOMING_FEEDRATE_N, &homing_feedrate_mm_m.A, 10, MMS_TO_MMM(planner.settings.max_feedrate_mm_s[_AXIS(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)]));
}while(0);
#endif #endif
MAIN_AXIS_MAP(_EDIT_HOMING_FR); MAIN_AXIS_MAP(_EDIT_HOMING_FR);