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

Improved lcd_menu_statistics() implementation

Browse Source
This commit is contained in:
Alex Voinea 2020-02-03 18:40:46 +02:00
parent 007395acb4
commit 1f482adf55
No known key found for this signature in database
GPG Key ID: F5034E7CFCF2F973
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Firmware/ultralcd.cpp
View File

@ -2794,9 +2794,9 @@ static void lcd_LoadFilament()
//! //!
//! @code{.unparsed} //! @code{.unparsed}
//! |01234567890123456789| //! |01234567890123456789|
//! |Filament used: | c=18 r=1 //! |Filament used: | c=19 r=1
//! | 00.00m | //! | 0000.00m |
//! |Print time: | c=18 r=1 //! |Print time: | c=19 r=1
//! | 00h 00m 00s | //! | 00h 00m 00s |
//! ---------------------- //! ----------------------
//! @endcode //! @endcode
@ -2805,29 +2805,30 @@ static void lcd_LoadFilament()
//! //!
//! @code{.unparsed} //! @code{.unparsed}
//! |01234567890123456789| //! |01234567890123456789|
//! |Total filament : | c=18 r=1 //! |Total filament: | c=19 r=1
//! | 000.00 m | //! | 0000.00m |
//! |Total print time : | c=18 r=1 //! |Total print time: | c=19 r=1
//! | 00d :00h :00 m | //! | 00d 00h 00m |
//! ---------------------- //! ----------------------
//! @endcode //! @endcode
//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. Translations missing for "d"days, "h"ours, "m"inutes", "s"seconds". //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. Translations missing for "d"days, "h"ours, "m"inutes", "s"seconds".
void lcd_menu_statistics() void lcd_menu_statistics()
{ {
lcd_timeoutToStatus.stop(); //infinite timeout
if (IS_SD_PRINTING) if (IS_SD_PRINTING)
{ {
const float _met = ((float)total_filament_used) / (100000.f); const float _met = ((float)total_filament_used) / (100000.f);
const uint32_t _t = (_millis() - starttime) / 1000ul; const uint32_t _t = (_millis() - starttime) / 1000ul;
const int _h = _t / 3600; const uint32_t _h = _t / 3600;
const int _m = (_t - (_h * 3600ul)) / 60ul; const uint8_t _m = (_t - (_h * 3600ul)) / 60ul;
const int _s = _t - ((_h * 3600ul) + (_m * 60ul)); const uint8_t _s = _t - ((_h * 3600ul) + (_m * 60ul));
lcd_clear(); lcd_home();
lcd_printf_P(_N( lcd_printf_P(_N(
"%S:\n" "%S:\n"
"%17.2fm \n" "%18.2fm \n"
"%S:\n" "%S:\n"
"%2dh %02dm %02ds" "%10ldh %02hhdm %02hhds"
), ),
_i("Filament used"), _met, ////c=18 r=1 _i("Filament used"), _met, ////c=18 r=1
_i("Print time"), _h, _m, _s); ////c=18 r=1 _i("Print time"), _h, _m, _s); ////c=18 r=1
@ -2840,29 +2841,20 @@ void lcd_menu_statistics()
uint8_t _hours, _minutes; uint8_t _hours, _minutes;
uint32_t _days; uint32_t _days;
float _filament_m = (float)_filament/100; float _filament_m = (float)_filament/100;
// int _filament_km = (_filament >= 100000) ? _filament / 100000 : 0;
// if (_filament_km > 0) _filament_m = _filament - (_filament_km * 100000);
_days = _time / 1440; _days = _time / 1440;
_hours = (_time - (_days * 1440)) / 60; _hours = (_time - (_days * 1440)) / 60;
_minutes = _time - ((_days * 1440) + (_hours * 60)); _minutes = _time - ((_days * 1440) + (_hours * 60));
lcd_clear(); lcd_home();
lcd_printf_P(_N( lcd_printf_P(_N(
"%S:\n" "%S:\n"
"%17.2fm \n" "%18.2fm \n"
"%S:\n" "%S:\n"
"%7ldd :%2hhdh :%02hhdm" "%10ldd %02hhdh %02hhdm"
), _i("Total filament"), _filament_m, _i("Total print time"), _days, _hours, _minutes); ),
KEEPALIVE_STATE(PAUSED_FOR_USER); _i("Total filament"), _filament_m,
while (!lcd_clicked()) _i("Total print time"), _days, _hours, _minutes);
{ menu_back_if_clicked_fb();
manage_heater();
manage_inactivity(true);
_delay(100);
}
KEEPALIVE_STATE(NOT_BUSY);
lcd_quick_feedback();
menu_back();
} }
} }