Skip to content

Commit a5c4e93

Browse files
classicrocker883classicrocker883
committed
more LCD display rearranging
1 parent 002d445 commit a5c4e93

File tree

3 files changed

+83
-84
lines changed

3 files changed

+83
-84
lines changed

‎Marlin/src/lcd/e3v2/creality/dwin.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3309,11 +3309,11 @@ void drawStepsMenu() {
33093309
dwinDrawLabel(4, GET_TEXT_F(MSG_E_STEPS));
33103310
#endif
33113311
#else
3312-
say_steps_per_mm_en(1); say_x_en(101, 1); // "Steps-per-mm X"
3313-
say_steps_per_mm_en(2); say_y_en(101, 2); // "Y"
3314-
say_steps_per_mm_en(3); say_z_en(101, 3); // "Z"
3312+
say_steps_per_mm_en(1); say_x_en(101, 1); // "Steps-per-mm X"
3313+
say_steps_per_mm_en(2); say_y_en(101, 2); // "Y"
3314+
say_steps_per_mm_en(3); say_z_en(101, 3); // "Z"
33153315
#if HAS_HOTEND
3316-
say_steps_per_mm_en(4); say_e_en(101, 4); // "E"
3316+
say_steps_per_mm_en(4); say_e_en(101, 4); // "E"
33173317
#endif
33183318
#endif
33193319
}

