Merge pull request #3685 from gudnimg/sd_menu_optimisation

Optimisation: Reduce code size in rendering SD file names and folders
This commit is contained in:
Alex Voinea 2022-10-13 21:13:35 +02:00 committed by GitHub
commit b846b9b70d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 21 deletions

View File

@ -297,32 +297,19 @@ const char STR_SEPARATOR[] PROGMEM = "------------";
static void lcd_implementation_drawmenu_sdfile(uint8_t row, const char* longFilename) static void lcd_implementation_drawmenu_sdfile(uint8_t row, const char* longFilename)
{ {
char c; uint8_t len = LCD_WIDTH - 1;
uint8_t n = LCD_WIDTH - 1;
lcd_set_cursor(0, row); lcd_set_cursor(0, row);
lcd_print((lcd_encoder == menu_item)?'>':' '); lcd_print((lcd_encoder == menu_item)?'>':' ');
while( ((c = *longFilename) != '\0') && (n>0) ) lcd_print_pad(longFilename, len);
{
lcd_print(c);
longFilename++;
n--;
}
lcd_space(n);
} }
static void lcd_implementation_drawmenu_sddirectory(uint8_t row, const char* longFilename) static void lcd_implementation_drawmenu_sddirectory(uint8_t row, const char* longFilename)
{ {
char c; uint8_t len = LCD_WIDTH - 2;
uint8_t n = LCD_WIDTH - 2;
lcd_set_cursor(0, row); lcd_set_cursor(0, row);
lcd_print((lcd_encoder == menu_item)?'>':' '); lcd_print((lcd_encoder == menu_item)?'>':' ');
lcd_print(LCD_STR_FOLDER[0]); lcd_print(LCD_STR_FOLDER[0]);
while( ((c = *longFilename) != '\0') && (n>0) ) lcd_print_pad(longFilename, len);
{
lcd_print(c);
longFilename++;
n--;
}
lcd_space(n);
} }