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

optimisation: Stop print menu 

There is no need to manually track the cursor position.
We can use the menu API:
MENU_BEGIN()
...
// menu items in between here
...
MENU_END()

Change in memory:
Flash: -116 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2022-11-24 19:00:33 +00:00
parent fea1520dfb
commit 23613c7eb1
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

@ -5819,31 +5819,18 @@ void lcd_temp_model_cal()
void lcd_sdcard_stop() 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)); MENU_BEGIN();
lcd_puts_at_P(2, 2, _T(MSG_NO)); // Skip first two LCD rows used by static message
lcd_puts_at_P(2, 3, _T(MSG_YES)); if(menu_row == 0) menu_row = 2;
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();
}
}
// 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() void lcd_sdcard_menu()