CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'pts-options' of github.com:kieranc/InfiniTime into kieranc-pts-options

Browse Source 
# Conflicts:
#	src/components/settings/Settings.h
This commit is contained in:
Jean-François Milants
2022-10-02 18:30:41 +02:00
parent 7b115fe42c 4fe834efda
commit 738c012a73
5 changed files with 155 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/displayapp/screens/WatchFacePineTimeStyle.h
View File

@@ -43,6 +43,7 @@ namespace Pinetime {
private:
uint8_t displayedHour = -1;
uint8_t displayedMinute = -1;
uint8_t displayedSecond = -1;
uint16_t currentYear = 1970;
Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
@@ -71,10 +72,12 @@ namespace Pinetime {
lv_obj_t* btnReset;
lv_obj_t* btnRandom;
lv_obj_t* btnClose;
lv_obj_t* btnSteps;
lv_obj_t* timebar;
lv_obj_t* sidebar;
lv_obj_t* timeDD1;
lv_obj_t* timeDD2;
lv_obj_t* timeDD3;
lv_obj_t* timeAMPM;
lv_obj_t* dateDayOfWeek;
lv_obj_t* dateDay;
@@ -89,8 +92,12 @@ namespace Pinetime {
lv_obj_t* calendarCrossBar2;
lv_obj_t* notificationIcon;
lv_obj_t* stepGauge;
lv_obj_t* btnSet;
lv_obj_t* lbl_btnSet;
lv_obj_t* btnSetColor;
lv_obj_t* btnSetOpts;
lv_obj_t* lbl_btnSetColor;
lv_obj_t* lbl_btnSetOpts;
lv_obj_t* stepIcon;
lv_obj_t* stepValue;
lv_color_t needle_colors[1];
BatteryIcon batteryIcon;