From efadce0b41ec7ea903d7398bdfbc4402b5be307c Mon Sep 17 00:00:00 2001 From: anschrammh Date: Sun, 17 Nov 2019 11:02:21 +0100 Subject: [PATCH] Added a new getUpTime() method which returns the board running time --- src/app/SAB.cpp | 13 +++++++++++-- src/app/SAB.h | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/app/SAB.cpp b/src/app/SAB.cpp index cb6f415..abb1a97 100644 --- a/src/app/SAB.cpp +++ b/src/app/SAB.cpp @@ -16,7 +16,7 @@ _error(0) { //We set the gpio up initGPIO(); - Serial.begin(500000, SERIAL_8N1, SERIAL_TX_ONLY); + Serial.begin(115200, SERIAL_8N1, SERIAL_TX_ONLY); Serial.println(); delay(200); @@ -28,6 +28,8 @@ _error(0) _screenManager.init(); _connectivityManager = new ConnectivityManager(_sdCardManager); if(!_pcf.begin()){_error |= IO_INIT_ERR;} + + _powerUpTime = _rtcManager.getDateTime(); } SAB::SAB(const BoardConfig boardConfig, const unsigned int webServerPort, const unsigned int ftpServerPort) : _boardConfig(boardConfig), @@ -47,7 +49,7 @@ _error(0) { //We set the gpio up initGPIO(); - Serial.begin(500000, SERIAL_8N1, SERIAL_TX_ONLY); + Serial.begin(115200, SERIAL_8N1, SERIAL_TX_ONLY); Serial.println(); delay(200); //We initialize the pins for the I2C communication @@ -58,6 +60,8 @@ _error(0) _screenManager.init(); _connectivityManager = new ConnectivityManager(_sdCardManager); if(!_pcf.begin()){_error |= IO_INIT_ERR;} + + _powerUpTime = _rtcManager.getDateTime(); } void SAB::initGPIO() @@ -115,6 +119,11 @@ PowerManager& SAB::getPowerManager() return _powerManager; } +TimeSpan SAB::getUpTime() +{ + return _rtcManager.getDateTime() - _powerUpTime; +} + BoardConfig SAB::getBoardConfig() const { return _boardConfig; diff --git a/src/app/SAB.h b/src/app/SAB.h index cf60227..707052c 100644 --- a/src/app/SAB.h +++ b/src/app/SAB.h @@ -39,7 +39,9 @@ class SAB IOManager& getIoManager(); TaskSchedulerManager& getTaskSchedulerManager(); PowerManager& getPowerManager(); + TimeSpan getUpTime(); BoardConfig getBoardConfig() const; + const char *getSoftVersion() const; unsigned char getError() const; private: @@ -60,6 +62,7 @@ class SAB TaskSchedulerManager _taskSchedulerManager; PowerManager _powerManager; + DateTime _powerUpTime; uint8_t _error; };