summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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.cpp77
-rw-r--r--src/displayapp/screens/WatchFaceDigital.h15
-rw-r--r--src/drivers/Bma421.cpp17
-rw-r--r--src/drivers/Bma421.h5
-rw-r--r--src/systemtask/SystemTask.h2
8 files changed, 103 insertions, 29 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 75c7bbd..990e469 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -352,7 +352,8 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
notificationManager,
settingsController,
heartRateController,
- motionController);
+ motionController,
+ *systemTask);
break;
case Apps::Error:
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 67598c0..671f359 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -13,6 +13,7 @@
#include "displayapp/screens/WatchFaceAnalog.h"
#include "displayapp/screens/WatchFaceAnalog24.h"
#include "displayapp/screens/PineTimeStyle.h"
+#include "systemtask/SystemTask.h"
using namespace Pinetime::Applications::Screens;
@@ -23,8 +24,10 @@ Clock::Clock(DisplayApp* app,
Controllers::NotificationManager& notificatioManager,
Controllers::Settings& settingsController,
Controllers::HeartRateController& heartRateController,
- Controllers::MotionController& motionController)
+ Controllers::MotionController& motionController,
+ System::SystemTask& systemTask)
: Screen(app),
+ systemTask {systemTask},
dateTimeController {dateTimeController},
batteryController {batteryController},
bleController {bleController},
@@ -75,7 +78,8 @@ std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
notificatioManager,
settingsController,
heartRateController,
- motionController);
+ motionController,
+ systemTask);
}
std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 2fcb1e6..ccf3305 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -7,6 +7,7 @@
#include <components/heartrate/HeartRateController.h>
#include "displayapp/screens/Screen.h"
#include "components/datetime/DateTimeController.h"
+#include "systemtask/SystemTask.h"
namespace Pinetime {
namespace Controllers {
@@ -28,12 +29,14 @@ namespace Pinetime {
Controllers::NotificationManager& notificatioManager,
Controllers::Settings& settingsController,
Controllers::HeartRateController& heartRateController,
- 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 dc16f60..03750be 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -22,8 +22,10 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
Controllers::NotificationManager& notificatioManager,
Controllers::Settings& settingsController,
Controllers::HeartRateController& heartRateController,
- Controllers::MotionController& motionController)
+ Controllers::MotionController& motionController,
+ System::SystemTask& systemTask)
: Screen(app),
+ systemTask {systemTask},
currentDateTime {{}},
dateTimeController {dateTimeController},
batteryController {batteryController},
@@ -53,17 +55,29 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 0);
label_date = lv_label_create(lv_scr_act(), nullptr);
- lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_CENTER, 0, 60);
+ lv_obj_align(label_date, nullptr, LV_ALIGN_CENTER, 0, 60);
+ 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_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &neofont2);
+ lv_label_set_text_fmt(label_time, hhmm_label_text);
+ lv_obj_align(label_time, nullptr, LV_ALIGN_CENTER, 0, 0);
+ lv_label_set_long_mode(label_time, LV_LABEL_LONG_CROP);
+ lv_label_set_align(label_time, LV_LABEL_ALIGN_RIGHT);
- lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, 0, 0);
+ label_time_pm = lv_label_create(lv_scr_act(), nullptr);
+ lv_label_set_text_static(label_time_pm, "P ");
+ lv_obj_align(label_time_pm, label_time, LV_ALIGN_OUT_LEFT_TOP, 0, 0);
- label_time_ampm = lv_label_create(lv_scr_act(), nullptr);
- lv_label_set_text_static(label_time_ampm, "");
- lv_obj_align(label_time_ampm, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -30, -55);
+ label_time_seconds = lv_label_create(lv_scr_act(), nullptr);
+ lv_label_set_text_static(label_time_seconds, seconds_label_text);
+ lv_obj_align(label_time_seconds, label_time, LV_ALIGN_OUT_RIGHT_BOTTOM, 0, 0);
backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_click(backgroundLabel, true);
@@ -119,8 +133,7 @@ void WatchFaceDigital::Refresh() {
}
bleState = bleController.IsConnected();
- bleRadioEnabled = bleController.IsRadioEnabled();
- if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
+ if (bleState.IsUpdated()) {
lv_label_set_text(bleIcon, BleIcon::GetIcon(bleState.Get()));
}
lv_obj_realign(batteryIcon);
@@ -132,6 +145,30 @@ 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
+
+ uint8_t second = dateTimeController.Seconds();
+
+ if (second != displayedSecond) {
+ displayedSecond = second;
+ seconds_label_text[1] = '0' + (second / 10);
+ seconds_label_text[2] = '0' + (second % 10);
+ lv_label_set_text_static(label_time_seconds, seconds_label_text);
+ }
+
currentDateTime = dateTimeController.CurrentDateTime();
if (currentDateTime.IsUpdated()) {
@@ -152,24 +189,27 @@ void WatchFaceDigital::Refresh() {
if (displayedHour != hour || displayedMinute != minute) {
displayedHour = hour;
displayedMinute = minute;
-
+ bool hide_pm = true;
+ uint8_t h0;
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
- char ampmChar[3] = "AM";
if (hour == 0) {
hour = 12;
} else if (hour == 12) {
- ampmChar[0] = 'P';
+ hide_pm = false;
} else if (hour > 12) {
- hour = hour - 12;
- ampmChar[0] = 'P';
+ hour -= 12;
+ hide_pm = false;
}
- lv_label_set_text(label_time_ampm, ampmChar);
- lv_label_set_text_fmt(label_time, "%2d:%02d", hour, minute);
- lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, 0, 0);
+ h0 = hour < 10 ? ' ' : '1';
} else {
- lv_label_set_text_fmt(label_time, "%02d:%02d", hour, minute);
- lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+ h0 = '0' + (hour / 10);
}
+ hhmm_label_text[0] = h0;
+ hhmm_label_text[1] = '0' + (hour%10);
+ hhmm_label_text[3] = '0' + (minute / 10);
+ hhmm_label_text[4] = '0' + (minute % 10);
+ lv_label_set_text_static(label_time, hhmm_label_text);
+ lv_obj_set_hidden(label_time_pm, hide_pm);
}
if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
@@ -180,7 +220,6 @@ void WatchFaceDigital::Refresh() {
lv_label_set_text_fmt(
label_date, "%s %s %d %d", dateTimeController.DayOfWeekShortToString(), dateTimeController.MonthShortToString(), day, year);
}
- lv_obj_realign(label_date);
currentYear = year;
currentMonth = month;
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
index d33434c..c59b7b4 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,41 @@ 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;
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;
+ char hhmm_label_text[6] = { '?', '?', ':', '?', '?', 0 };
+ char seconds_label_text[4] = { ':', '?', '?', 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_date;
lv_obj_t* backgroundLabel;
lv_obj_t* batteryIcon;
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/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index 704711c..5ce8a8e 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -118,7 +118,9 @@ namespace Pinetime {
Pinetime::Controllers::NotificationManager& notificationManager;
Pinetime::Controllers::MotorController& motorController;
Pinetime::Drivers::Hrs3300& heartRateSensor;
+ public:
Pinetime::Drivers::Bma421& motionSensor;
+ private:
Pinetime::Controllers::Settings& settingsController;
Pinetime::Controllers::HeartRateController& heartRateController;
Pinetime::Controllers::MotionController& motionController;
generated by cgit v0.10.2 at 2026-01-10 05:48:24 (GMT)