Skip to content

Commit 1379b79

Browse files
committed
WatchFaceAnalog: local date/time variables
Use local date and time variables. No need to store them in the object.
1 parent 21da586 commit 1379b79

2 files changed

Lines changed: 6 additions & 13 deletions

File tree

src/displayapp/screens/WatchFaceAnalog.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ WatchFaceAnalog::~WatchFaceAnalog() {
137137
}
138138

139139
void WatchFaceAnalog::UpdateClock() {
140-
hour = dateTimeController.Hours();
141-
minute = dateTimeController.Minutes();
142-
second = dateTimeController.Seconds();
140+
uint8_t hour = dateTimeController.Hours();
141+
uint8_t minute = dateTimeController.Minutes();
142+
uint8_t second = dateTimeController.Seconds();
143143

144144
if (sMinute != minute) {
145145
auto const angle = minute * 6;
@@ -214,9 +214,9 @@ void WatchFaceAnalog::Refresh() {
214214
currentDateTime = dateTimeController.CurrentDateTime();
215215

216216
if (currentDateTime.IsUpdated()) {
217-
month = dateTimeController.Month();
218-
day = dateTimeController.Day();
219-
dayOfWeek = dateTimeController.DayOfWeek();
217+
Pinetime::Controllers::DateTime::Months month = dateTimeController.Month();
218+
uint8_t day = dateTimeController.Day();
219+
Pinetime::Controllers::DateTime::Days dayOfWeek = dateTimeController.DayOfWeek();
220220

221221
UpdateClock();
222222

src/displayapp/screens/WatchFaceAnalog.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@ namespace Pinetime {
3535

3636
private:
3737
uint8_t sHour, sMinute, sSecond;
38-
uint8_t hour;
39-
uint8_t minute;
40-
uint8_t second;
41-
42-
Pinetime::Controllers::DateTime::Months month;
43-
uint8_t day;
44-
Pinetime::Controllers::DateTime::Days dayOfWeek;
4538

4639
Pinetime::Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
4740
Pinetime::Controllers::DateTime::Days currentDayOfWeek = Pinetime::Controllers::DateTime::Days::Unknown;

0 commit comments

Comments
 (0)