diff options
Diffstat (limited to 'src/DisplayApp')
| -rw-r--r-- | src/DisplayApp/DisplayApp.cpp | 29 | ||||
| -rw-r--r-- | src/DisplayApp/DisplayApp.h | 3 |
2 files changed, 28 insertions, 4 deletions
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp index e17dd55c..ea92a29d 100644 --- a/src/DisplayApp/DisplayApp.cpp +++ b/src/DisplayApp/DisplayApp.cpp @@ -67,18 +67,33 @@ void DisplayApp::InitHw() { } void DisplayApp::Refresh() { -// uint32_t systick_counter = nrf_rtc_counter_get(portNRF_RTC_REG); -// auto raw = systick_counter / 1000; + uint32_t systick_counter = nrf_rtc_counter_get(portNRF_RTC_REG); + + auto raw = systick_counter / 1000; + auto currentDeltaSeconds = raw - deltaSeconds; + + + auto deltaMinutes = (currentDeltaSeconds / 60); + auto currentMinutes = minutes + deltaMinutes; + + auto deltaHours = currentMinutes / 60; + currentMinutes -= (deltaHours * 60); + // // TODO make this better! // minutes = raw / 60; // seconds = raw - (minutes*60); + + auto currentHours = hours + deltaHours; + + + char minutesChar[3]; - sprintf(minutesChar, "%02d", minutes); + sprintf(minutesChar, "%02d", currentMinutes); char hoursChar[3]; - sprintf(hoursChar, "%02d", hours); + sprintf(hoursChar, "%02d", currentHours); uint8_t x = 7; if(hoursChar[0] != currentChar[0]) { @@ -115,3 +130,9 @@ void DisplayApp::Hours(uint8_t h) { // TODO yeah, I know, race condition too... hours = h; } + +void DisplayApp::SetTime(uint8_t minutes, uint8_t hours) { + deltaSeconds = nrf_rtc_counter_get(portNRF_RTC_REG) / 1000; + this->minutes = minutes; + this->hours = hours; +} diff --git a/src/DisplayApp/DisplayApp.h b/src/DisplayApp/DisplayApp.h index 74d35624..e89ff64f 100644 --- a/src/DisplayApp/DisplayApp.h +++ b/src/DisplayApp/DisplayApp.h @@ -17,6 +17,8 @@ namespace Pinetime { void Minutes(uint8_t m); void Hours(uint8_t h); + void SetTime(uint8_t minutes, uint8_t hours); + private: TaskHandle_t taskHandle; static void Process(void* instance); @@ -33,6 +35,7 @@ namespace Pinetime { uint8_t minutes = 0; uint8_t hours = 0; char currentChar[4]; + uint32_t deltaSeconds = 0; }; } } |
