From 50b60e0f70c83655e4d7eeda5b7ce2fcfce4d3b1 Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 18 Mar 2019 22:31:51 +0100 Subject: [PATCH] uptime shows in HH:MM:SS --- lib/MyESP/MyESP.cpp | 11 ++++++++--- lib/MyESP/MyESP.h | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/MyESP/MyESP.cpp b/lib/MyESP/MyESP.cpp index 8f94b19dc..bae360526 100644 --- a/lib/MyESP/MyESP.cpp +++ b/lib/MyESP/MyESP.cpp @@ -790,7 +790,7 @@ String MyESP::_buildTime() { return String(buffer); } -// returns system uptime - copied for espurna. see (c) +// returns system uptime in seconds - copied for espurna. see (c) unsigned long MyESP::_getUptime() { static unsigned long last_uptime = 0; static unsigned char uptime_overflows = 0; @@ -819,7 +819,12 @@ void MyESP::showSystemStats() { if (_boottime != NULL) { myDebug_P(PSTR(" [APP] Boot time: %s"), _boottime); } - myDebug_P(PSTR(" [APP] Uptime: %d seconds"), _getUptime()); + uint32_t t = _getUptime(); // seconds + uint32_t h = (uint32_t)t / (uint32_t)3600L; + uint32_t rem = (uint32_t)t % (uint32_t)3600L; + uint32_t m = rem / 60; + uint32_t s = rem % 60; + myDebug_P(PSTR(" [APP] Uptime: %d seconds (%02d:%02d:%02d)"), t, h, m, s); myDebug_P(PSTR(" [APP] System Load: %d%%"), getSystemLoadAverage()); if (isAPmode()) { @@ -909,7 +914,7 @@ void MyESP::_telnetHandle() { } break; - case '\b': // (^H) handle backspace in input: put a space in last char - coded by Simon Arlott + case '\b': // (^H) case 0x7F: // (^?) if (charsRead > 0) { _command[--charsRead] = '\0'; diff --git a/lib/MyESP/MyESP.h b/lib/MyESP/MyESP.h index d2837453f..70dd253ef 100644 --- a/lib/MyESP/MyESP.h +++ b/lib/MyESP/MyESP.h @@ -9,7 +9,7 @@ #ifndef MyEMS_h #define MyEMS_h -#define MYESP_VERSION "1.1.6b1" +#define MYESP_VERSION "1.1.6b2" #include #include