bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Use homing_feedrate function

Browse Source
This commit is contained in:
Scott Lahteine
2020-12-16 22:18:40 -06:00
parent 1b6db623a7
commit bee6b8af8f
13 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/dwin/e3v2/dwin.cpp
View File

@ -1166,7 +1166,7 @@ void HMI_Move_X() {
if (!planner.is_full()) {
// Wait for planner moves to finish!
planner.synchronize();
planner.buffer_line(current_position, MMM_TO_MMS(HOMING_FEEDRATE_XY), active_extruder);
planner.buffer_line(current_position, homing_feedrate(X_AXIS), active_extruder);
}
DWIN_UpdateLCD();
return;
@ -1189,7 +1189,7 @@ void HMI_Move_Y() {
if (!planner.is_full()) {
// Wait for planner moves to finish!
planner.synchronize();
planner.buffer_line(current_position, MMM_TO_MMS(HOMING_FEEDRATE_XY), active_extruder);
planner.buffer_line(current_position, homing_feedrate(Y_AXIS), active_extruder);
}
DWIN_UpdateLCD();
return;
@ -1212,7 +1212,7 @@ void HMI_Move_Z() {
if (!planner.is_full()) {
// Wait for planner moves to finish!
planner.synchronize();
planner.buffer_line(current_position, MMM_TO_MMS(HOMING_FEEDRATE_Z), active_extruder);
planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
}
DWIN_UpdateLCD();
return;

2
Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.cpp
View File

@ -45,8 +45,6 @@ enum {
ID_FILAMNT_RETURN
};
extern feedRate_t feedrate_mm_s;
static void event_handler(lv_obj_t *obj, lv_event_t event) {
if (event != LV_EVENT_RELEASED) return;
switch (obj->mks_obj_id) {

2
Marlin/src/lcd/extui/lib/mks_ui/draw_operation.cpp
View File

@ -53,8 +53,6 @@ enum {
static lv_obj_t *label_PowerOff;
static lv_obj_t *buttonPowerOff;
extern feedRate_t feedrate_mm_s;
static void event_handler(lv_obj_t *obj, lv_event_t event) {
if (event != LV_EVENT_RELEASED) return;
switch (obj->mks_obj_id) {

2
Marlin/src/lcd/menu/menu_probe_offset.cpp
View File

@ -146,7 +146,7 @@ void prepare_for_probe_offset_wizard() {
// Move Nozzle to Probing/Homing Position
ui.wait_for_move = true;
current_position += probe.offset_xy;
line_to_current_position(MMM_TO_MMS(HOMING_FEEDRATE_XY));
line_to_current_position(MMM_TO_MMS(XY_PROBE_SPEED));
ui.synchronize(GET_TEXT(MSG_PROBE_WIZARD_MOVING));
ui.wait_for_move = false;