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

Dir fixes

Browse Source
This commit is contained in:
Alex Voinea 2019-11-22 14:39:21 +02:00
parent 8a806bceea
commit fdab70fa3a
No known key found for this signature in database
GPG Key ID: F5034E7CFCF2F973
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/cardreader.cpp
View File

@ -960,6 +960,7 @@ void CardReader::presort() {
lcd_set_degree(); lcd_set_degree();
lcd_clear(); lcd_clear();
#endif #endif
lcd_scrollTimer.start();
lcd_update(2); lcd_update(2);
KEEPALIVE_STATE(NOT_BUSY); KEEPALIVE_STATE(NOT_BUSY);
lcd_timeoutToStatus.start(); lcd_timeoutToStatus.start();

11
Firmware/ultralcd.cpp
View File

@ -337,12 +337,13 @@ static void lcd_filename_scroll() //this is a submenu
} }
if(lcd_scrollTimer.expired(200) && (scrollPointer != NULL)) if(lcd_scrollTimer.expired(200) && (scrollPointer != NULL))
{ {
uint8_t i = LCD_WIDTH - 1; uint8_t i = LCD_WIDTH - ((_md->isDir)?2:1);
lcd_set_cursor(0, _md->row); lcd_set_cursor(0, _md->row);
lcd_print('>'); lcd_print('>');
if (_md->isDir) lcd_print(LCD_STR_FOLDER[0]);
for (; i != 0; i--) for (; i != 0; i--)
{ {
char c = *(scrollPointer + ((LCD_WIDTH - 1) - i)); char c = *(scrollPointer + ((LCD_WIDTH - ((_md->isDir)?2:1)) - i));
if (c == '\0') if (c == '\0')
{ {
scrollPointer = NULL; //invalidate string scrollPointer = NULL; //invalidate string
@ -414,7 +415,7 @@ uint8_t menu_item_sddir(const char* str_fn, char* str_fnl)
_md->isDir = 1; _md->isDir = 1;
_md->row = menu_row; _md->row = menu_row;
menu_submenu_scroll(lcd_filename_scroll); menu_submenu_scroll(lcd_filename_scroll);
return 1; return 1; //stop menu generation early
} }
else lcd_implementation_drawmenu_sddirectory(menu_row, scrollPointer); else lcd_implementation_drawmenu_sddirectory(menu_row, scrollPointer);
} }
@ -424,7 +425,7 @@ uint8_t menu_item_sddir(const char* str_fn, char* str_fnl)
lcd_update_enabled = 0; lcd_update_enabled = 0;
menu_action_sddirectory(str_fn); menu_action_sddirectory(str_fn);
lcd_update_enabled = 1; lcd_update_enabled = 1;
// return menu_item_ret(); /* return */ menu_item_ret();
return 1; return 1;
} }
} }
@ -454,7 +455,7 @@ static uint8_t menu_item_sdfile(const char* str_fn, char* str_fnl)
{ {
lcd_consume_click(); lcd_consume_click();
menu_action_sdfile(str_fn); menu_action_sdfile(str_fn);
// return menu_item_ret(); /* return */ menu_item_ret();
return 1; return 1;
} }
} }