Steps and heartbeat for analog24 watchface

1 files changed, 18 insertions, 16 deletions

diff --git a/src/displayapp/screens/WatchFaceAnalog24.h b/src/displayapp/screens/WatchFaceAnalog24.h
index 25233af..0653bcf 100644
--- a/src/displayapp/screens/WatchFaceAnalog24.h
+++ b/src/displayapp/screens/WatchFaceAnalog24.h
@@ -9,6 +9,8 @@
 #include "components/battery/BatteryController.h"
 #include "components/ble/BleController.h"
 #include "components/ble/NotificationManager.h"
+#include "components/heartrate/HeartRateController.h"
+#include "components/motion/MotionController.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -27,7 +29,9 @@ namespace Pinetime {
                         Controllers::Battery& batteryController,
                         Controllers::Ble& bleController,
                         Controllers::NotificationManager& notificationManager,
-                        Controllers::Settings& settingsController);
+                        Controllers::Settings& settingsController,
+                        Controllers::HeartRateController& heartRateController,
+                        Controllers::MotionController& motionController);
 
         ~WatchFaceAnalog24() override;
 
@@ -35,9 +39,6 @@ namespace Pinetime {
 
       private:
         uint8_t sHour, sMinute; // , sSecond;
-        uint8_t hour;
-        uint8_t minute;
-        // uint8_t second;
 
         Pinetime::Controllers::DateTime::Months month;
         uint8_t day;
@@ -49,29 +50,28 @@ namespace Pinetime {
 
         DirtyValue<uint8_t> batteryPercentRemaining {0};
         DirtyValue<bool> isCharging {};
+        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<bool> notificationState {false};
 
-        // lv_obj_t* hour_body;
         lv_obj_t* hour_body_trace;
-        // lv_obj_t* minute_body;
-        // lv_obj_t* minute_body_trace;
-        // lv_obj_t* second_body;
 
-        // lv_point_t hour_point[2];
         lv_point_t hour_point_trace[2];
-        // lv_point_t minute_point[2];
-        // lv_point_t minute_point_trace[2];
-        // lv_point_t second_point[2];
 
-        // lv_style_t hour_line_style;
         lv_style_t hour_line_style_trace;
-        // lv_style_t minute_line_style;
-        // lv_style_t minute_line_style_trace;
-        // lv_style_t second_line_style;
 
         // lv_obj_t* label_date_day;
         lv_obj_t* batteryIcon;
+        lv_obj_t* bleIcon;
+        lv_obj_t* heartbeatIcon;
+        lv_obj_t* heartbeatValue;
+        lv_obj_t* stepIcon;
+        lv_obj_t* stepValue;
         lv_obj_t* notificationIcon;
 
         Controllers::DateTime& dateTimeController;
@@ -79,6 +79,8 @@ namespace Pinetime {
         Controllers::Ble& bleController;
         Controllers::NotificationManager& notificationManager;
         Controllers::Settings& settingsController;
+        Controllers::HeartRateController& heartRateController;
+        Controllers::MotionController& motionController;
 
         void UpdateClock();
         void SetBatteryIcon();