Simplified stopwatch lap buffer

Overriding the earlier laps doesn't seem like a good idea.
This commit is contained in:
Riku Isokoski 2022-07-22 11:01:47 +03:00 committed by JF
parent 1467324c50
commit 67e0cad573
2 changed files with 29 additions and 91 deletions

View File

@ -1,10 +1,6 @@
#include "displayapp/screens/StopWatch.h" #include "displayapp/screens/StopWatch.h"
#include "displayapp/screens/Screen.h"
#include "displayapp/screens/Symbols.h" #include "displayapp/screens/Symbols.h"
#include <lvgl/lvgl.h>
#include <FreeRTOS.h>
#include <task.h>
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;
@ -30,15 +26,7 @@ namespace {
} }
} }
StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask) StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask) : Screen(app), systemTask {systemTask} {
: Screen(app),
systemTask {systemTask},
currentState {States::Init},
startTime {},
oldTimeElapsed {},
currentTimeSeparated {},
lapBuffer {},
lapNr {} {
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_76); lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
@ -70,15 +58,10 @@ StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask)
lv_obj_set_state(btnStopLap, LV_STATE_DISABLED); lv_obj_set_state(btnStopLap, LV_STATE_DISABLED);
lv_obj_set_state(txtStopLap, LV_STATE_DISABLED); lv_obj_set_state(txtStopLap, LV_STATE_DISABLED);
lapOneText = lv_label_create(lv_scr_act(), nullptr); lapText = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(lapOneText, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW); lv_obj_set_style_local_text_color(lapText, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
lv_obj_align(lapOneText, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 50, 30); lv_obj_align(lapText, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 50, 30);
lv_label_set_text_static(lapOneText, ""); lv_label_set_text_static(lapText, "");
lapTwoText = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(lapTwoText, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
lv_obj_align(lapTwoText, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 50, 55);
lv_label_set_text_static(lapTwoText, "");
taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this); taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
} }
@ -98,10 +81,8 @@ void StopWatch::Reset() {
lv_label_set_text_static(time, "00:00"); lv_label_set_text_static(time, "00:00");
lv_label_set_text_static(msecTime, "00"); lv_label_set_text_static(msecTime, "00");
lv_label_set_text_static(lapOneText, ""); lv_label_set_text_static(lapText, "");
lv_label_set_text_static(lapTwoText, ""); lapsDone = 0;
lapBuffer.clearBuffer();
lapNr = 0;
lv_obj_set_state(btnStopLap, LV_STATE_DISABLED); lv_obj_set_state(btnStopLap, LV_STATE_DISABLED);
lv_obj_set_state(txtStopLap, LV_STATE_DISABLED); lv_obj_set_state(txtStopLap, LV_STATE_DISABLED);
} }
@ -121,7 +102,7 @@ void StopWatch::Start() {
void StopWatch::Pause() { void StopWatch::Pause() {
startTime = 0; startTime = 0;
// Store the current time elapsed in cache // Store the current time elapsed in cache
oldTimeElapsed += timeElapsed; oldTimeElapsed = laps[lapsDone];
currentState = States::Halted; currentState = States::Halted;
lv_label_set_text_static(txtPlayPause, Symbols::play); lv_label_set_text_static(txtPlayPause, Symbols::play);
lv_label_set_text_static(txtStopLap, Symbols::stop); lv_label_set_text_static(txtStopLap, Symbols::stop);
@ -132,9 +113,9 @@ void StopWatch::Pause() {
void StopWatch::Refresh() { void StopWatch::Refresh() {
if (currentState == States::Running) { if (currentState == States::Running) {
timeElapsed = xTaskGetTickCount() - startTime; laps[lapsDone] = oldTimeElapsed + xTaskGetTickCount() - startTime;
currentTimeSeparated = convertTicksToTimeSegments((oldTimeElapsed + timeElapsed));
TimeSeparated_t currentTimeSeparated = convertTicksToTimeSegments(laps[lapsDone]);
lv_label_set_text_fmt(time, "%02d:%02d", currentTimeSeparated.mins, currentTimeSeparated.secs); lv_label_set_text_fmt(time, "%02d:%02d", currentTimeSeparated.mins, currentTimeSeparated.secs);
lv_label_set_text_fmt(msecTime, "%02d", currentTimeSeparated.hundredths); lv_label_set_text_fmt(msecTime, "%02d", currentTimeSeparated.hundredths);
} }
@ -159,18 +140,17 @@ void StopWatch::stopLapBtnEventHandler(lv_event_t event) {
} }
// 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); lv_label_set_text(lapText, "");
lapNr++; lapsDone = std::min(lapsDone + 1, maxLapCount);
if (lapBuffer[1]) { for (int i = lapsDone - displayedLaps; i < lapsDone; i++) {
lv_label_set_text_fmt(lapOneText, if (i < 0) {
"#%2d %2d:%02d.%02d", lv_label_ins_text(lapText, LV_LABEL_POS_LAST, "\n");
(lapNr - 1), continue;
lapBuffer[1]->mins, }
lapBuffer[1]->secs, TimeSeparated_t times = convertTicksToTimeSegments(laps[i]);
lapBuffer[1]->hundredths); char buffer[16];
} sprintf(buffer, "#%2d %2d:%02d.%02d\n", i + 1, times.mins, times.secs, times.hundredths);
if (lapBuffer[0]) { lv_label_ins_text(lapText, LV_LABEL_POS_LAST, buffer);
lv_label_set_text_fmt(lapTwoText, "#%2d %2d:%02d.%02d", lapNr, lapBuffer[0]->mins, lapBuffer[0]->secs, lapBuffer[0]->hundredths);
} }
} else if (currentState == States::Halted) { } else if (currentState == States::Halted) {
Reset(); Reset();

View File

@ -1,13 +1,11 @@
#pragma once #pragma once
#include "displayapp/screens/Screen.h" #include "displayapp/screens/Screen.h"
#include "components/datetime/DateTimeController.h" #include <lvgl/lvgl.h>
#include "displayapp/LittleVgl.h"
#include <FreeRTOS.h> #include <FreeRTOS.h>
#include "portmacro_cmsis.h" #include "portmacro_cmsis.h"
#include <array>
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
namespace Pinetime::Applications::Screens { namespace Pinetime::Applications::Screens {
@ -20,46 +18,6 @@ namespace Pinetime::Applications::Screens {
int hundredths; int hundredths;
}; };
// A simple buffer to hold the latest two laps
template <int N> struct LapTextBuffer_t {
LapTextBuffer_t() : buffer {}, currentSize {}, capacity {N}, head {-1} {
}
void addLaps(const TimeSeparated_t& timeVal) {
head++;
head %= capacity;
buffer[head] = timeVal;
if (currentSize < capacity) {
currentSize++;
}
}
void clearBuffer() {
buffer = {};
currentSize = 0;
head = -1;
}
TimeSeparated_t* operator[](std::size_t idx) {
// Sanity check for out-of-bounds
if (idx >= 0 && idx < capacity) {
if (idx < currentSize) {
// This transformation is to ensure that head is always pointing to index 0.
const auto transformed_idx = (head - idx) % capacity;
return (&buffer[transformed_idx]);
}
}
return nullptr;
}
private:
std::array<TimeSeparated_t, N> buffer;
uint8_t currentSize;
uint8_t capacity;
int8_t head;
};
class StopWatch : public Screen { class StopWatch : public Screen {
public: public:
StopWatch(DisplayApp* app, System::SystemTask& systemTask); StopWatch(DisplayApp* app, System::SystemTask& systemTask);
@ -76,15 +34,15 @@ namespace Pinetime::Applications::Screens {
private: private:
Pinetime::System::SystemTask& systemTask; Pinetime::System::SystemTask& systemTask;
TickType_t timeElapsed; States currentState = States::Init;
States currentState;
TickType_t startTime; TickType_t startTime;
TickType_t oldTimeElapsed; TickType_t oldTimeElapsed = 0;
TimeSeparated_t currentTimeSeparated; // Holds Mins, Secs, millisecs static constexpr int maxLapCount = 20;
LapTextBuffer_t<2> lapBuffer; TickType_t laps[maxLapCount + 1];
int lapNr = 0; static constexpr int displayedLaps = 2;
int lapsDone = 0;
lv_obj_t *time, *msecTime, *btnPlayPause, *btnStopLap, *txtPlayPause, *txtStopLap; lv_obj_t *time, *msecTime, *btnPlayPause, *btnStopLap, *txtPlayPause, *txtStopLap;
lv_obj_t *lapOneText, *lapTwoText; lv_obj_t* lapText;
lv_task_t* taskRefresh; lv_task_t* taskRefresh;
}; };