summaryrefslogtreecommitdiff
path: root/src/DisplayApp/Screens
diff options
context:
space:
mode:
Diffstat (limited to 'src/DisplayApp/Screens')
-rw-r--r--src/DisplayApp/Screens/Clock.cpp24
-rw-r--r--src/DisplayApp/Screens/Clock.h24
-rw-r--r--src/DisplayApp/Screens/Message.cpp11
-rw-r--r--src/DisplayApp/Screens/Message.h9
-rw-r--r--src/DisplayApp/Screens/Screen.h6
-rw-r--r--src/DisplayApp/Screens/Tile.cpp40
-rw-r--r--src/DisplayApp/Screens/Tile.h7
7 files changed, 70 insertions, 51 deletions
diff --git a/src/DisplayApp/Screens/Clock.cpp b/src/DisplayApp/Screens/Clock.cpp
index 3b849150..f0bd8338 100644
--- a/src/DisplayApp/Screens/Clock.cpp
+++ b/src/DisplayApp/Screens/Clock.cpp
@@ -15,7 +15,11 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
screen->OnObjectEvent(obj, event);
}
-Clock::Clock(DisplayApp* app, Controllers::DateTime& dateTimeController) : Screen(app), currentDateTime{{}}, version {{}}, dateTimeController{dateTimeController} {
+Clock::Clock(DisplayApp* app,
+ Controllers::DateTime& dateTimeController,
+ Controllers::Battery& batteryController,
+ Controllers::Ble& bleController) : Screen(app), currentDateTime{{}}, version {{}},
+ dateTimeController{dateTimeController}, batteryController{batteryController}, bleController{bleController} {
displayedChar[0] = 0;
displayedChar[1] = 0;
displayedChar[2] = 0;
@@ -65,12 +69,9 @@ Clock::~Clock() {
lv_obj_clean(lv_scr_act());
}
-bool Clock::Refresh(bool fullRefresh) {
- if(fullRefresh) {
- auto currentDateTime = dateTimeController.CurrentDateTime();
- }
-
- if (fullRefresh || batteryPercentRemaining.IsUpdated()) {
+bool Clock::Refresh() {
+ batteryPercentRemaining = batteryController.PercentRemaining();
+ if (batteryPercentRemaining.IsUpdated()) {
char batteryChar[11];
auto newBatteryValue = batteryPercentRemaining.Get();
newBatteryValue = (newBatteryValue > 100) ? 100 : newBatteryValue;
@@ -80,8 +81,9 @@ bool Clock::Refresh(bool fullRefresh) {
lv_label_set_text(label_battery, batteryChar);
}
- if (fullRefresh || bleState.IsUpdated()) {
- if(bleState.Get() == BleConnectionStates::Connected) {
+ bleState = bleController.IsConnected();
+ if (bleState.IsUpdated()) {
+ if(bleState.Get() == true) {
lv_obj_set_hidden(label_ble, false);
lv_label_set_text(label_ble, "BLE");
} else {
@@ -91,7 +93,7 @@ bool Clock::Refresh(bool fullRefresh) {
currentDateTime = dateTimeController.CurrentDateTime();
- if(fullRefresh || currentDateTime.IsUpdated()) {
+ if(currentDateTime.IsUpdated()) {
auto newDateTime = currentDateTime.Get();
auto dp = date::floor<date::days>(newDateTime);
@@ -138,7 +140,7 @@ bool Clock::Refresh(bool fullRefresh) {
}
}
- if(fullRefresh || version.IsUpdated()) {
+ if(version.IsUpdated()) {
auto dummy = version.Get();
char versionStr[20];
sprintf(versionStr, "VERSION: %d.%d.%d", Version::Major(), Version::Minor(), Version::Patch());
diff --git a/src/DisplayApp/Screens/Clock.h b/src/DisplayApp/Screens/Clock.h
index a358e41b..d6e44fda 100644
--- a/src/DisplayApp/Screens/Clock.h
+++ b/src/DisplayApp/Screens/Clock.h
@@ -7,6 +7,8 @@
#include <bits/unique_ptr.h>
#include <libs/lvgl/src/lv_core/lv_style.h>
#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <Components/Battery/BatteryController.h>
+#include <Components/Ble/BleController.h>
#include "../Fonts/lcdfont14.h"
#include "../Fonts/lcdfont70.h"
#include "../../Version.h"
@@ -24,8 +26,10 @@ namespace Pinetime {
T& Get() { this->isUpdated = false; return value; }
DirtyValue& operator=(const T& other) {
- this->value = other;
- this->isUpdated = true;
+ if (this->value != other) {
+ this->value = other;
+ this->isUpdated = true;
+ }
return *this;
}
private:
@@ -34,17 +38,15 @@ namespace Pinetime {
};
class Clock : public Screen{
public:
- enum class BleConnectionStates{ NotConnected, Connected};
- Clock(DisplayApp* app, Controllers::DateTime& dateTimeController);
+ Clock(DisplayApp* app,
+ Controllers::DateTime& dateTimeController,
+ Controllers::Battery& batteryController,
+ Controllers::Ble& bleController);
~Clock() override;
- bool Refresh(bool fullRefresh) override;
+ bool Refresh() override;
bool OnButtonPushed() override;
- void SetBatteryPercentRemaining(uint8_t percent) { batteryPercentRemaining = percent; }
- void SetBleConnectionState(BleConnectionStates state) { bleState = state; }
- void SetCurrentDateTime(const std::chrono::time_point<std::chrono::system_clock, std::chrono::milliseconds>& tp) { currentDateTime = tp;}
-
void OnObjectEvent(lv_obj_t *pObj, lv_event_t i);
private:
static const char* MonthToString(Pinetime::Controllers::DateTime::Months month);
@@ -60,7 +62,7 @@ namespace Pinetime {
uint8_t currentDay = 0;
DirtyValue<uint8_t> batteryPercentRemaining {0};
- DirtyValue<BleConnectionStates> bleState {BleConnectionStates::NotConnected};
+ DirtyValue<bool> bleState {false};
DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::milliseconds>> currentDateTime;
DirtyValue<Pinetime::Version> version;
@@ -75,6 +77,8 @@ namespace Pinetime {
lv_obj_t* backgroundLabel;
Controllers::DateTime& dateTimeController;
+ Controllers::Battery& batteryController;
+ Controllers::Ble& bleController;
bool running = true;
diff --git a/src/DisplayApp/Screens/Message.cpp b/src/DisplayApp/Screens/Message.cpp
index c9e0938f..c8a4ea1f 100644
--- a/src/DisplayApp/Screens/Message.cpp
+++ b/src/DisplayApp/Screens/Message.cpp
@@ -19,7 +19,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
screen->OnObjectEvent(obj, event);
}
-Message::Message(DisplayApp* app, Pinetime::Components::Gfx &gfx) : Screen(app, gfx) {
+Message::Message(DisplayApp* app) : Screen(app) {
backgroundLabel = lv_label_create(lv_scr_act(), NULL);
backgroundLabel->user_data = this;
@@ -55,11 +55,13 @@ Message::~Message() {
lv_obj_clean(lv_scr_act());
}
-void Message::Refresh(bool fullRefresh) {
+bool Message::Refresh() {
if(previousClickCount != clickCount) {
lv_label_set_text_fmt(labelClick, "%d", clickCount);
previousClickCount = clickCount;
}
+
+ return running;
}
void Message::OnObjectEvent(lv_obj_t *obj, lv_event_t event) {
@@ -79,3 +81,8 @@ void Message::OnObjectEvent(lv_obj_t *obj, lv_event_t event) {
NRF_LOG_INFO("Toggled");
}
}
+
+bool Message::OnButtonPushed() {
+ running = false;
+ return true;
+}
diff --git a/src/DisplayApp/Screens/Message.h b/src/DisplayApp/Screens/Message.h
index 2f1da942..4e87bba4 100644
--- a/src/DisplayApp/Screens/Message.h
+++ b/src/DisplayApp/Screens/Message.h
@@ -15,15 +15,13 @@ namespace Pinetime {
namespace Screens {
class Message : public Screen{
public:
- explicit Message(DisplayApp* app, Components::Gfx& gfx);
+ explicit Message(DisplayApp* app);
~Message() override;
- void Refresh(bool fullRefresh) override;
+ bool Refresh() override;
+ bool OnButtonPushed();
void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
- void OnButtonPushed() override { nextScreen = Screen::NextScreen::Menu; }
private:
- const FONT_INFO largeFont {lCD_70ptFontInfo.height, lCD_70ptFontInfo.startChar, lCD_70ptFontInfo.endChar, lCD_70ptFontInfo.spacePixels, lCD_70ptFontInfo.charInfo, lCD_70ptFontInfo.data};
- const FONT_INFO smallFont {lCD_14ptFontInfo.height, lCD_14ptFontInfo.startChar, lCD_14ptFontInfo.endChar, lCD_14ptFontInfo.spacePixels, lCD_14ptFontInfo.charInfo, lCD_14ptFontInfo.data};
lv_style_t* labelStyle;
lv_obj_t * label;
@@ -33,6 +31,7 @@ namespace Pinetime {
uint32_t clickCount = 0 ;
uint32_t previousClickCount = 0;
+ bool running = true;
};
}
}
diff --git a/src/DisplayApp/Screens/Screen.h b/src/DisplayApp/Screens/Screen.h
index 625daada..6cbd41ad 100644
--- a/src/DisplayApp/Screens/Screen.h
+++ b/src/DisplayApp/Screens/Screen.h
@@ -1,20 +1,16 @@
#pragma once
-#include <Components/Gfx/Gfx.h>
-
namespace Pinetime {
namespace Applications {
class DisplayApp;
namespace Screens {
class Screen {
public:
- enum class NextScreen {None, Clock, Menu, App};
-
Screen(DisplayApp* app) : app{app} {}
virtual ~Screen() = default;
// Return false if the app can be closed, true if it must continue to run
- virtual bool Refresh(bool fullRefresh) = 0;
+ virtual bool Refresh() = 0;
// Return false if the button hasn't been handled by the app, true if it has been handled
virtual bool OnButtonPushed() { return false; }
diff --git a/src/DisplayApp/Screens/Tile.cpp b/src/DisplayApp/Screens/Tile.cpp
index c9e33544..6ee677dc 100644
--- a/src/DisplayApp/Screens/Tile.cpp
+++ b/src/DisplayApp/Screens/Tile.cpp
@@ -1,14 +1,8 @@
-#include <cstdio>
-#include <libs/date/includes/date/date.h>
-#include <Components/DateTime/DateTimeController.h>
-#include <Version.h>
#include <libs/lvgl/src/lv_core/lv_obj.h>
#include <libs/lvgl/src/lv_font/lv_font.h>
#include <libs/lvgl/lvgl.h>
-#include <libraries/log/nrf_log.h>
#include "Tile.h"
#include <DisplayApp/DisplayApp.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
using namespace Pinetime::Applications::Screens;
@@ -17,7 +11,9 @@ extern lv_font_t jetbrains_mono_bold_20;
static void event_handler(lv_obj_t * obj, lv_event_t event) {
Tile* screen = static_cast<Tile *>(obj->user_data);
- screen->OnObjectEvent(obj, event);
+ uint32_t* eventDataPtr = (uint32_t*) lv_event_get_data();
+ uint32_t eventData = *eventDataPtr;
+ screen->OnObjectEvent(obj, event, eventData);
}
static const char * btnm_map1[] = {"App1", "App2", "App3", "\n", "App4", "App5", "App11", ""};
@@ -104,19 +100,28 @@ Tile::~Tile() {
lv_obj_clean(lv_scr_act());
}
-bool Tile::Refresh(bool fullRefresh) {
+bool Tile::Refresh() {
return running;
}
-void Tile::OnObjectEvent(lv_obj_t *obj, lv_event_t event) {
+void Tile::OnObjectEvent(lv_obj_t *obj, lv_event_t event, uint32_t buttonId) {
auto* tile = static_cast<Tile*>(obj->user_data);
- if(event == LV_EVENT_CLICKED) {
-
- tile->StartApp();
+ if(event == LV_EVENT_VALUE_CHANGED) {
+ switch(buttonId) {
+ case 0:
+ case 1:
+ case 2:
+ tile->StartClockApp();
+ break;
+ case 3:
+ case 4:
+ case 5:
+ tile->StartTestApp();
+
+ break;
+ }
clickCount++;
}
- else if(event == LV_EVENT_VALUE_CHANGED) {
- }
}
bool Tile::OnButtonPushed() {
@@ -125,7 +130,12 @@ bool Tile::OnButtonPushed() {
return true;
}
-void Tile::StartApp() {
+void Tile::StartClockApp() {
app->StartApp(DisplayApp::Apps::Clock);
running = false;
}
+
+void Tile::StartTestApp() {
+ app->StartApp(DisplayApp::Apps::Test);
+ running = false;
+}
diff --git a/src/DisplayApp/Screens/Tile.h b/src/DisplayApp/Screens/Tile.h
index 03cfb6d2..630fc666 100644
--- a/src/DisplayApp/Screens/Tile.h
+++ b/src/DisplayApp/Screens/Tile.h
@@ -18,10 +18,10 @@ namespace Pinetime {
explicit Tile(DisplayApp* app);
~Tile() override;
- bool Refresh(bool fullRefresh) override;
+ bool Refresh() override;
bool OnButtonPushed() override;
- void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
+ void OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId);
private:
@@ -50,7 +50,8 @@ namespace Pinetime {
uint32_t clickCount = 0 ;
uint32_t previousClickCount = 0;
- void StartApp();
+ void StartClockApp();
+ void StartTestApp();
bool running = true;
};
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 20:36:38 +0000