Add temperature display

10 files changed, 75 insertions, 10 deletions

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index e4c7a6c..68eb9b7 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -322,7 +322,8 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
                                                        bleController,
                                                        notificationManager,
                                                        settingsController,
-                                                       motionController);
+                                                       motionController,
+                                                       *systemTask);
       break;
 
     case Apps::Error:
diff --git a/src/displayapp/fonts/neofont.c b/src/displayapp/fonts/neofont.c
index 9248769..25fa3de 100644
--- a/src/displayapp/fonts/neofont.c
+++ b/src/displayapp/fonts/neofont.c
@@ -308,6 +308,13 @@ static const uint8_t glyphs[][2] = {
       _, X, _,
       X, X, X,
       _, X, _   ),
+
+  G(  _, X, _,
+      X, _, X,
+      _, X, _,
+      _, _, _,
+      _, _, _   ),
+
 };
 
 #undef X
@@ -349,7 +356,12 @@ static const uint8_t * neofont0_glyph_bitmap_cb(const lv_font_t * font, uint32_t
       return custom;
     } 
 
-    return glyphs[sizeof(glyphs)/sizeof(glyphs[0])-1];
+    switch (unicode_letter) {
+      case 0xB0: 
+        return glyphs[sizeof(glyphs)/sizeof(glyphs[0])-1];
+    }
+
+    return glyphs[sizeof(glyphs)/sizeof(glyphs[0])-2];
 }
 
 static bool neofont15_glyph_dsc_cb(const lv_font_t * font, lv_font_glyph_dsc_t * dsc_out, uint32_t unicode_letter, uint32_t unicode_letter_next)
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index f390eed..ab4cafd 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -9,6 +9,7 @@
 #include "components/settings/Settings.h"
 #include "displayapp/DisplayApp.h"
 #include "displayapp/screens/WatchFaceDigital.h"
+#include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -18,8 +19,10 @@ Clock::Clock(DisplayApp* app,
              Controllers::Ble& bleController,
              Controllers::NotificationManager& notificatioManager,
              Controllers::Settings& settingsController,
-             Controllers::MotionController& motionController)
+             Controllers::MotionController& motionController,
+             System::SystemTask& systemTask)
   : Screen(app),
+    systemTask {systemTask},
     dateTimeController {dateTimeController},
     batteryController {batteryController},
     bleController {bleController},
@@ -56,6 +59,7 @@ std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
                                                      bleController,
                                                      notificatioManager,
                                                      settingsController,
-                                                     motionController);
+                                                     motionController,
+                                                     systemTask);
 }
 
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 8d1a5b2..5001dce 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -6,6 +6,7 @@
 #include <memory>
 #include "displayapp/screens/Screen.h"
 #include "components/datetime/DateTimeController.h"
+#include "systemtask/SystemTask.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -26,12 +27,14 @@ namespace Pinetime {
               Controllers::Ble& bleController,
               Controllers::NotificationManager& notificatioManager,
               Controllers::Settings& settingsController,
-              Controllers::MotionController& motionController);
+              Controllers::MotionController& motionController,
+              System::SystemTask& systemTask);
         ~Clock() override;
 
         bool OnTouchEvent(TouchEvents event) override;
         bool OnButtonPushed() override;
 
+        System::SystemTask& systemTask;
       private:
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
index c971a78..8d5e27d 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -20,8 +20,10 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
                                    Controllers::Ble& bleController,
                                    Controllers::NotificationManager& notificatioManager,
                                    Controllers::Settings& settingsController,
-                                   Controllers::MotionController& motionController)
+                                   Controllers::MotionController& motionController,
+                                   System::SystemTask& systemTask)
   : Screen(app),
+    systemTask {systemTask},
     currentDateTime {{}},
     dateTimeController {dateTimeController},
     batteryController {batteryController},
@@ -54,6 +56,11 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
   lv_obj_set_auto_realign(label_date, true);
   lv_obj_set_style_local_text_color(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
 
+  label_temp = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(  label_temp, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x222222));
+  lv_label_set_text_fmt(label_temp, "??°C");
+  lv_obj_align(label_temp, lv_scr_act(), LV_ALIGN_CENTER, 60, -60);
+
   label_time = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text_fmt(label_time, hhmm_label_text);
   lv_obj_align(label_time, nullptr, LV_ALIGN_CENTER, 0, 0);
@@ -110,6 +117,21 @@ void WatchFaceDigital::Refresh() {
     lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
   }
 
