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

🎨 Misc cleanup and fixes

Browse Source
This commit is contained in:
Scott Lahteine
2021-05-18 22:46:59 -05:00
committed by Scott Lahteine
parent c85633b47f
commit f7d28ce1d6
26 changed files with 125 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/lcd/extui/dgus/dgus_extui.cpp
View File

@ -147,6 +147,7 @@ namespace ExtUI {
case PID_DONE:
ScreenHandler.setstatusmessagePGM(GET_TEXT(MSG_PID_AUTOTUNE_DONE));
break;
case PID_STARTED: break;
}
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_MAIN);
}

12
Marlin/src/lcd/extui/ui_api.cpp
View File

@ -569,7 +569,7 @@ namespace ExtUI {
}
float getAxisSteps_per_mm(const extruder_t extruder) {
UNUSED_E(extruder);
UNUSED(extruder);
return planner.settings.axis_steps_per_mm[E_AXIS_N(extruder - E0)];
}
@ -579,7 +579,7 @@ namespace ExtUI {
}
void setAxisSteps_per_mm(const_float_t value, const extruder_t extruder) {
UNUSED_E(extruder);
UNUSED(extruder);
planner.settings.axis_steps_per_mm[E_AXIS_N(extruder - E0)] = value;
planner.refresh_positioning();
}
@ -589,7 +589,7 @@ namespace ExtUI {
}
feedRate_t getAxisMaxFeedrate_mm_s(const extruder_t extruder) {
UNUSED_E(extruder);
UNUSED(extruder);
return planner.settings.max_feedrate_mm_s[E_AXIS_N(extruder - E0)];
}
@ -598,7 +598,7 @@ namespace ExtUI {
}
void setAxisMaxFeedrate_mm_s(const feedRate_t value, const extruder_t extruder) {
UNUSED_E(extruder);
UNUSED(extruder);
planner.set_max_feedrate(E_AXIS_N(extruder - E0), value);
}
@ -607,7 +607,7 @@ namespace ExtUI {
}
float getAxisMaxAcceleration_mm_s2(const extruder_t extruder) {
UNUSED_E(extruder);
UNUSED(extruder);
return planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(extruder - E0)];
}
@ -616,7 +616,7 @@ namespace ExtUI {
}
void setAxisMaxAcceleration_mm_s2(const_float_t value, const extruder_t extruder) {
UNUSED_E(extruder);
UNUSED(extruder);
planner.set_max_acceleration(E_AXIS_N(extruder - E0), value);
}

3
Marlin/src/lcd/menu/menu_mmu2.cpp
View File

@ -37,8 +37,7 @@ inline void action_mmu2_load_filament_to_nozzle(const uint8_t tool) {
ui.reset_status();
ui.return_to_status();
ui.status_printf_P(0, GET_TEXT(MSG_MMU2_LOADING_FILAMENT), int(tool + 1));
if (mmu2.load_filament_to_nozzle(tool))
ui.reset_status();
if (mmu2.load_filament_to_nozzle(tool)) ui.reset_status();
ui.return_to_status();
}