josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inconsistent indendation in mFilamentPrompt()

This commit is contained in:
gudnimg 2024-07-26 11:55:32 +00:00
parent faa01b5a5f
commit 8382815110
1 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
Firmware/ultralcd.cpp
View File

@ -1813,61 +1813,59 @@ void lcd_print_target_temps_first_line() {
} }
} }
static void mFilamentPrompt() static void mFilamentPrompt() {
{
lcd_timeoutToStatus.stop(); lcd_timeoutToStatus.stop();
lcd_print_target_temps_first_line(); lcd_print_target_temps_first_line();
lcd_puts_at_P(0,1, _T(MSG_PRESS_KNOB)); lcd_puts_at_P(0,1, _T(MSG_PRESS_KNOB));
lcd_set_cursor(0,2); lcd_set_cursor(0,2);
switch(eFilamentAction) switch(eFilamentAction) {
{ case FilamentAction::Load:
case FilamentAction::Load: case FilamentAction::AutoLoad:
case FilamentAction::AutoLoad: case FilamentAction::MmuLoad:
case FilamentAction::MmuLoad: case FilamentAction::MmuLoadingTest:
case FilamentAction::MmuLoadingTest: lcd_puts_P(_T(MSG_TO_LOAD_FIL));
lcd_puts_P(_T(MSG_TO_LOAD_FIL)); break;
break; case FilamentAction::UnLoad:
case FilamentAction::UnLoad: case FilamentAction::MmuUnLoad:
case FilamentAction::MmuUnLoad: lcd_puts_P(_T(MSG_TO_UNLOAD_FIL));
lcd_puts_P(_T(MSG_TO_UNLOAD_FIL)); break;
break; case FilamentAction::MmuEject:
case FilamentAction::MmuEject: case FilamentAction::MmuCut:
case FilamentAction::MmuCut: case FilamentAction::None:
case FilamentAction::None: case FilamentAction::Preheat:
case FilamentAction::Preheat: case FilamentAction::Lay1Cal:
case FilamentAction::Lay1Cal: break;
break; }
}
if(lcd_clicked() if(lcd_clicked()
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
/// @todo leptun - add this as a specific retest item /// @todo leptun - add this as a specific retest item
|| (((eFilamentAction == FilamentAction::Load) || (eFilamentAction == FilamentAction::AutoLoad)) && fsensor.getFilamentLoadEvent()) || (((eFilamentAction == FilamentAction::Load) || (eFilamentAction == FilamentAction::AutoLoad)) && fsensor.getFilamentLoadEvent())
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
) { ) {
menu_back(bFilamentPreheatState ? 2 : 3); menu_back(bFilamentPreheatState ? 2 : 3);
switch(eFilamentAction) switch(eFilamentAction) {
{ case FilamentAction::AutoLoad:
case FilamentAction::AutoLoad: // loading no longer cancellable
// loading no longer cancellable eFilamentAction = FilamentAction::Load;
eFilamentAction = FilamentAction::Load; [[fallthrough]];
// FALLTHRU case FilamentAction::Load:
case FilamentAction::Load: enquecommand_P(MSG_M701); // load filament
enquecommand_P(MSG_M701); // load filament break;
break; case FilamentAction::UnLoad:
case FilamentAction::UnLoad: enquecommand_P(MSG_M702); // unload filament
enquecommand_P(MSG_M702); // unload filament break;
break; case FilamentAction::MmuLoad:
case FilamentAction::MmuLoad: case FilamentAction::MmuLoadingTest:
case FilamentAction::MmuLoadingTest: case FilamentAction::MmuUnLoad:
case FilamentAction::MmuUnLoad: case FilamentAction::MmuEject:
case FilamentAction::MmuEject: case FilamentAction::MmuCut:
case FilamentAction::MmuCut: case FilamentAction::None:
case FilamentAction::None: case FilamentAction::Preheat:
case FilamentAction::Preheat: case FilamentAction::Lay1Cal:
case FilamentAction::Lay1Cal: break;
break; }
} }
}
} }
static void setFilamentAction(FilamentAction action) { static void setFilamentAction(FilamentAction action) {