+#ifndef INFINISIM
+  temperature = systemTask.motionSensor.temperature_last_read_value+23;
+  if (temperature.IsUpdated()) {
+    lv_obj_set_style_local_text_color(  label_temp, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
+    lv_label_set_text_fmt(label_temp, "%d°C", temperature.Get());
+#if 0
+    lv_label_set_text_fmt(label_temp, "T%d [%d,%d]",
+      ((int)(systemTask.motionSensor.temperature_last_read_value+23)),
+      ((int)(systemTask.motionSensor.temperature_last_result)),
+      ((int)(systemTask.motionSensor.temperature_read_counter))
+    );
+#endif
+  }
+#endif
+
   currentDateTime = dateTimeController.CurrentDateTime();
 
   if (currentDateTime.IsUpdated()) {
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
index eb95e6f..2e0ad0b 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 {
@@ -28,12 +29,14 @@ namespace Pinetime {
                          Controllers::Ble& bleController,
                          Controllers::NotificationManager& notificatioManager,
                          Controllers::Settings& settingsController,
-                         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;
 
@@ -50,8 +53,10 @@ namespace Pinetime {
         DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
         DirtyValue<bool> motionSensorOk {};
         DirtyValue<uint32_t> stepCount {};
+        DirtyValue<uint16_t> temperature {};
         DirtyValue<bool> notificationState {};
 
+        lv_obj_t* label_temp;
         lv_obj_t* label_time;
         lv_obj_t* label_time_pm;
         lv_obj_t* label_date;
diff --git a/src/drivers/Bma421.cpp b/src/drivers/Bma421.cpp
index 2f60f42..c5d55cc 100644
--- a/src/drivers/Bma421.cpp
+++ b/src/drivers/Bma421.cpp
@@ -102,9 +102,7 @@ Bma421::Values Bma421::Process() {
   uint32_t steps = 0;
   bma423_step_counter_output(&steps, &bma);
 
-  int32_t temperature;
-  bma4_get_temperature(&temperature, BMA4_DEG, &bma);
-  temperature = temperature / 1000;
+  RefreshTemperature();
 
   uint8_t activity = 0;
   bma423_activity_output(&activity, &bma);
@@ -112,6 +110,19 @@ Bma421::Values Bma421::Process() {
   // X and Y axis are swapped because of the way the sensor is mounted in the PineTime
   return {steps, data.y, data.x, data.z};
 }
+
+void Bma421::RefreshTemperature() {
+  // uint8_t temperature_last_read_value;
+  // uint8_t temperature_last_result;
+  // uint8_t temperature_read_counter;
+  uint8_t data[BMA4_TEMP_DATA_SIZE] = { 0 };
+  temperature_last_result = bma4_read_regs(BMA4_TEMPERATURE_ADDR, data, BMA4_TEMP_DATA_SIZE, &bma);
+  if (temperature_last_result == BMA4_OK) {
+    temperature_last_read_value = data[BMA4_TEMP_BYTE];
+    temperature_read_counter++;
+  }
+}
+
 bool Bma421::IsOk() const {
   return isOk;
 }
diff --git a/src/drivers/Bma421.h b/src/drivers/Bma421.h
index ace644b..1503acd 100644
--- a/src/drivers/Bma421.h
+++ b/src/drivers/Bma421.h
@@ -30,6 +30,11 @@ namespace Pinetime {
       Values Process();
       void ResetStepCounter();
 
+      void RefreshTemperature();
+      uint8_t temperature_last_read_value;
+      uint8_t temperature_last_result;
+      uint8_t temperature_read_counter;
+
       void Read(uint8_t registerAddress, uint8_t* buffer, size_t size);
       void Write(uint8_t registerAddress, const uint8_t* data, size_t size);
 
diff --git a/src/libs/lvgl b/src/libs/lvgl
-Subproject d2ea09a907e87c191dd050523a262c4ec1a863a
+Subproject 23430cf20e32294549fff9b2879a9466dacc19b
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index fa28626..cf15071 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -110,7 +110,9 @@ namespace Pinetime {
       Pinetime::Drivers::Watchdog& watchdog;
       Pinetime::Controllers::NotificationManager& notificationManager;
       Pinetime::Controllers::MotorController& motorController;
+    public:
       Pinetime::Drivers::Bma421& motionSensor;
+    private:
       Pinetime::Controllers::Settings& settingsController;
       Pinetime::Controllers::MotionController& motionController;