summaryrefslogtreecommitdiff
path: root/src/displayapp
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp')
-rw-r--r--src/displayapp/DisplayApp.cpp3
-rw-r--r--src/displayapp/screens/Clock.cpp8
-rw-r--r--src/displayapp/screens/Clock.h5
-rw-r--r--src/displayapp/screens/WatchFaceDigital.cpp17
-rw-r--r--src/displayapp/screens/WatchFaceDigital.h6
5 files changed, 33 insertions, 6 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 574f964..155d69a 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -296,7 +296,8 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
bleController,
notificationManager,
settingsController,
- motionController);
+ motionController,
+ *systemTask);
break;
case Apps::Error:
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 e33a403..0bb2bf6 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -21,8 +21,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},
@@ -56,6 +58,12 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
lv_obj_set_style_local_text_color(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
lv_obj_set_style_local_text_font(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &neofont2);
+ label_temp = lv_label_create(lv_scr_act(), nullptr);
+ lv_obj_align(label_temp, lv_scr_act(), LV_ALIGN_CENTER, 0, -60);
+ lv_obj_set_style_local_text_color( label_temp, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
+ lv_obj_set_style_local_text_font( label_temp, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &neofont1);
+ lv_label_set_text_fmt(label_temp, "T? [?,?]");
+
label_time = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &neofont3);
@@ -111,6 +119,13 @@ void WatchFaceDigital::Refresh() {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
}
+ // systemTask.motionSensor.RefreshTemperature();
+ 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))
+ );
+
currentDateTime = dateTimeController.CurrentDateTime();
if (currentDateTime.IsUpdated()) {
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
index 572a783..770645d 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,6 +53,7 @@ namespace Pinetime {
DirtyValue<uint32_t> stepCount {};
DirtyValue<bool> notificationState {};
+ lv_obj_t* label_temp;
lv_obj_t* label_time;
lv_obj_t* label_time_ampm;
lv_obj_t* label_date;
generated by cgit v0.10.2 at 2026-01-10 00:22:35 (GMT)