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

Fix compile warnings, serial alias

Browse Source
This commit is contained in:
Scott Lahteine
2020-11-13 18:27:31 -06:00
parent ddc997c81f
commit 1d43e81be0
6 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,6 +106,9 @@ struct duration_t {
return this->value;
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-overflow"
/**
* @brief Formats the duration as a string
* @details String will be formated using a "full" representation of duration
@ -127,7 +130,7 @@ struct duration_t {
m = this->minute() % 60,
s = this->second() % 60;
if (y) sprintf_P(buffer, PSTR("%iy %id %ih %im %is"), y, d, h, m, s);
if (y) sprintf_P(buffer, PSTR("%iy %id %ih %im %is"), y, d, h, m, s);
else if (d) sprintf_P(buffer, PSTR("%id %ih %im %is"), d, h, m, s);
else if (h) sprintf_P(buffer, PSTR("%ih %im %is"), h, m, s);
else if (m) sprintf_P(buffer, PSTR("%im %is"), m, s);
@ -163,4 +166,6 @@ struct duration_t {
return 6;
}
}
#pragma GCC diagnostic pop
};