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

Timer in autoloadmenu - dirty hack (unable to compile under 4.8.1)

Browse Source
This commit is contained in:
Robert Pelnar 2018-04-26 14:50:01 +02:00
parent fc834fc28c
commit f64d266c89
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/ultralcd.cpp
View File

@ -111,7 +111,8 @@ union MenuData
struct AutoLoadFilamentMenu struct AutoLoadFilamentMenu
{ {
Timer timer; //Timer timer;
char dummy;
} autoLoadFilamentMenu; } autoLoadFilamentMenu;
}; };
@ -2085,12 +2086,13 @@ static void lcd_menu_AutoLoadFilament()
} }
else else
{ {
if (!menuData.autoLoadFilamentMenu.timer.running()) menuData.autoLoadFilamentMenu.timer.start(); Timer* ptimer = (Timer*)&(menuData.autoLoadFilamentMenu.dummy);
if (!ptimer->running()) ptimer->start();
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd_printPGM(MSG_ERROR); lcd_printPGM(MSG_ERROR);
lcd.setCursor(0, 2); lcd.setCursor(0, 2);
lcd_printPGM(MSG_PREHEAT_NOZZLE); lcd_printPGM(MSG_PREHEAT_NOZZLE);
if (menuData.autoLoadFilamentMenu.timer.expired(2000ul)) menu_action_back(); if (ptimer->expired(2000ul)) menu_action_back();
} }
if (lcd_clicked()) menu_action_back(); if (lcd_clicked()) menu_action_back();
} }