summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/WatchFaceDigital.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp/screens/WatchFaceDigital.h')
-rw-r--r--src/displayapp/screens/WatchFaceDigital.h23
1 files changed, 20 insertions, 3 deletions
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
index d33434c..c29033b 100644
--- a/src/displayapp/screens/WatchFaceDigital.h
+++ b/src/displayapp/screens/WatchFaceDigital.h
@@ -7,6 +7,7 @@
#include "displayapp/screens/Screen.h"
#include "components/datetime/DateTimeController.h"
#include "components/ble/BleController.h"
+#include "systemtask/SystemTask.h"
namespace Pinetime {
namespace Controllers {
@@ -30,33 +31,47 @@ namespace Pinetime {
Controllers::NotificationManager& notificatioManager,
Controllers::Settings& settingsController,
Controllers::HeartRateController& heartRateController,
- Controllers::MotionController& motionController);
+ Controllers::MotionController& motionController,
+ System::SystemTask& systemTask);
~WatchFaceDigital() override;
void Refresh() override;
private:
+ System::SystemTask& systemTask;
uint8_t displayedHour = -1;
uint8_t displayedMinute = -1;
+ uint8_t displayedSecond = -1;
+ uint8_t displayedDecisecond = -1;
uint16_t currentYear = 1970;
Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
Controllers::DateTime::Days currentDayOfWeek = Pinetime::Controllers::DateTime::Days::Unknown;
uint8_t currentDay = 0;
+ bool refreshBatteryInfo = true;
+
+ char hhmm_label_text[6] = { '?', '?', ':', '?', '?', 0 };
+ char seconds_label_text[5] = { ':', '?', '?', '.', 0 };
+ char deciseconds_label_text[2] = { '?', 0 };
+ char battery_percent_label_text[5] = { '?', '?', '?', '%', 0 };
+ char battery_voltage_label_text[8] = { '0', '0', '0', '0', ' ', 'm', 'V', 0 };
DirtyValue<uint8_t> batteryPercentRemaining {};
DirtyValue<bool> powerPresent {};
DirtyValue<bool> bleState {};
- DirtyValue<bool> bleRadioEnabled {};
DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
DirtyValue<bool> motionSensorOk {};
DirtyValue<uint32_t> stepCount {};
DirtyValue<uint8_t> heartbeat {};
DirtyValue<bool> heartbeatRunning {};
+ DirtyValue<uint16_t> temperature {};
DirtyValue<bool> notificationState {};
+ lv_obj_t* label_temp;
lv_obj_t* label_time;
- lv_obj_t* label_time_ampm;
+ lv_obj_t* label_time_pm;
+ lv_obj_t* label_time_seconds;
+ lv_obj_t* label_time_deciseconds;
lv_obj_t* label_date;
lv_obj_t* backgroundLabel;
lv_obj_t* batteryIcon;
@@ -67,6 +82,8 @@ namespace Pinetime {
lv_obj_t* stepIcon;
lv_obj_t* stepValue;
lv_obj_t* notificationIcon;
+ lv_obj_t* batteryPercentLabel;
+ lv_obj_t* batteryVoltageLabel;
Controllers::DateTime& dateTimeController;
Controllers::Battery& batteryController;