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

Merge pull request #3780 from gudnimg/stop-print-optimisations 

optimisation: Improve Stop Print menu
This commit is contained in:
Yuri D'Elia 2022-12-08 19:41:52 +01:00 committed by GitHub
parent a8b8085d22 23613c7eb1
commit 68c5cdce1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Firmware/ultralcd.cpp
View File

@ -5937,31 +5937,18 @@ void lcd_temp_model_cal()
void lcd_sdcard_stop()
{
// Show static message
lcd_puts_at_P(0, 0, _T(MSG_STOP_PRINT));
lcd_putc_at(0, 1, '\n');
lcd_puts_at_P(0, 0, _T(MSG_STOP_PRINT));
lcd_puts_at_P(2, 2, _T(MSG_NO));
lcd_puts_at_P(2, 3, _T(MSG_YES));
lcd_putc_at(0, 2, ' ');
lcd_putc_at(0, 3, ' ');
if ((int32_t)lcd_encoder > 2) { lcd_encoder = 2; }
if ((int32_t)lcd_encoder < 1) { lcd_encoder = 1; }
lcd_putc_at(0, 1 + lcd_encoder, '>');
if (lcd_clicked())
{
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
if ((int32_t)lcd_encoder == 1)
{
lcd_return_to_status();
}
if ((int32_t)lcd_encoder == 2)
{
lcd_print_stop();
}
}
MENU_BEGIN();
// Skip first two LCD rows used by static message
if(menu_row == 0) menu_row = 2;
// Show No options first, the default selection
MENU_ITEM_FUNCTION_P(_T(MSG_NO), lcd_return_to_status);
MENU_ITEM_FUNCTION_P(_T(MSG_YES), lcd_print_stop);
MENU_END();
}
void lcd_sdcard_menu()