‎Marlin/src/lcd/extui/mks_ui/draw_ui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -941,9 +941,9 @@ void clear_cur_ui() {
941941
case LEVELING_PARA_UI: lv_clear_level_settings(); break;
942942
case DELTA_LEVELING_PARA_UI: break;
943943
case MANUAL_LEVELING_POSITION_UI: lv_clear_tramming_pos_settings(); break;
944-
case MAXFEEDRATE_UI: lv_clear_max_feedrate_settings(); break;
945944
case STEPS_UI: lv_clear_step_settings(); break;
946945
case ACCELERATION_UI: lv_clear_acceleration_settings(); break;
946+
case MAXFEEDRATE_UI: lv_clear_max_feedrate_settings(); break;
947947
case JERK_UI: TERN_(CLASSIC_JERK, lv_clear_jerk_settings()); break;
948948
case MOTORDIR_UI: break;
949949
case HOMESPEED_UI: break;
@@ -1051,11 +1051,11 @@ void draw_return_ui() {
10511051
case LEVELING_PARA_UI: lv_draw_level_settings(); break;
10521052
case DELTA_LEVELING_PARA_UI: break;
10531053
case MANUAL_LEVELING_POSITION_UI: lv_draw_tramming_pos_settings(); break;
1054-
case MAXFEEDRATE_UI: lv_draw_max_feedrate_settings(); break;
10551054
#if ENABLED(EDITABLE_STEPS_PER_UNIT)
10561055
case STEPS_UI: lv_draw_step_settings(); break;
10571056
#endif
10581057
case ACCELERATION_UI: lv_draw_acceleration_settings(); break;
1058+
case MAXFEEDRATE_UI: lv_draw_max_feedrate_settings(); break;
10591059
#if ENABLED(CLASSIC_JERK)
10601060
case JERK_UI: lv_draw_jerk_settings(); break;
10611061
#endif

‎Marlin/src/lcd/menu/menu_advanced.cpp

Lines changed: 77 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -452,49 +452,36 @@ void menu_backlash();
452452

453453
#endif // SHOW_MENU_ADVANCED_TEMPERATURE
454454

455-
#if DISABLED(SLIM_LCD_MENUS)
456-
457-
// M203 / M205 Velocity options
458-
void menu_advanced_velocity() {
459-
// M203 Max Feedrate
460-
constexpr xyze_feedrate_t max_fr_edit =
461-
#ifdef MAX_FEEDRATE_EDIT_VALUES
462-
MAX_FEEDRATE_EDIT_VALUES
463-
#elif ENABLED(LIMITED_MAX_FR_EDITING)
464-
DEFAULT_MAX_FEEDRATE
465-
#else
466-
LOGICAL_AXIS_ARRAY_1(9999)
467-
#endif
468-
;
469-
#if ENABLED(LIMITED_MAX_FR_EDITING) && !defined(MAX_FEEDRATE_EDIT_VALUES)
470-
const xyze_feedrate_t max_fr_edit_scaled = max_fr_edit * 2;
471-
#else
472-
const xyze_feedrate_t &max_fr_edit_scaled = max_fr_edit;
473-
#endif
455+
#if ENABLED(EDITABLE_STEPS_PER_UNIT)
474456

457+
// M92 Steps-per-mm
458+
void menu_advanced_steps_per_mm() {
475459
START_MENU();
476460
BACK_ITEM(MSG_ADVANCED_SETTINGS);
477461

478462
LOOP_NUM_AXES(a)
479-
EDIT_ITEM_FAST_N(float5, a, MSG_VMAX_N, &planner.settings.max_feedrate_mm_s[a], 1, max_fr_edit_scaled[a]);
463+
EDIT_ITEM_FAST_N(float72, a, MSG_N_STEPS, &planner.settings.axis_steps_per_mm[a], 5, 9999, []{ planner.refresh_positioning(); });
480464

481-
#if E_STEPPERS
482-
EDIT_ITEM_FAST_N(float5, E_AXIS, MSG_VMAX_N, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
483-
#endif
484465
#if ENABLED(DISTINCT_E_FACTORS)
485466
for (uint8_t n = 0; n < E_STEPPERS; ++n)
486-
EDIT_ITEM_FAST_N(float5, n, MSG_VMAX_EN, &planner.settings.max_feedrate_mm_s[E_AXIS_N(n)], 1, max_fr_edit_scaled.e);
467+
EDIT_ITEM_FAST_N(float72, n, MSG_EN_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(n)], 5, 9999, []{
468+
const uint8_t e = MenuItemBase::itemIndex;
469+
if (e == active_extruder)
470+
planner.refresh_positioning();
471+
else
472+
planner.mm_per_step[E_AXIS_N(e)] = 1.0f / planner.settings.axis_steps_per_mm[E_AXIS_N(e)];
473+
});
474+
#elif E_STEPPERS
475+
EDIT_ITEM_FAST_N(float72, E_AXIS, MSG_N_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
487476
#endif
488477

489-
// M205 S Min Feedrate
490-
EDIT_ITEM_FAST(float5, MSG_VMIN, &planner.settings.min_feedrate_mm_s, 0, 9999);
491-
492-
// M205 T Min Travel Feedrate
493-
EDIT_ITEM_FAST(float5, MSG_VTRAV_MIN, &planner.settings.min_travel_feedrate_mm_s, 0, 9999);
494-
495478
END_MENU();
496479
}
497480

481+
#endif // EDITABLE_STEPS_PER_UNIT
482+
483+
#if DISABLED(SLIM_LCD_MENUS)
484+
498485
// M201 / M204 Accelerations
499486
void menu_advanced_acceleration() {
500487
float max_accel = (
@@ -579,6 +566,47 @@ void menu_backlash();
579566
END_MENU();
580567
}
581568

569+
// M203 / M205 Velocity options
570+
void menu_advanced_velocity() {
571+
// M203 Max Feedrate
572+
constexpr xyze_feedrate_t max_fr_edit =
573+
#ifdef MAX_FEEDRATE_EDIT_VALUES
574+
MAX_FEEDRATE_EDIT_VALUES
575+
#elif ENABLED(LIMITED_MAX_FR_EDITING)
576+
DEFAULT_MAX_FEEDRATE
577+
#else
578+
LOGICAL_AXIS_ARRAY_1(9999)
579+
#endif
580+
;
581+
#if ENABLED(LIMITED_MAX_FR_EDITING) && !defined(MAX_FEEDRATE_EDIT_VALUES)
582+
const xyze_feedrate_t max_fr_edit_scaled = max_fr_edit * 2;
583+
#else
584+
const xyze_feedrate_t &max_fr_edit_scaled = max_fr_edit;
585+
#endif
586+
587+
START_MENU();
588+
BACK_ITEM(MSG_ADVANCED_SETTINGS);
589+
590+
LOOP_NUM_AXES(a)
591+
EDIT_ITEM_FAST_N(float5, a, MSG_VMAX_N, &planner.settings.max_feedrate_mm_s[a], 1, max_fr_edit_scaled[a]);
592+
593+
#if E_STEPPERS
594+
EDIT_ITEM_FAST_N(float5, E_AXIS, MSG_VMAX_N, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, max_fr_edit_scaled.e);
595+
#endif
596+
#if ENABLED(DISTINCT_E_FACTORS)
597+
for (uint8_t n = 0; n < E_STEPPERS; ++n)
598+
EDIT_ITEM_FAST_N(float5, n, MSG_VMAX_EN, &planner.settings.max_feedrate_mm_s[E_AXIS_N(n)], 1, max_fr_edit_scaled.e);
599+
#endif
600+
601+
// M205 S Min Feedrate
602+
EDIT_ITEM_FAST(float5, MSG_VMIN, &planner.settings.min_feedrate_mm_s, 0, 9999);
603+
604+
// M205 T Min Travel Feedrate
605+
EDIT_ITEM_FAST(float5, MSG_VTRAV_MIN, &planner.settings.min_travel_feedrate_mm_s, 0, 9999);
606+
607+
END_MENU();
608+
}
609+
582610
#if ENABLED(SHAPING_MENU)
583611

584612
void menu_advanced_input_shaping() {
@@ -639,34 +667,6 @@ void menu_backlash();
639667

640668
#endif // !SLIM_LCD_MENUS
641669

642-
#if ENABLED(EDITABLE_STEPS_PER_UNIT)
643-
644-
// M92 Steps-per-mm
645-
void menu_advanced_steps_per_mm() {
646-
START_MENU();
647-
BACK_ITEM(MSG_ADVANCED_SETTINGS);
648-
649-
LOOP_NUM_AXES(a)
650-
EDIT_ITEM_FAST_N(float72, a, MSG_N_STEPS, &planner.settings.axis_steps_per_mm[a], 5, 9999, []{ planner.refresh_positioning(); });
651-
652-
#if ENABLED(DISTINCT_E_FACTORS)
653-
for (uint8_t n = 0; n < E_STEPPERS; ++n)
654-
EDIT_ITEM_FAST_N(float72, n, MSG_EN_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(n)], 5, 9999, []{
655-
const uint8_t e = MenuItemBase::itemIndex;
656-
if (e == active_extruder)
657-
planner.refresh_positioning();
658-
else
659-
planner.mm_per_step[E_AXIS_N(e)] = 1.0f / planner.settings.axis_steps_per_mm[E_AXIS_N(e)];
660-
});
661-
#elif E_STEPPERS
662-
EDIT_ITEM_FAST_N(float72, E_AXIS, MSG_N_STEPS, &planner.settings.axis_steps_per_mm[E_AXIS], 5, 9999, []{ planner.refresh_positioning(); });
663-
#endif
664-
665-
END_MENU();
666-
}
667-
668-
#endif // EDITABLE_STEPS_PER_UNIT
669-
670670
void menu_advanced_settings() {
671671
#if ANY(POLARGRAPH, SHAPING_MENU, HAS_BED_PROBE, EDITABLE_STEPS_PER_UNIT)
672672
const bool is_busy = printer_busy();
@@ -679,7 +679,26 @@ void menu_advanced_settings() {
679679
START_MENU();
680680
BACK_ITEM(MSG_CONFIGURATION);
681681

682+
// M92 - Steps Per mm
683+
#if ENABLED(EDITABLE_STEPS_PER_UNIT)
684+
if (!is_busy) SUBMENU(MSG_STEPS_PER_MM, menu_advanced_steps_per_mm);
685+
#endif
686+
682687
#if DISABLED(SLIM_LCD_MENUS)
688+
// M201 - Acceleration items
689+
SUBMENU(MSG_ACCELERATION, menu_advanced_acceleration);
690+
691+
// M203 / M205 - Feedrate items
692+
SUBMENU(MSG_MAX_SPEED, menu_advanced_velocity);
693+
694+
#if ENABLED(CLASSIC_JERK)
695+
// M205 - Max Jerk
696+
SUBMENU(MSG_JERK, menu_advanced_jerk);
697+
#elif HAS_JUNCTION_DEVIATION
698+
EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.001f, 0.3f
699+
OPTARG(HAS_LINEAR_E_JERK, planner.recalculate_max_e_jerk)
700+
);
701+
#endif
683702

684703
#if ENABLED(POLARGRAPH)
685704
// M665 - Polargraph Settings
@@ -698,33 +717,13 @@ void menu_advanced_settings() {
698717
ACTION_ITEM(MSG_SET_HOME_OFFSETS, []{ queue.inject(F("M428")); ui.return_to_status(); });
699718
#endif
700719

701-
// M203 / M205 - Feedrate items
702-
SUBMENU(MSG_MAX_SPEED, menu_advanced_velocity);
703-
704-
// M201 - Acceleration items
705-
SUBMENU(MSG_ACCELERATION, menu_advanced_acceleration);
706-
707720
// M593 - Acceleration items
708721
#if ENABLED(SHAPING_MENU)
709722
SUBMENU(MSG_INPUT_SHAPING, menu_advanced_input_shaping);
710723
#endif
711724

712-
#if ENABLED(CLASSIC_JERK)
713-
// M205 - Max Jerk
714-
SUBMENU(MSG_JERK, menu_advanced_jerk);
715-
#elif HAS_JUNCTION_DEVIATION
716-
EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.001f, 0.3f
717-
OPTARG(HAS_LINEAR_E_JERK, planner.recalculate_max_e_jerk)
718-
);
719-
#endif
720-
721725
#endif // !SLIM_LCD_MENUS
722726

723-
// M92 - Steps Per mm
724-
#if ENABLED(EDITABLE_STEPS_PER_UNIT)
725-
if (!is_busy) SUBMENU(MSG_STEPS_PER_MM, menu_advanced_steps_per_mm);
726-
#endif
727-
728727
#if ENABLED(BACKLASH_GCODE)
729728
SUBMENU(MSG_BACKLASH, menu_backlash);
730729
#endif

0 commit comments

Comments
 (0)