josh/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'v14' of https://gitea.locker98.com/josh/InfiniTime into v14

Browse Source
This commit is contained in:
Josh 2024-05-08 17:13:26 -04:00
commit e17fe02342
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/displayapp/DisplayApp.cpp
View File

@ -322,6 +322,9 @@ void DisplayApp::Refresh() {
case TouchEvents::SwipeRight:
LoadNewScreen(Apps::QuickSettings, DisplayApp::FullRefreshDirections::RightAnim);
break;
case TouchEvents::SwipeLeft:
LoadNewScreen(Apps::Music, DisplayApp::FullRefreshDirections::LeftAnim);
break;
case TouchEvents::DoubleTap:
PushMessageToSystemTask(System::Messages::GoToSleep);
break;

2
src/displayapp/screens/FlashLight.cpp
View File

@ -47,6 +47,8 @@ FlashLight::FlashLight(System::SystemTask& systemTask, Controllers::BrightnessCo
lv_obj_set_event_cb(backgroundAction, EventHandler);
systemTask.PushMessage(Pinetime::System::Messages::DisableSleeping);
Toggle();
}
FlashLight::~FlashLight() {

11
src/displayapp/screens/WatchFaceTerminal.cpp
View File

@ -10,8 +10,11 @@
#include "components/motion/MotionController.h"
#include "components/settings/Settings.h"
using namespace Pinetime::Applications::Screens;
WatchFaceTerminal::WatchFaceTerminal(Controllers::DateTime& dateTimeController,
const Controllers::Battery& batteryController,
const Controllers::Ble& bleController,
@ -43,12 +46,14 @@ WatchFaceTerminal::WatchFaceTerminal(Controllers::DateTime& dateTimeController,
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_label_set_recolor(label_prompt_1, true);
lv_obj_align(label_prompt_1, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -80);
lv_label_set_text_static(label_prompt_1, "user@watch:~ $ now");
lv_label_set_text_static(label_prompt_1, "user@watch:~ #00ff00 $# now");
label_prompt_2 = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_recolor(label_prompt_2, true);
lv_obj_align(label_prompt_2, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 60);
lv_label_set_text_static(label_prompt_2, "user@watch:~ $");
lv_label_set_text_static(label_prompt_2, "user@watch:~ #00ff00 $#");
label_time = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_recolor(label_time, true);
@ -143,6 +148,8 @@ void WatchFaceTerminal::Refresh() {
lv_label_set_text_static(heartbeatValue, "[L_HR]#ee3311 ---#");
}
}
stepCount = motionController.NbSteps();
if (stepCount.IsUpdated()) {