Merge pull request #4748 from thinkyhead/rc_sd_print_timer
Patch duration_t toDigital method
This commit is contained in:
commit
3b2f7ba225
|
@ -146,11 +146,14 @@ struct duration_t {
|
||||||
* 11d 12:33
|
* 11d 12:33
|
||||||
*/
|
*/
|
||||||
void toDigital(char *buffer, bool with_days=false) const {
|
void toDigital(char *buffer, bool with_days=false) const {
|
||||||
int m = this->minute() % 60;
|
uint16_t h = uint16_t(this->hour()),
|
||||||
|
m = uint16_t(this->minute() % 60UL);
|
||||||
if (with_days)
|
if (with_days)
|
||||||
sprintf_P(buffer, PSTR("%id %02i:%02i"), this->day(), this->hour() % 24, m);
|
sprintf_P(buffer, PSTR("%ud %02u:%02u"), this->day(), h, m);
|
||||||
|
else if (h < 100)
|
||||||
|
sprintf_P(buffer, PSTR("%02u:%02u"), h % 24, m);
|
||||||
else
|
else
|
||||||
sprintf_P(buffer, PSTR("%02i:%02i"), this->hour(), m);
|
sprintf_P(buffer, PSTR("%u:%02u"), h, m);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue