haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 15:11:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 2115213950 into 8598142c27

Browse source
This commit is contained in:
liamcharger 2024-10-09 23:48:48 +01:00 committed by GitHub
parent 8598142c27 2115213950
commit abe9a14a6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 315 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/CMakeLists.txt
View file

@ -426,6 +426,7 @@ list(APPEND SOURCE_FILES
displayapp/screens/WatchFaceTerminal.cpp
displayapp/screens/WatchFacePineTimeStyle.cpp
displayapp/screens/WatchFaceCasioStyleG7710.cpp
displayapp/screens/WatchFaceNumerals.cpp
##

1
src/displayapp/UserApps.h
View file

@ -14,6 +14,7 @@
#include "displayapp/screens/WatchFaceInfineat.h"
#include "displayapp/screens/WatchFacePineTimeStyle.h"
#include "displayapp/screens/WatchFaceTerminal.h"
#include "displayapp/screens/WatchFaceNumerals.h"
namespace Pinetime {
namespace Applications {

1
src/displayapp/apps/Apps.h.in
View file

@ -52,6 +52,7 @@ namespace Pinetime {
Terminal,
Infineat,
CasioStyleG7710,
Numerals,
};
template <Apps>

1
src/displayapp/apps/CMakeLists.txt
View file

@ -27,6 +27,7 @@ else()
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Terminal")
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Infineat")
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::CasioStyleG7710")
set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Numerals")
set(WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}" CACHE STRING "List of watch faces to build into the firmware")
endif()

155
src/displayapp/screens/WatchFaceNumerals.cpp Normal file
View file

@ -0,0 +1,155 @@
#include "displayapp/screens/WatchFaceNumerals.h"
#include <lvgl/lvgl.h>
#include <cstdio>
#include "displayapp/screens/Symbols.h"
#include "components/ble/NotificationManager.h"
#include "components/settings/Settings.h"
using namespace Pinetime::Applications::Screens;
WatchFaceNumerals::WatchFaceNumerals(Controllers::DateTime& dateTimeController,
Controllers::NotificationManager& notificationManager,
Controllers::Settings& settingsController,
Controllers::FS& filesystem)
: currentDateTime {{}},
dateTimeController {dateTimeController},
notificationManager {notificationManager},
settingsController {settingsController} {
lfs_file f = {};
if (filesystem.FileOpen(&f, "/fonts/rounded_large.bin", LFS_O_RDONLY) >= 0) {
filesystem.FileClose(&f);
font_large = lv_font_load("F:/fonts/rounded_large.bin");
}
if (filesystem.FileOpen(&f, "/fonts/rounded_small.bin", LFS_O_RDONLY) >= 0) {
filesystem.FileClose(&f);
font_small = lv_font_load("F:/fonts/rounded_small.bin");
}
notificationIcon = lv_obj_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_bg_color(notificationIcon, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_AQUA);
lv_obj_set_style_local_radius(notificationIcon, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
lv_obj_set_size(notificationIcon, 16, 16);
lv_obj_align(notificationIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 4, -76);
lv_obj_set_hidden(notificationIcon, true);
labelTimeHour = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(labelTimeHour, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_large);
lv_obj_set_style_local_text_color(labelTimeHour, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
lv_obj_align(labelTimeHour, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, -160, -125);
labelTimeMinute = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(labelTimeMinute, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_large);
lv_obj_set_style_local_text_color(labelTimeMinute, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_AQUA);
lv_obj_align(labelTimeMinute, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, -160, 0);
labelTimeAMPM1 = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(labelTimeAMPM1, "");
lv_obj_set_style_local_text_font(labelTimeAMPM1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_small);
lv_obj_set_style_local_text_color(labelTimeAMPM1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
lv_obj_align(labelTimeAMPM1, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 2, -34);
labelTimeAMPM2 = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(labelTimeAMPM2, "M");
lv_obj_set_style_local_text_font(labelTimeAMPM2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_small);
lv_obj_set_style_local_text_color(labelTimeAMPM2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
lv_obj_align(labelTimeAMPM2, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
lv_label_set_text(dateDayOfWeek, "---");
lv_obj_set_style_local_text_font(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_small);
lv_obj_align(dateDayOfWeek, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 0, 0);
dateDay = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(dateDay, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
lv_label_set_text(dateDay, "--");
lv_obj_set_style_local_text_font(dateDay, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_small);
lv_obj_align(dateDay, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 0, 36);
taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
Refresh();
}
WatchFaceNumerals::~WatchFaceNumerals() {
lv_task_del(taskRefresh);
if (font_large != nullptr) {
lv_font_free(font_large);
}
if (font_small != nullptr) {
lv_font_free(font_small);
}
lv_obj_clean(lv_scr_act());
}
void WatchFaceNumerals::Refresh() {
notificationState = notificationManager.AreNewNotificationsAvailable();
if (notificationState.IsUpdated()) {
lv_obj_set_hidden(notificationIcon, !notificationState.Get());
}
currentDateTime = dateTimeController.CurrentDateTime();
if (currentDateTime.IsUpdated()) {
auto hour = dateTimeController.Hours();
auto minute = dateTimeController.Minutes();
auto year = dateTimeController.Year();
auto month = dateTimeController.Month();
auto dayOfWeek = dateTimeController.DayOfWeek();
auto day = dateTimeController.Day();
if (displayedHour != hour || displayedMinute != minute) {
displayedHour = hour;
displayedMinute = minute;
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
char ampmChar[2] = "A";
if (hour == 0) {
hour = 12;
} else if (hour == 12) {
ampmChar[0] = 'P';
} else if (hour > 12) {
hour = hour - 12;
ampmChar[0] = 'P';
}
lv_label_set_text(labelTimeAMPM1, ampmChar);
lv_label_set_text_fmt(labelTimeHour, "%02d", hour);
lv_label_set_text_fmt(labelTimeMinute, "%02d", minute);
} else {
lv_obj_set_hidden(labelTimeAMPM2, true);
lv_label_set_text_fmt(labelTimeHour, "%02d", hour);
lv_label_set_text_fmt(labelTimeMinute, "%02d", minute);
}
}
if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
lv_label_set_text_static(dateDayOfWeek, dateTimeController.DayOfWeekShortToString());
lv_label_set_text_fmt(dateDay, "%d", day);
lv_obj_realign(dateDay);
currentYear = year;
currentMonth = month;
currentDayOfWeek = dayOfWeek;
currentDay = day;
}
}
}
bool WatchFaceNumerals::IsAvailable(Pinetime::Controllers::FS& filesystem) {
lfs_file file = {};
if (filesystem.FileOpen(&file, "/fonts/rounded_small.bin", LFS_O_RDONLY) < 0) {
return false;
}
filesystem.FileClose(&file);
if (filesystem.FileOpen(&file, "/fonts/rounded_large.bin", LFS_O_RDONLY) < 0) {
return false;
}
filesystem.FileClose(&file);
return true;
}

82
src/displayapp/screens/WatchFaceNumerals.h Normal file
View file

@ -0,0 +1,82 @@
#pragma once
#include <lvgl/lvgl.h>
#include <chrono>
#include <cstdint>
#include <memory>
#include <displayapp/Controllers.h>
#include "displayapp/screens/Screen.h"
#include "components/datetime/DateTimeController.h"
#include "utility/DirtyValue.h"
#include "displayapp/apps/Apps.h"
namespace Pinetime {
namespace Controllers {
class Settings;
class NotificationManager;
}
namespace Applications {
namespace Screens {
class WatchFaceNumerals : public Screen {
public:
WatchFaceNumerals(Controllers::DateTime& dateTimeController,
Controllers::NotificationManager& notificationManager,
Controllers::Settings& settingsController,
Controllers::FS& fs);
~WatchFaceNumerals() override;
void Refresh() override;
static bool IsAvailable(Pinetime::Controllers::FS& filesystem);
private:
uint8_t displayedHour = -1;
uint8_t displayedMinute = -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;
Utility::DirtyValue<bool> notificationState {};
Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
lv_obj_t* labelTimeHour;
lv_obj_t* labelTimeMinute;
lv_obj_t* labelTimeAMPM1;
lv_obj_t* labelTimeAMPM2;
lv_obj_t* label_date;
lv_obj_t* notificationIcon;
lv_obj_t* dateDay;
lv_obj_t* dateDayOfWeek;
Controllers::DateTime& dateTimeController;
Controllers::NotificationManager& notificationManager;
Controllers::Settings& settingsController;
lv_font_t* font_large = nullptr;
lv_font_t* font_small = nullptr;
lv_task_t* taskRefresh;
};
}
template <>
struct WatchFaceTraits<WatchFace::Numerals> {
static constexpr WatchFace watchFace = WatchFace::Numerals;
static constexpr const char* name = "Numerals";
static Screens::Screen* Create(AppControllers& controllers) {
return new Screens::WatchFaceNumerals(controllers.dateTimeController,
controllers.notificationManager,
controllers.settingsController,
controllers.filesystem);
};
static bool IsAvailable(Pinetime::Controllers::FS& filesystem) {
return Screens::WatchFaceNumerals::IsAvailable(filesystem);
}
};
}
}

24
src/resources/fonts.json
View file

@ -58,5 +58,29 @@
"size": 115,
"format": "bin",
"target_path": "/fonts/"
},
"rounded_large": {
"sources": [
{
"file": "fonts/BloggerSans-Bold.ttf",
"range": "0x30-0x3a"
}
],
"bpp": 1,
"size": 150,
"format": "bin",
"target_path": "/fonts/"
},
"rounded_small": {
"sources": [
{
"file": "fonts/BloggerSans-Bold.ttf",
"range": "0x20-0x7e, 0x410-0x44f, 0xB0"
}
],
"bpp": 1,
"size": 34,
"format": "bin",
"target_path": "/fonts/"
}
}

BIN
src/resources/fonts/BloggerSans-Bold.ttf Normal file
View file

Binary file not shown.

50
src/resources/resources.json Normal file
View file

@ -0,0 +1,50 @@
{
"resources": [
{
"filename": "teko.bin",
"path": "/fonts/teko.bin"
},
{
"filename": "7segments_40.bin",
"path": "/fonts/7segments_40.bin"
},
{
"filename": "lv_font_dots_40.bin",
"path": "/fonts/lv_font_dots_40.bin"
},
{
"filename": "7segments_115.bin",
"path": "/fonts/7segments_115.bin"
},
{
"filename": "bebas.bin",
"path": "/fonts/bebas.bin"
},
{
"filename": "rounded_small.bin",
"path": "/fonts/rounded_small.bin"
},
{
"filename": "rounded_large.bin",
"path": "/fonts/rounded_large.bin"
},
{
"filename": "pine_small.bin",
"path": "/images/pine_small.bin"
},
{
"filename": "navigation1.bin",
"path": "/images/navigation1.bin"
},
{
"filename": "navigation0.bin",
"path": "/images/navigation0.bin"
}
],
"obsolete_files": [
{
"path": "/example-of-obsolete-file.bin",
"since": "1.11.0"
}
]
}