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

Added play/pause button.

Browse Source
This commit is contained in:
panky-codes 2021-03-11 23:41:24 +01:00
parent ce91e1a7a6
commit 70373e7345
2 changed files with 55 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/displayapp/screens/StopWatch.cpp
View File

@ -1,6 +1,7 @@
#include "StopWatch.h" #include "StopWatch.h"
#include "Screen.h" #include "Screen.h"
#include "Symbols.h"
#include "lvgl/lvgl.h" #include "lvgl/lvgl.h"
#include "projdefs.h" #include "projdefs.h"
#include "FreeRTOSConfig.h" #include "FreeRTOSConfig.h"
@ -8,6 +9,8 @@
#include <tuple> #include <tuple>
using namespace Pinetime::Applications::Screens;
// Anonymous namespace for local functions // Anonymous namespace for local functions
namespace { namespace {
std::tuple<int, int, int> convertTicksToTimeSegments(const TickType_t timeElapsed) { std::tuple<int, int, int> convertTicksToTimeSegments(const TickType_t timeElapsed) {
@ -31,19 +34,30 @@ namespace {
return delta; return delta;
} }
} }
using namespace Pinetime::Applications::Screens;
static void play_pause_event_handler(lv_obj_t* obj, lv_event_t event) {
StopWatch* stopWatch = static_cast<StopWatch*>(obj->user_data);
stopWatch->playPauseBtnEventHandler(event);
}
StopWatch::StopWatch(DisplayApp* app, const Pinetime::Controllers::DateTime& dateTime) StopWatch::StopWatch(DisplayApp* app, const Pinetime::Controllers::DateTime& dateTime)
: Screen(app), dateTime {dateTime}, running {true}, currentState {States::INIT}, currentEvent {Events::PLAY}, startTime {}, : Screen(app), dateTime {dateTime}, running {true}, currentState {States::INIT}, currentEvent {Events::STOP}, startTime {},
timeElapsed {} { oldTimeElapsed {} {
time = lv_label_create(lv_scr_act(), nullptr); time = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_extrabold_compressed); lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_extrabold_compressed);
lv_obj_align(time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 0); lv_obj_align(time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -50);
msecTime = lv_label_create(lv_scr_act(), nullptr); msecTime = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(msecTime, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20); lv_obj_set_style_local_text_font(msecTime, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
lv_obj_align(msecTime, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 115, 60); lv_obj_align(msecTime, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 113, 0);
btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
btnPlayPause->user_data = this;
lv_obj_set_event_cb(btnPlayPause, play_pause_event_handler);
lv_obj_align(btnPlayPause, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);
txtPlayPause = lv_label_create(btnPlayPause, nullptr);
lv_label_set_text(txtPlayPause, Symbols::play);
} }
StopWatch::~StopWatch() { StopWatch::~StopWatch() {
@ -66,14 +80,30 @@ bool StopWatch::Refresh() {
break; break;
} }
case States::RUNNING: { case States::RUNNING: {
auto timeElapsed = calculateDelta(startTime, xTaskGetTickCount()); lv_label_set_text(txtPlayPause, Symbols::pause);
auto timeSeparated = convertTicksToTimeSegments(timeElapsed);
const auto timeElapsed = calculateDelta(startTime, xTaskGetTickCount());
const auto timeSeparated = convertTicksToTimeSegments((oldTimeElapsed + timeElapsed));
lv_label_set_text_fmt(time, "%02d:%02d", std::get<0>(timeSeparated), std::get<1>(timeSeparated)); lv_label_set_text_fmt(time, "%02d:%02d", std::get<0>(timeSeparated), std::get<1>(timeSeparated));
lv_label_set_text_fmt(msecTime, "%02d", std::get<2>(timeSeparated)); lv_label_set_text_fmt(msecTime, "%02d", std::get<2>(timeSeparated));
if (currentEvent == Events::PAUSE) {
// Reset the start time
startTime = 0;
// Store the current time elapsed in cache
oldTimeElapsed += timeElapsed;
currentState = States::HALTED;
}
break; break;
} }
case States::HALTED: { case States::HALTED: {
lv_label_set_text(txtPlayPause, Symbols::play);
if (currentEvent == Events::PLAY) {
startTime = xTaskGetTickCount();
currentState = States::RUNNING;
}
break; break;
} }
} }
@ -86,5 +116,19 @@ bool StopWatch::OnButtonPushed() {
} }
bool StopWatch::OnTouchEvent(uint16_t x, uint16_t y) { bool StopWatch::OnTouchEvent(uint16_t x, uint16_t y) {
if (y < 60) {
playPauseBtnEventHandler(LV_EVENT_CLICKED);
}
return true; return true;
}
void StopWatch::playPauseBtnEventHandler(lv_event_t event) {
if (event == LV_EVENT_CLICKED) {
if (currentState == States::INIT) {
currentEvent = Events::PLAY;
} else {
// Simple Toggle for play/pause
currentEvent = (currentEvent == Events::PLAY ? Events::PAUSE : Events::PLAY);
}
}
} }

6
src/displayapp/screens/StopWatch.h
View File

@ -20,6 +20,8 @@ namespace Pinetime::Applications::Screens {
bool Refresh() override; bool Refresh() override;
bool OnButtonPushed() override; bool OnButtonPushed() override;
bool OnTouchEvent(uint16_t x, uint16_t y) override; bool OnTouchEvent(uint16_t x, uint16_t y) override;
void playPauseBtnEventHandler(lv_event_t event);
private: private:
const Pinetime::Controllers::DateTime& dateTime; const Pinetime::Controllers::DateTime& dateTime;
@ -27,7 +29,7 @@ namespace Pinetime::Applications::Screens {
States currentState; States currentState;
Events currentEvent; Events currentEvent;
TickType_t startTime; TickType_t startTime;
TickType_t timeElapsed; TickType_t oldTimeElapsed;
lv_obj_t *time, *msecTime; lv_obj_t *time, *msecTime, *btnPlayPause, *btnStop, *txtPlayPause, *txtStop;
}; };
} }