summaryrefslogtreecommitdiff
path: root/src/DisplayApp/Screens
diff options
context:
space:
mode:
Diffstat (limited to 'src/DisplayApp/Screens')
-rw-r--r--src/DisplayApp/Screens/Clock.cpp5
-rw-r--r--src/DisplayApp/Screens/FirmwareValidation.cpp2
-rw-r--r--src/DisplayApp/Screens/Message.cpp81
-rw-r--r--src/DisplayApp/Screens/Message.h31
-rw-r--r--src/DisplayApp/Screens/Symbols.h38
-rw-r--r--src/DisplayApp/Screens/SystemInfo.cpp7
-rw-r--r--src/DisplayApp/Screens/Tile.cpp1
7 files changed, 26 insertions, 139 deletions
diff --git a/src/DisplayApp/Screens/Clock.cpp b/src/DisplayApp/Screens/Clock.cpp
index fc6441e8..06fab9aa 100644
--- a/src/DisplayApp/Screens/Clock.cpp
+++ b/src/DisplayApp/Screens/Clock.cpp
@@ -121,13 +121,12 @@ bool Clock::Refresh() {
auto hour = time.hours().count();
auto minute = time.minutes().count();
- auto second = time.seconds().count();
char minutesChar[3];
- sprintf(minutesChar, "%02d", minute);
+ sprintf(minutesChar, "%02d", static_cast<int>(minute));
char hoursChar[3];
- sprintf(hoursChar, "%02d", hour);
+ sprintf(hoursChar, "%02d", static_cast<int>(hour));
char timeStr[6];
sprintf(timeStr, "%c%c:%c%c", hoursChar[0],hoursChar[1],minutesChar[0], minutesChar[1]);
diff --git a/src/DisplayApp/Screens/FirmwareValidation.cpp b/src/DisplayApp/Screens/FirmwareValidation.cpp
index 70d32575..fb2dd956 100644
--- a/src/DisplayApp/Screens/FirmwareValidation.cpp
+++ b/src/DisplayApp/Screens/FirmwareValidation.cpp
@@ -29,7 +29,7 @@ FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp *app,
labelVersionValue = lv_label_create(lv_scr_act(), NULL);
lv_obj_align(labelVersionValue, labelVersionInfo, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
lv_label_set_recolor(labelVersionValue, true);
- sprintf(version, "%d.%d.%d", Version::Major(), Version::Minor(), Version::Patch());
+ sprintf(version, "%ld.%ld.%ld", Version::Major(), Version::Minor(), Version::Patch());
lv_label_set_text(labelVersionValue, version);
labelIsValidated = lv_label_create(lv_scr_act(), NULL);
diff --git a/src/DisplayApp/Screens/Message.cpp b/src/DisplayApp/Screens/Message.cpp
deleted file mode 100644
index b83cb751..00000000
--- a/src/DisplayApp/Screens/Message.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#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 "Message.h"
-#include <DisplayApp/DisplayApp.h>
-
-
-using namespace Pinetime::Applications::Screens;
-
-extern lv_font_t jetbrains_mono_bold_20;
-
-static void event_handler(lv_obj_t * obj, lv_event_t event) {
- Message* screen = static_cast<Message *>(obj->user_data);
- screen->OnObjectEvent(obj, event);
-}
-
-Message::Message(DisplayApp* app) : Screen(app) {
-
- backgroundLabel = lv_label_create(lv_scr_act(), NULL);
- backgroundLabel->user_data = this;
-
- lv_obj_set_click(backgroundLabel, true);
- lv_obj_set_event_cb(backgroundLabel, event_handler);
- lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
- lv_obj_set_size(backgroundLabel, 240, 240);
- lv_obj_set_pos(backgroundLabel, 0, 0);
- lv_label_set_text(backgroundLabel, "");
-
- button = lv_btn_create(lv_scr_act(), NULL);
- lv_obj_set_event_cb(button, event_handler);
- lv_obj_align(button, NULL, LV_ALIGN_CENTER, 0, -40);
- button->user_data = this;
-
- label = lv_label_create(button, NULL);
- lv_label_set_text(label, "Hello!");
-
- labelClick = lv_label_create(lv_scr_act(), NULL);
- lv_obj_align(labelClick, button, LV_ALIGN_OUT_BOTTOM_MID, 0, 30);
- lv_label_set_text(labelClick, "0");
-}
-
-Message::~Message() {
- lv_obj_clean(lv_scr_act());
-}
-
-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) {
- if(obj == backgroundLabel) {
- if(event == LV_EVENT_CLICKED) {
- app->PushMessage(DisplayApp::Messages::SwitchScreen);
- NRF_LOG_INFO("SCREEN");
- }
- return ;
- }
-
- if(event == LV_EVENT_CLICKED) {
- NRF_LOG_INFO("Clicked");
- clickCount++;
- }
- else if(event == LV_EVENT_VALUE_CHANGED) {
- 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
deleted file mode 100644
index 3ace66fe..00000000
--- a/src/DisplayApp/Screens/Message.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include "Screen.h"
-#include <bits/unique_ptr.h>
-#include <lvgl/src/lv_core/lv_style.h>
-
-namespace Pinetime {
- namespace Applications {
- namespace Screens {
- class Message : public Screen{
- public:
- explicit Message(DisplayApp* app);
- ~Message() override;
- bool Refresh() override;
- bool OnButtonPushed();
- void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
-
- private:
- lv_obj_t * label;
- lv_obj_t* backgroundLabel;
- lv_obj_t * button;
- lv_obj_t * labelClick;
-
- uint32_t clickCount = 0 ;
- uint32_t previousClickCount = 0;
- bool running = true;
- };
- }
- }
-}
diff --git a/src/DisplayApp/Screens/Symbols.h b/src/DisplayApp/Screens/Symbols.h
index 54c3f8f0..69078c8a 100644
--- a/src/DisplayApp/Screens/Symbols.h
+++ b/src/DisplayApp/Screens/Symbols.h
@@ -4,25 +4,25 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
namespace Symbols {
- static constexpr char* none = "";
- static constexpr char* batteryFull = "\xEF\x89\x80";
- static constexpr char* batteryEmpty = "\xEF\x89\x84";
- static constexpr char* batteryThreeQuarter = "\xEF\x89\x81";
- static constexpr char* batteryHalf = "\xEF\x89\x82";
- static constexpr char* batteryOneQuarter = "\xEF\x89\x83";
- static constexpr char* heartBeat = "\xEF\x88\x9E";
- static constexpr char* bluetoothFull = "\xEF\x8A\x93";
- static constexpr char* bluetooth = "\xEF\x8A\x94";
- static constexpr char* plug = "\xEF\x87\xA6";
- static constexpr char* shoe = "\xEF\x95\x8B";
- static constexpr char* clock = "\xEF\x80\x97";
- static constexpr char* info = "\xEF\x84\xA9";
- static constexpr char* list = "\xEF\x80\xBA";
- static constexpr char* sun = "\xEF\x86\x85";
- static constexpr char* check = "\xEF\x95\xA0";
- static constexpr char* music = "\xEF\x80\x81";
- static constexpr char* tachometer = "\xEF\x8F\xBD";
- static constexpr char* asterisk = "\xEF\x81\xA9";
+ static constexpr const char* none = "";
+ static constexpr const char* batteryFull = "\xEF\x89\x80";
+ static constexpr const char* batteryEmpty = "\xEF\x89\x84";
+ static constexpr const char* batteryThreeQuarter = "\xEF\x89\x81";
+ static constexpr const char* batteryHalf = "\xEF\x89\x82";
+ static constexpr const char* batteryOneQuarter = "\xEF\x89\x83";
+ static constexpr const char* heartBeat = "\xEF\x88\x9E";
+ static constexpr const char* bluetoothFull = "\xEF\x8A\x93";
+ static constexpr const char* bluetooth = "\xEF\x8A\x94";
+ static constexpr const char* plug = "\xEF\x87\xA6";
+ static constexpr const char* shoe = "\xEF\x95\x8B";
+ static constexpr const char* clock = "\xEF\x80\x97";
+ static constexpr const char* info = "\xEF\x84\xA9";
+ static constexpr const char* list = "\xEF\x80\xBA";
+ static constexpr const char* sun = "\xEF\x86\x85";
+ static constexpr const char* check = "\xEF\x95\xA0";
+ static constexpr const char* music = "\xEF\x80\x81";
+ static constexpr const char* tachometer = "\xEF\x8F\xBD";
+ static constexpr const char* asterisk = "\xEF\x81\xA9";
}
}
}
diff --git a/src/DisplayApp/Screens/SystemInfo.cpp b/src/DisplayApp/Screens/SystemInfo.cpp
index b355f419..ef55eb5f 100644
--- a/src/DisplayApp/Screens/SystemInfo.cpp
+++ b/src/DisplayApp/Screens/SystemInfo.cpp
@@ -49,6 +49,7 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen1() {
uint8_t brightness = 0;
switch(brightnessController.Level()) {
+ case Controllers::BrightnessController::Levels::Off: brightness = 0; break;
case Controllers::BrightnessController::Levels::Low: brightness = 1; break;
case Controllers::BrightnessController::Levels::Medium: brightness = 2; break;
case Controllers::BrightnessController::Levels::High: brightness = 3; break;
@@ -82,10 +83,10 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen1() {
// TODO handle more than 100 days of uptime
sprintf(t1, "Pinetime\n"
- "Version:%d.%d.%d\n"
+ "Version:%ld.%ld.%ld\n"
"Build: %s\n"
" %s\n"
- "Date: %02d/%02d/%04d\n"
+ "Date: %02d/%02hhu/%04d\n"
"Time: %02d:%02d:%02d\n"
"Uptime: %02lud %02lu:%02lu:%02lu\n"
"Battery: %d%%\n"
@@ -93,7 +94,7 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen1() {
"Last reset: %s\n",
Version::Major(), Version::Minor(), Version::Patch(),
__DATE__, __TIME__,
- dateTimeController.Day(), dateTimeController.Month(), dateTimeController.Year(),
+ dateTimeController.Day(), static_cast<uint8_t>(dateTimeController.Month()), dateTimeController.Year(),
dateTimeController.Hours(), dateTimeController.Minutes(), dateTimeController.Seconds(),
uptimeDays, uptimeHours, uptimeMinutes, uptimeSeconds,
batteryPercent, brightness, resetReason);
diff --git a/src/DisplayApp/Screens/Tile.cpp b/src/DisplayApp/Screens/Tile.cpp
index 5d4da2cf..1447d789 100644
--- a/src/DisplayApp/Screens/Tile.cpp
+++ b/src/DisplayApp/Screens/Tile.cpp
@@ -46,7 +46,6 @@ bool Tile::Refresh() {
}
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_VALUE_CHANGED) {
app->StartApp(apps[buttonId]);
running = false;
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 00:00:27 +0000