69e4ab6be1
Squashed commit of the following:
commit 23ea840b059c69667c8711265cecaf992791acb6
Author: Jean-François Milants <jf@codingfield.com>
Date: Sun Feb 20 13:14:27 2022 +0100
Terminal watch face : fix includes and a few code cleaning.
commit 3c244def25e3ad8e1f56d708fb0864c122059948
Merge: 40790868
138a6552
Author: Jean-François Milants <jf@codingfield.com>
Date: Sun Feb 20 12:45:54 2022 +0100
Merge branch 'develop' of https://github.com/13werwolf13/InfiniTime into 13werwolf13-develop
commit 138a65528a86799fd5c37f065023a92f222fe044
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:13:00 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.h
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 35156166b2f7589bf005ec7c7192a4226578f6d9
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:12:43 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 757ca2dd438f1f314267a8b81a6034c576f1d6be
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:12:30 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 60b6b4e5824d04faa3efa45173358d04fa68a368
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:12:20 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 6959d8c043013550a7a3e4e6588b234d3bb942b5
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:11:46 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 4d850281bedf342d0856da5eafc22e46d0767c56
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:11:17 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit af483bee33c225fcb03432db1eb14c0453df0ae7
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:10:57 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 6bc6c1a637be4e514ecd0097d1dc9e4aacdba1db
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:10:40 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.h
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 25fdafc6aba0d9e0173103501de3802af261e2ae
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:06:10 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 12e1b0f8c0202a7f62e3e1c297af850ce3526d13
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:05:44 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit e6c0f32056e9fea878d270d761607ac5ddc263b0
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:05:22 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.h
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 342ce8cd114f4af265078bc0cfa6b2d8831706d7
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:05:06 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 265fec5eeca27fcc1152a18e4af0273bcf119c46
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:04:06 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit b4669be38be0df2b6a3505d5f7a770c71636be60
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:03:29 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 471a84390957ded2ac23ebfe1cb99408e3783b0f
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:03:10 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 6853166cf546a4ce561195eba01f1b1fd6d56420
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:02:51 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit bba34f69bfdd6b44f142c93644f71c9eda007290
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Sat Jan 22 12:32:41 2022 +0500
some fixes
commit 74eea9f5800f273249846e6e1c887d15ba6eb10b
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Sat Jan 22 12:32:17 2022 +0500
some fixes
commit 1e4a6763d73c3ba39c680ad25f90813e6a6a36d1
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Fri Jan 21 08:59:44 2022 +0500
no errors, no warnings, no work..
commit eb8bd4dc4ecbbf61f1e0f725fd2116ee25319fd6
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 20 23:50:04 2022 +0500
add ble state text output
commit fda1c088becb4a7f9ced451a0291694abe2249dc
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 20 22:25:35 2022 +0500
add ble state text output
commit 68d3d9b343c0f37830bb640fab10b186faf73067
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 20 22:22:20 2022 +0500
add ble state text output
commit 0ed45a9916787f68c0aa6bab9c97b090f2eebdd5
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Tue Jan 18 15:48:15 2022 +0500
typo fix
commit 477a3a7f27c7486be2c8f985afab1f1739608fed
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Tue Jan 18 10:36:19 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit d6849888ea5cc152f04c5bf6fe2631e66296c357
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Tue Jan 18 10:36:09 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit e2f7e318298b8a6f4d436cbbb1b92a738dacab7f
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Mon Jan 17 13:34:05 2022 +0500
typo fix
commit fc246beb01d3feac4fd0b2fc9c45b38847e1d950
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Sat Jan 15 15:26:25 2022 +0500
typo fix
commit ebbb31abf10ad9f61a8a7ecfdf29c2aaeaf33c19
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Fri Jan 14 10:08:29 2022 +0500
typo fix
commit 3afedcaa28009f59e6960730e9349097ef455ea8
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 13 12:34:39 2022 +0500
time format
commit 471a4c942f7e3cfd5c52bd61152ede770da5e026
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 13 12:27:10 2022 +0500
time format
commit d3fd348de4b4a89c216a717de84fcc923cc099fe
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 13 12:26:49 2022 +0500
time format
commit e540d103e3204649ff585742f8834d16136372d5
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 13 11:28:31 2022 +0500
add patch
commit 728830178f31f71785c49cdc6b83daea4e0a7df6
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Wed Jan 12 22:08:07 2022 +0500
add menue item
commit 4c5847669fa083f15ee3fdb404dadfdaef0f82aa
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Wed Jan 12 21:42:22 2022 +0500
typo fix
commit 79273fe24f9162aca5508f07b17896149ad19839
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Wed Jan 12 20:48:06 2022 +0500
typo fix
commit 1808a78ad94d0dfe97b6410a93ba30560de22f4b
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Wed Jan 12 20:17:15 2022 +0500
typo fix
commit 6dfa141dca176789da4e978f008eb842d9ec515a
Author: Дмитрий Марков <markov@promobit.ru>
Date: Wed Jan 12 20:12:09 2022 +0500
typo fix
commit 88f01902325505a9206ced4504aae0762042535d
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Wed Jan 12 14:50:54 2022 +0500
add terminal watchface
199 lines
8.1 KiB
C++
199 lines
8.1 KiB
C++
#include <date/date.h>
|
|
#include <lvgl/lvgl.h>
|
|
#include "displayapp/screens/WatchFaceTerminal.h"
|
|
#include "displayapp/screens/BatteryIcon.h"
|
|
#include "displayapp/screens/NotificationIcon.h"
|
|
#include "displayapp/screens/Symbols.h"
|
|
#include "components/battery/BatteryController.h"
|
|
#include "components/ble/BleController.h"
|
|
#include "components/ble/NotificationManager.h"
|
|
#include "components/heartrate/HeartRateController.h"
|
|
#include "components/motion/MotionController.h"
|
|
#include "components/settings/Settings.h"
|
|
|
|
using namespace Pinetime::Applications::Screens;
|
|
|
|
WatchFaceTerminal::WatchFaceTerminal(DisplayApp* app,
|
|
Controllers::DateTime& dateTimeController,
|
|
Controllers::Battery& batteryController,
|
|
Controllers::Ble& bleController,
|
|
Controllers::NotificationManager& notificatioManager,
|
|
Controllers::Settings& settingsController,
|
|
Controllers::HeartRateController& heartRateController,
|
|
Controllers::MotionController& motionController)
|
|
: Screen(app),
|
|
currentDateTime {{}},
|
|
dateTimeController {dateTimeController},
|
|
batteryController {batteryController},
|
|
bleController {bleController},
|
|
notificatioManager {notificatioManager},
|
|
settingsController {settingsController},
|
|
heartRateController {heartRateController},
|
|
motionController {motionController} {
|
|
settingsController.SetClockFace(3);
|
|
|
|
batteryIcon = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_label_set_text(batteryIcon, Symbols::batteryFull);
|
|
lv_obj_align(batteryIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, -5, 2);
|
|
|
|
batteryPlug = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_label_set_text(batteryPlug, Symbols::plug);
|
|
lv_obj_align(batteryPlug, batteryIcon, LV_ALIGN_OUT_LEFT_MID, -5, 0);
|
|
|
|
batteryValue = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_label_set_recolor(batteryValue, true);
|
|
lv_obj_align(batteryValue, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -20);
|
|
|
|
connectState = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_label_set_recolor(connectState, true);
|
|
lv_label_set_text(connectState, "[STAT]#387b54 Disconnected#");
|
|
lv_obj_align(connectState, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 40);
|
|
|
|
notificationIcon = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
|
|
lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 10, 0);
|
|
|
|
label_date = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_label_set_recolor(label_date, true);
|
|
lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -40);
|
|
|
|
label_prompt_1 = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_obj_align(label_prompt_1, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -80);
|
|
lv_label_set_text(label_prompt_1, "user@watch:~ $ now");
|
|
|
|
label_prompt_2 = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_obj_align(label_prompt_2, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 60);
|
|
lv_label_set_text(label_prompt_2, "user@watch:~ $");
|
|
|
|
label_time = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_label_set_recolor(label_time, true);
|
|
lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -60);
|
|
|
|
backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_obj_set_click(backgroundLabel, true);
|
|
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, "");
|
|
|
|
heartbeatValue = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_label_set_recolor(heartbeatValue, true);
|
|
lv_label_set_text(heartbeatValue, "[L_HR]#ee3311 0 bpm#");
|
|
lv_obj_align(heartbeatValue, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 20);
|
|
|
|
stepValue = lv_label_create(lv_scr_act(), nullptr);
|
|
lv_label_set_recolor(stepValue, true);
|
|
lv_label_set_text(stepValue, "[STEP]#ee3377 0 steps#");
|
|
lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 0);
|
|
|
|
taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
|
|
Refresh();
|
|
}
|
|
|
|
WatchFaceTerminal::~WatchFaceTerminal() {
|
|
lv_task_del(taskRefresh);
|
|
lv_obj_clean(lv_scr_act());
|
|
}
|
|
|
|
void WatchFaceTerminal::Refresh() {
|
|
powerPresent = batteryController.IsPowerPresent();
|
|
if (powerPresent.IsUpdated()) {
|
|
lv_label_set_text_static(batteryPlug, BatteryIcon::GetPlugIcon(powerPresent.Get()));
|
|
}
|
|
|
|
batteryPercentRemaining = batteryController.PercentRemaining();
|
|
if (batteryPercentRemaining.IsUpdated()) {
|
|
auto batteryPercent = batteryPercentRemaining.Get();
|
|
if (batteryPercent == 100) {
|
|
lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GREEN);
|
|
} else {
|
|
lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
|
|
}
|
|
lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
|
|
lv_label_set_text_fmt(batteryValue, "[BATT]#387b54 %d%\%#", batteryPercent);
|
|
}
|
|
|
|
bleState = bleController.IsConnected();
|
|
if (bleState.IsUpdated()) {
|
|
if (bleState.Get()) {
|
|
lv_label_set_text_static(connectState, "[STAT]#387b54 Connected#");
|
|
} else {
|
|
lv_label_set_text_static(connectState, "[STAT]#387b54 Disconnected#");
|
|
}
|
|
}
|
|
|
|
notificationState = notificatioManager.AreNewNotificationsAvailable();
|
|
if (notificationState.IsUpdated()) {
|
|
if (notificationState.Get()) {
|
|
lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(true));
|
|
} else {
|
|
lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
|
|
}
|
|
}
|
|
|
|
currentDateTime = dateTimeController.CurrentDateTime();
|
|
|
|
if (currentDateTime.IsUpdated()) {
|
|
auto newDateTime = currentDateTime.Get();
|
|
|
|
auto dp = date::floor<date::days>(newDateTime);
|
|
auto time = date::make_time(newDateTime - dp);
|
|
auto yearMonthDay = date::year_month_day(dp);
|
|
|
|
auto year = static_cast<int>(yearMonthDay.year());
|
|
auto month = static_cast<Pinetime::Controllers::DateTime::Months>(static_cast<unsigned>(yearMonthDay.month()));
|
|
auto day = static_cast<unsigned>(yearMonthDay.day());
|
|
auto dayOfWeek = static_cast<Pinetime::Controllers::DateTime::Days>(date::weekday(yearMonthDay).iso_encoding());
|
|
|
|
uint8_t hour = time.hours().count();
|
|
uint8_t minute = time.minutes().count();
|
|
uint8_t second = time.seconds().count();
|
|
|
|
if (displayedHour != hour || displayedMinute != minute || displayedSecond != second) {
|
|
displayedHour = hour;
|
|
displayedMinute = minute;
|
|
displayedSecond = second;
|
|
|
|
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
|
|
char ampmChar[3] = "AM";
|
|
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_fmt(label_time, "[TIME]#11cc55 %02d:%02d:%02d %s#", hour, minute, second, ampmChar);
|
|
} else {
|
|
lv_label_set_text_fmt(label_time, "[TIME]#11cc55 %02d:%02d:%02d", hour, minute, second);
|
|
}
|
|
}
|
|
|
|
if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
|
|
lv_label_set_text_fmt(label_date, "[DATE]#007fff %04d.%02d.%02d#", short(year), char(month), char(day));
|
|
|
|
currentYear = year;
|
|
currentMonth = month;
|
|
currentDayOfWeek = dayOfWeek;
|
|
currentDay = day;
|
|
}
|
|
}
|
|
|
|
heartbeat = heartRateController.HeartRate();
|
|
heartbeatRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
|
|
if (heartbeat.IsUpdated() || heartbeatRunning.IsUpdated()) {
|
|
if (heartbeatRunning.Get()) {
|
|
lv_label_set_text_fmt(heartbeatValue, "[L_HR]#ee3311 %d bpm#", heartbeat.Get());
|
|
} else {
|
|
lv_label_set_text_static(heartbeatValue, "[L_HR]#ee3311 ---#");
|
|
}
|
|
}
|
|
|
|
stepCount = motionController.NbSteps();
|
|
motionSensorOk = motionController.IsSensorOk();
|
|
if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
|
|
lv_label_set_text_fmt(stepValue, "[STEP]#ee3377 %lu steps#", stepCount.Get());
|
|
}
|
|
}
|