From f64d266c895a84ea5e300700018b13f1048137b2 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 26 Apr 2018 14:50:01 +0200 Subject: [PATCH] Timer in autoloadmenu - dirty hack (unable to compile under 4.8.1) --- Firmware/ultralcd.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1140bde20..a9518158e 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -111,7 +111,8 @@ union MenuData struct AutoLoadFilamentMenu { - Timer timer; + //Timer timer; + char dummy; } autoLoadFilamentMenu; }; @@ -2085,12 +2086,13 @@ static void lcd_menu_AutoLoadFilament() } 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_printPGM(MSG_ERROR); lcd.setCursor(0, 2); 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(); }