Reworked based on PR comments.
This commit is contained in:
parent
abc30028a2
commit
754ac23304
4 changed files with 56 additions and 38 deletions
19
.vscode/settings.json
vendored
Normal file
19
.vscode/settings.json
vendored
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"cmake.configureArgs": [
|
||||||
|
"-DARM_NONE_EABI_TOOLCHAIN_PATH=/home/panky92/embedded/gcc-arm-none-eabi-9-2020-q2-update",
|
||||||
|
"-DNRF5_SDK_PATH=/home/panky92/embedded/nRF5_sdk",
|
||||||
|
"-DUSE_OPENOCD=1"
|
||||||
|
],
|
||||||
|
"cmake.buildTask": true,
|
||||||
|
"files.associations": {
|
||||||
|
"streambuf": "cpp",
|
||||||
|
"chrono": "cpp",
|
||||||
|
"tuple": "cpp",
|
||||||
|
"functional": "cpp",
|
||||||
|
"*.tcc": "cpp",
|
||||||
|
"string": "cpp",
|
||||||
|
"fstream": "cpp",
|
||||||
|
"iosfwd": "cpp",
|
||||||
|
"nrf_rtc.h": "c"
|
||||||
|
}
|
||||||
|
}
|
|
@ -57,11 +57,10 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
|
||||||
std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
|
std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
|
||||||
std::array<Screens::Tile::Applications, 6> applications {
|
std::array<Screens::Tile::Applications, 6> applications {
|
||||||
{{Symbols::map, Apps::Navigation},
|
{{Symbols::map, Apps::Navigation},
|
||||||
{Symbols::asterisk, Apps::Meter},
|
{Symbols::stopWatch, Apps::StopWatch},
|
||||||
{Symbols::paintbrush, Apps::Paint},
|
{Symbols::paintbrush, Apps::Paint},
|
||||||
{Symbols::info, Apps::Notifications},
|
{Symbols::info, Apps::Notifications},
|
||||||
//TODO: Need to find the right place based on comments from JF
|
{Symbols::paddle, Apps::Paddle},
|
||||||
{Symbols::stopWatch, Apps::StopWatch},
|
|
||||||
{"2", Apps::Twos}
|
{"2", Apps::Twos}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -46,7 +46,7 @@ static void stop_lap_event_handler(lv_obj_t* obj, lv_event_t event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
StopWatch::StopWatch(DisplayApp* app)
|
StopWatch::StopWatch(DisplayApp* app)
|
||||||
: Screen(app), running {true}, currentState {States::INIT}, currentEvent {Events::STOP}, startTime {}, oldTimeElapsed {},
|
: Screen(app), running {true}, currentState {States::Init}, currentEvent {Events::Stop}, startTime {}, oldTimeElapsed {},
|
||||||
currentTimeSeparated {}, lapBuffer {}, lapNr {}, lapPressed {false} {
|
currentTimeSeparated {}, lapBuffer {}, lapNr {}, lapPressed {false} {
|
||||||
|
|
||||||
time = lv_label_create(lv_scr_act(), nullptr);
|
time = lv_label_create(lv_scr_act(), nullptr);
|
||||||
|
@ -87,9 +87,9 @@ StopWatch::~StopWatch() {
|
||||||
|
|
||||||
bool StopWatch::Refresh() {
|
bool StopWatch::Refresh() {
|
||||||
// @startuml CHIP8_state
|
// @startuml CHIP8_state
|
||||||
// State "INIT" as init
|
// State "Init" as init
|
||||||
// State "RUNNING" as run
|
// State "Running" as run
|
||||||
// State "HALTED" as halt
|
// State "Halted" as halt
|
||||||
|
|
||||||
// [*] --> init
|
// [*] --> init
|
||||||
// init -> run : press play
|
// init -> run : press play
|
||||||
|
@ -102,7 +102,7 @@ bool StopWatch::Refresh() {
|
||||||
switch (currentState) {
|
switch (currentState) {
|
||||||
// Init state when an user first opens the app
|
// Init state when an user first opens the app
|
||||||
// and when a stop/reset button is pressed
|
// and when a stop/reset button is pressed
|
||||||
case States::INIT: {
|
case States::Init: {
|
||||||
if (btnStopLap) {
|
if (btnStopLap) {
|
||||||
lv_obj_del(btnStopLap);
|
lv_obj_del(btnStopLap);
|
||||||
}
|
}
|
||||||
|
@ -115,7 +115,7 @@ bool StopWatch::Refresh() {
|
||||||
lapBuffer.clearBuffer();
|
lapBuffer.clearBuffer();
|
||||||
lapNr = 0;
|
lapNr = 0;
|
||||||
|
|
||||||
if (currentEvent == Events::PLAY) {
|
if (currentEvent == Events::Play) {
|
||||||
btnStopLap = lv_btn_create(lv_scr_act(), nullptr);
|
btnStopLap = lv_btn_create(lv_scr_act(), nullptr);
|
||||||
btnStopLap->user_data = this;
|
btnStopLap->user_data = this;
|
||||||
lv_obj_set_event_cb(btnStopLap, stop_lap_event_handler);
|
lv_obj_set_event_cb(btnStopLap, stop_lap_event_handler);
|
||||||
|
@ -125,11 +125,11 @@ bool StopWatch::Refresh() {
|
||||||
lv_label_set_text(txtStopLap, Symbols::lapsFlag);
|
lv_label_set_text(txtStopLap, Symbols::lapsFlag);
|
||||||
|
|
||||||
startTime = xTaskGetTickCount();
|
startTime = xTaskGetTickCount();
|
||||||
currentState = States::RUNNING;
|
currentState = States::Running;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case States::RUNNING: {
|
case States::Running: {
|
||||||
lv_label_set_text(txtPlayPause, Symbols::pause);
|
lv_label_set_text(txtPlayPause, Symbols::pause);
|
||||||
lv_label_set_text(txtStopLap, Symbols::lapsFlag);
|
lv_label_set_text(txtStopLap, Symbols::lapsFlag);
|
||||||
|
|
||||||
|
@ -150,25 +150,25 @@ bool StopWatch::Refresh() {
|
||||||
lapPressed = false;
|
lapPressed = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentEvent == Events::PAUSE) {
|
if (currentEvent == Events::Pause) {
|
||||||
// Reset the start time
|
// Reset the start time
|
||||||
startTime = 0;
|
startTime = 0;
|
||||||
// Store the current time elapsed in cache
|
// Store the current time elapsed in cache
|
||||||
oldTimeElapsed += timeElapsed;
|
oldTimeElapsed += timeElapsed;
|
||||||
currentState = States::HALTED;
|
currentState = States::Halted;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case States::HALTED: {
|
case States::Halted: {
|
||||||
lv_label_set_text(txtPlayPause, Symbols::play);
|
lv_label_set_text(txtPlayPause, Symbols::play);
|
||||||
lv_label_set_text(txtStopLap, Symbols::stop);
|
lv_label_set_text(txtStopLap, Symbols::stop);
|
||||||
|
|
||||||
if (currentEvent == Events::PLAY) {
|
if (currentEvent == Events::Play) {
|
||||||
startTime = xTaskGetTickCount();
|
startTime = xTaskGetTickCount();
|
||||||
currentState = States::RUNNING;
|
currentState = States::Running;
|
||||||
}
|
}
|
||||||
if (currentEvent == Events::STOP) {
|
if (currentEvent == Events::Stop) {
|
||||||
currentState = States::INIT;
|
currentState = States::Init;
|
||||||
oldTimeElapsed = 0;
|
oldTimeElapsed = 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -184,11 +184,11 @@ bool StopWatch::OnButtonPushed() {
|
||||||
|
|
||||||
void StopWatch::playPauseBtnEventHandler(lv_event_t event) {
|
void StopWatch::playPauseBtnEventHandler(lv_event_t event) {
|
||||||
if (event == LV_EVENT_CLICKED) {
|
if (event == LV_EVENT_CLICKED) {
|
||||||
if (currentState == States::INIT) {
|
if (currentState == States::Init) {
|
||||||
currentEvent = Events::PLAY;
|
currentEvent = Events::Play;
|
||||||
} else {
|
} else {
|
||||||
// Simple Toggle for play/pause
|
// Simple Toggle for play/pause
|
||||||
currentEvent = (currentEvent == Events::PLAY ? Events::PAUSE : Events::PLAY);
|
currentEvent = (currentEvent == Events::Play ? Events::Pause : Events::Play);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -196,13 +196,13 @@ void StopWatch::playPauseBtnEventHandler(lv_event_t event) {
|
||||||
void StopWatch::stopLapBtnEventHandler(lv_event_t event) {
|
void StopWatch::stopLapBtnEventHandler(lv_event_t event) {
|
||||||
if (event == LV_EVENT_CLICKED) {
|
if (event == LV_EVENT_CLICKED) {
|
||||||
// If running, then this button is used to save laps
|
// If running, then this button is used to save laps
|
||||||
if (currentState == States::RUNNING) {
|
if (currentState == States::Running) {
|
||||||
lapBuffer.addLaps(currentTimeSeparated);
|
lapBuffer.addLaps(currentTimeSeparated);
|
||||||
lapNr++;
|
lapNr++;
|
||||||
lapPressed = true;
|
lapPressed = true;
|
||||||
|
|
||||||
} else if (currentState == States::HALTED) {
|
} else if (currentState == States::Halted) {
|
||||||
currentEvent = Events::STOP;
|
currentEvent = Events::Stop;
|
||||||
} else {
|
} else {
|
||||||
// Not possible to reach here. Do nothing.
|
// Not possible to reach here. Do nothing.
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,9 +11,9 @@
|
||||||
|
|
||||||
namespace Pinetime::Applications::Screens {
|
namespace Pinetime::Applications::Screens {
|
||||||
|
|
||||||
enum class States { INIT, RUNNING, HALTED };
|
enum class States { Init, Running, Halted };
|
||||||
|
|
||||||
enum class Events { PLAY, PAUSE, STOP };
|
enum class Events { Play, Pause, Stop };
|
||||||
|
|
||||||
struct TimeSeparated_t {
|
struct TimeSeparated_t {
|
||||||
int mins;
|
int mins;
|
||||||
|
@ -23,40 +23,40 @@ namespace Pinetime::Applications::Screens {
|
||||||
|
|
||||||
// A simple buffer to hold the latest two laps
|
// A simple buffer to hold the latest two laps
|
||||||
template <int N> struct LapTextBuffer_t {
|
template <int N> struct LapTextBuffer_t {
|
||||||
LapTextBuffer_t() : _arr {}, currentSz {}, capacity {N}, head {-1} {
|
LapTextBuffer_t() : buffer {}, currentSize {}, capacity {N}, head {-1} {
|
||||||
}
|
}
|
||||||
|
|
||||||
void addLaps(const TimeSeparated_t& timeVal) {
|
void addLaps(const TimeSeparated_t& timeVal) {
|
||||||
head++;
|
head++;
|
||||||
head %= capacity;
|
head %= capacity;
|
||||||
_arr[head] = timeVal;
|
buffer[head] = timeVal;
|
||||||
|
|
||||||
if (currentSz < capacity) {
|
if (currentSize < capacity) {
|
||||||
currentSz++;
|
currentSize++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void clearBuffer() {
|
void clearBuffer() {
|
||||||
_arr = {};
|
buffer = {};
|
||||||
currentSz = 0;
|
currentSize = 0;
|
||||||
head = -1;
|
head = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
TimeSeparated_t* operator[](std::size_t idx) {
|
TimeSeparated_t* operator[](std::size_t idx) {
|
||||||
// Sanity check for out-of-bounds
|
// Sanity check for out-of-bounds
|
||||||
if (idx >= 0 && idx < capacity) {
|
if (idx >= 0 && idx < capacity) {
|
||||||
if (idx < currentSz) {
|
if (idx < currentSize) {
|
||||||
// This transformation is to ensure that head is always pointing to index 0.
|
// This transformation is to ensure that head is always pointing to index 0.
|
||||||
const auto transformed_idx = (head - idx) % capacity;
|
const auto transformed_idx = (head - idx) % capacity;
|
||||||
return (&_arr[transformed_idx]);
|
return (&buffer[transformed_idx]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::array<TimeSeparated_t, N> _arr;
|
std::array<TimeSeparated_t, N> buffer;
|
||||||
uint8_t currentSz;
|
uint8_t currentSize;
|
||||||
uint8_t capacity;
|
uint8_t capacity;
|
||||||
int8_t head;
|
int8_t head;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue