bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

reduce the required size with uint16_t modifiers

Browse Source
This commit is contained in:
Tanguy Pruvot 2019-10-14 20:11:59 +02:00
parent 21867c7fef
commit a988f9304d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View File

@ -345,7 +345,7 @@ void MarlinUI::draw_status_screen() {
static char progress_string[5]; static char progress_string[5];
#endif #endif
static uint8_t lastElapsed = 0, elapsed_x_pos = 0; static uint8_t lastElapsed = 0, elapsed_x_pos = 0;
static char elapsed_string[22]; static char elapsed_string[16];
#if ENABLED(SHOW_REMAINING_TIME) #if ENABLED(SHOW_REMAINING_TIME)
#define SHOW_REMAINING_TIME_PREFIX 'E' #define SHOW_REMAINING_TIME_PREFIX 'E'
static uint8_t estimation_x_pos = 0; static uint8_t estimation_x_pos = 0;

6
Marlin/src/libs/duration_t.h
View File

@ -151,15 +151,15 @@ struct duration_t {
m = uint16_t(this->minute() % 60UL); m = uint16_t(this->minute() % 60UL);
if (with_days) { if (with_days) {
uint16_t d = this->day(); uint16_t d = this->day();
sprintf_P(buffer, PSTR("%ud %02u:%02u"), d, h % 24, m); sprintf_P(buffer, PSTR("%hud %02hu:%02hu"), d, h % 24, m);
return d >= 10 ? 9 : 8; return d >= 10 ? 9 : 8;
} }
else if (h < 100) { else if (h < 100) {
sprintf_P(buffer, PSTR("%02u:%02u"), h, m); sprintf_P(buffer, PSTR("%02hu:%02hu"), h, m);
return 5; return 5;
} }
else { else {
sprintf_P(buffer, PSTR("%u:%02u"), h, m); sprintf_P(buffer, PSTR("%hu:%02hu"), h, m);
return 6; return 6;
} }
} }