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

Merge pull request #2195 from leptun/MK3-fix-LFN 

Fix short filenames scrolling in sdprint menu and status screen
This commit is contained in:
DRracer 2019-11-08 16:52:53 +01:00 committed by GitHub
parent 21dd8eadd1 bf9f668574
commit c82fa07299
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Firmware/ultralcd.cpp
View File

@ -310,18 +310,24 @@ bool bSettings; // flag (i.e. 'fake parameter'
const char STR_SEPARATOR[] PROGMEM = "------------"; const char STR_SEPARATOR[] PROGMEM = "------------";
static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, char* longFilename) static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* filename, char* longFilename)
{ {
char c; char c;
int enc_dif = lcd_encoder_diff / ENCODER_PULSES_PER_STEP; int enc_dif = lcd_encoder_diff / ENCODER_PULSES_PER_STEP;
uint8_t n = LCD_WIDTH - 1; uint8_t n = LCD_WIDTH - 1;
for(uint_least8_t g = 0; g<4;g++){ for(uint_least8_t g = 0; g<4;g++){
lcd_set_cursor(0, g); lcd_set_cursor(0, g);
lcd_print(' '); lcd_print(' ');
} }
lcd_set_cursor(0, row); lcd_set_cursor(0, row);
lcd_print('>'); lcd_print('>');
if (longFilename[0] == '\0')
{
longFilename = filename;
}
int i = 1; int i = 1;
int j = 0; int j = 0;
char* longFilenameTMP = longFilename; char* longFilenameTMP = longFilename;
@ -537,7 +543,7 @@ static uint8_t menu_item_sdfile(const char*
if (lcd_draw_update) if (lcd_draw_update)
{ {
if (lcd_encoder == menu_item) if (lcd_encoder == menu_item)
lcd_implementation_drawmenu_sdfile_selected(menu_row, str_fnl); lcd_implementation_drawmenu_sdfile_selected(menu_row, str_fn, str_fnl);
else else
lcd_implementation_drawmenu_sdfile(menu_row, str_fn, str_fnl); lcd_implementation_drawmenu_sdfile(menu_row, str_fn, str_fnl);
} }
@ -709,10 +715,10 @@ void lcdui_print_status_line(void)
{ {
if (IS_SD_PRINTING) if (IS_SD_PRINTING)
{ {
if (strcmp(longFilenameOLD, card.longFilename) != 0) if (strcmp(longFilenameOLD, (card.longFilename[0] ? card.longFilename : card.filename)) != 0)
{ {
memset(longFilenameOLD, '\0', strlen(longFilenameOLD)); memset(longFilenameOLD, '\0', strlen(longFilenameOLD));
sprintf_P(longFilenameOLD, PSTR("%s"), card.longFilename); sprintf_P(longFilenameOLD, PSTR("%s"), (card.longFilename[0] ? card.longFilename : card.filename));
scrollstuff = 0; scrollstuff = 0;
} }
} }
@ -760,16 +766,16 @@ void lcdui_print_status_line(void)
} }
else if ((IS_SD_PRINTING) && (custom_message_type == CustomMsg::Status)) else if ((IS_SD_PRINTING) && (custom_message_type == CustomMsg::Status))
{ // If printing from SD, show what we are printing { // If printing from SD, show what we are printing
if(strlen(card.longFilename) > LCD_WIDTH) if(strlen(longFilenameOLD) > LCD_WIDTH)
{ {
int inters = 0; int inters = 0;
int gh = scrollstuff; int gh = scrollstuff;
while (((gh - scrollstuff) < LCD_WIDTH) && (inters == 0)) while (((gh - scrollstuff) < LCD_WIDTH) && (inters == 0))
{ {
if (card.longFilename[gh] == '\0') if (longFilenameOLD[gh] == '\0')
{ {
lcd_set_cursor(gh - scrollstuff, 3); lcd_set_cursor(gh - scrollstuff, 3);
lcd_print(card.longFilename[gh - 1]); lcd_print(longFilenameOLD[gh - 1]);
scrollstuff = 0; scrollstuff = 0;
gh = scrollstuff; gh = scrollstuff;
inters = 1; inters = 1;
@ -777,7 +783,7 @@ void lcdui_print_status_line(void)
else else
{ {
lcd_set_cursor(gh - scrollstuff, 3); lcd_set_cursor(gh - scrollstuff, 3);
lcd_print(card.longFilename[gh - 1]); lcd_print(longFilenameOLD[gh - 1]);
gh++; gh++;
} }
} }
@ -785,7 +791,7 @@ void lcdui_print_status_line(void)
} }
else else
{ {
lcd_print(longFilenameOLD); lcd_printf_P(PSTR("%-20s"), longFilenameOLD);
} }
} }
else else