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

First build that actually works

Browse Source
This commit is contained in:
Alex Voinea 2019-11-21 19:04:45 +02:00
parent 8f901d2613
commit 6538262e75
3 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Firmware/menu.cpp
View File

@ -54,6 +54,7 @@ void menu_goto(menu_func_t menu, const uint32_t encoder, const bool feedback, bo
// Resets the global shared C union. // Resets the global shared C union.
// This ensures, that the menu entered will find out, that it shall initialize itself. // This ensures, that the menu entered will find out, that it shall initialize itself.
memset(&menu_data, 0, sizeof(menu_data)); memset(&menu_data, 0, sizeof(menu_data));
menu_entering = 1; //next menu that supports entering will clear this flag on first enter. Used for initializing some menus only one time.
} }
if (feedback) lcd_quick_feedback(); if (feedback) lcd_quick_feedback();
} }
@ -111,12 +112,12 @@ static void menu_back_no_reset(void)
} }
} }
void menu_back_no_feedback(void) void menu_back_scroll(int scrollback)
{ {
if (menu_depth > 0) if (menu_depth > 0)
{ {
menu_depth--; menu_depth--;
menu_goto(menu_stack[menu_depth].menu, menu_stack[menu_depth].position, false, true); menu_goto(menu_stack[menu_depth].menu, menu_stack[menu_depth].position + scrollback, false, true);
} }
} }

2
Firmware/menu.h
View File

@ -78,7 +78,7 @@ extern void menu_end(void);
extern void menu_back(void); extern void menu_back(void);
extern void menu_back(uint8_t nLevel); extern void menu_back(uint8_t nLevel);
extern void menu_back_no_feedback(void); extern void menu_back_scroll(int scrollback);
extern void menu_back_if_clicked(void); extern void menu_back_if_clicked(void);

46
Firmware/ultralcd.cpp
View File

@ -326,25 +326,30 @@ static void lcd_filename_scroll() //this is a submenu
if (_md->status == 0) if (_md->status == 0)
{ {
_md->status = 1; _md->status = 1;
_md->encoderInitial = lcd_encoder_diff / ENCODER_PULSES_PER_STEP; _md->encoderInitial = lcd_encoder;
lcd_scrollTimer.start(); lcd_scrollTimer.start();
} }
if (LCD_CLICKED || (_md->encoderInitial != (lcd_encoder_diff / ENCODER_PULSES_PER_STEP))) //go back to sd_menu. if (LCD_CLICKED || (_md->encoderInitial != lcd_encoder)) //go back to sd_menu.
{ {
lcd_scrollTimer.stop(); lcd_scrollTimer.start();
// menu_depth--; // menu_depth--;
// menu_goto(menu_stack[menu_depth].menu, menu_stack[menu_depth].position + lcd_encoder_diff / ENCODER_PULSES_PER_STEP, false, true); // menu_goto(menu_stack[menu_depth].menu, menu_stack[menu_depth].position + lcd_encoder_diff / ENCODER_PULSES_PER_STEP, false, true);
menu_back_no_feedback(); menu_back_scroll(lcd_encoder - _md->encoderInitial);
} }
if(lcd_scrollTimer.expired(300)) if(lcd_scrollTimer.expired(200) && (scrollPointer != NULL))
{ {
uint8_t i = LCD_WIDTH - 1; uint8_t i = LCD_WIDTH - 1;
lcd_set_cursor(0, lcd_encoder); lcd_set_cursor(0, _md->encoderInitial = lcd_encoder);
lcd_print('>'); lcd_print('>');
for (; i != 0; i--) for (; i != 0; i--)
{ {
char c = *(scrollPointer + LCD_WIDTH - i); char c = *(scrollPointer + ((LCD_WIDTH - 1) - i));
if (c == '\0') break; //stop at the end of the string if (c == '\0')
{
scrollPointer = NULL; //invalidate string
lcd_scrollTimer.stop();
break; //stop at the end of the string
}
else else
{ {
lcd_print(c); lcd_print(c);
@ -424,7 +429,9 @@ static void lcd_implementation_drawmenu_sdfile(uint8_t row, const char* longFile
char c; char c;
uint8_t n = 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)?'>':' '); if (lcd_encoder == menu_item) lcd_print('>');
else lcd_print(' ');
// lcd_print((lcd_encoder == menu_item)?'>':' ');
while( ((c = *longFilename) != '\0') && (n>0) ) while( ((c = *longFilename) != '\0') && (n>0) )
{ {
lcd_print(c); lcd_print(c);
@ -540,12 +547,14 @@ static uint8_t menu_item_sdfile(const char* str_fn, char* str_fnl)
{ {
if (menu_item == menu_line) if (menu_item == menu_line)
{ {
if (lcd_draw_update) if (lcd_draw_update || !lcd_scrollTimer.running())
{ {
scrollPointer = (str_fnl[0] == '\0') ? str_fn : str_fnl; scrollPointer = (str_fnl[0] == '\0') ? str_fn : str_fnl;
if (lcd_encoder == menu_item) if (lcd_encoder == menu_item && !lcd_scrollTimer.running())
{ {
if (lcd_scrollTimer.expired(1000)) menu_submenu_scroll(lcd_filename_scroll); // lcd_beeper_quick_feedback();
menu_submenu_scroll(lcd_filename_scroll);
return 1;
} }
else lcd_implementation_drawmenu_sdfile(menu_row, scrollPointer); else lcd_implementation_drawmenu_sdfile(menu_row, scrollPointer);
} }
@ -7272,12 +7281,17 @@ void lcd_sdcard_menu()
presort_flag = false; presort_flag = false;
card.presort(); card.presort();
} }
if (lcd_draw_update == 0 && LCD_CLICKED == 0) if (!lcd_scrollTimer.running()) lcd_scrollTimer.start();
//_delay(100); bool scrollEnter = lcd_scrollTimer.expired(500);
if (lcd_draw_update == 0 && LCD_CLICKED == 0 && !scrollEnter && !menu_entering)
return; // nothing to do (so don't thrash the SD card) return; // nothing to do (so don't thrash the SD card)
uint16_t fileCnt = card.getnrfilenames(); uint16_t fileCnt = card.getnrfilenames();
if (menu_entering)
lcd_scrollTimer.start(); {
menu_entering = 0; //clear entering flag
lcd_draw_update = 1; //draw lines again
}
if (!scrollEnter) lcd_scrollTimer.start();
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_T(bMain?MSG_MAIN:MSG_BACK)); // i.e. default menu-item / menu-item after card insertion MENU_ITEM_BACK_P(_T(bMain?MSG_MAIN:MSG_BACK)); // i.e. default menu-item / menu-item after card insertion
card.getWorkDirName(); card.getWorkDirName();