diff options
| author | JF002 <JF002@users.noreply.github.com> | 2020-01-11 17:16:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-11 17:16:52 +0100 |
| commit | 9baf00bbfeac1dbc3188687e91073e3adffc887e (patch) | |
| tree | d6bd678423115256c30437dd85762ca9fd86bb60 /src/DisplayApp/DisplayApp.h | |
| parent | 04c7b1429f3d5c947c051f405846bd1fa72f2bf8 (diff) | |
| parent | 8253c099d9178c275f0d0d4ea7766f54afd0b38d (diff) | |
Merge pull request #11 from JF002/date-library
Date/Time management
Diffstat (limited to 'src/DisplayApp/DisplayApp.h')
| -rw-r--r-- | src/DisplayApp/DisplayApp.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/DisplayApp/DisplayApp.h b/src/DisplayApp/DisplayApp.h index 75c74227..1e9e2e89 100644 --- a/src/DisplayApp/DisplayApp.h +++ b/src/DisplayApp/DisplayApp.h @@ -11,6 +11,7 @@ #include <Components/DateTime/DateTimeController.h> #include "lcdfont14.h" #include "../drivers/Cst816s.h" +#include <date/date.h> extern const FONT_INFO lCD_70ptFontInfo; @@ -40,11 +41,10 @@ namespace Pinetime { static const char* MonthToString(Pinetime::Controllers::DateTime::Months month); static const char* DayOfWeekToString(Pinetime::Controllers::DateTime::Days dayOfWeek); - uint8_t seconds = 0; - uint8_t minutes = 0; - uint8_t hours = 0; + char currentChar[4]; uint32_t deltaSeconds = 0; + date::year_month_day currentYmd; States state = States::Running; void RunningState(); @@ -62,7 +62,6 @@ namespace Pinetime { static char const *DaysString[]; static char const *MonthsString[]; - bool dateUpdated = false; Pinetime::Drivers::Cst816S touchPanel; void OnTouchEvent(); |