StopWatch: add persistence #2141

codingjourney · 2024-10-20T12:05:20Z

This PR solves Issue #303 and is based on previous work by @desttinghim (PR #783 ) and @pptime02 (PR #1410 ). Well, it's actually just a re-base of #1410 onto the current main branch. I did my best not to disrupt functionality implemented on main in the past 2 years. Any feedback is appreciated.

github-actions · 2024-10-20T12:15:42Z

Build size and comparison to main:

Section	Size	Difference
text	380724B	640B
data	944B	0B
bss	22608B	64B

Run in InfiniEmu

mark9064

Haven't tested on hardware, but this is looking really nice overall. Thanks for pulling together the previous PRs :)

src/components/stopwatch/StopWatchController.cpp

src/displayapp/screens/StopWatch.cpp

src/components/stopwatch/StopWatchController.h

src/components/stopwatch/StopWatchController.cpp

src/components/stopwatch/StopWatchController.h

src/components/stopwatch/StopWatchController.cpp

src/components/stopwatch/StopWatchController.h

mark9064 · 2024-10-26T20:51:34Z

@FintasticMan Can you trigger CI?

codingjourney · 2024-10-27T08:32:42Z

Added a fix for a minor issue: after exiting StopWatch in the Paused state and then reopening it, the displayed time would shift by 4, sometimes 5 hundredths of a second. I think this is the delta between the last rendering and the moment we switch state to Paused and set timeElapsedPreviously. (The delta is consistent with the ~24 Hz refresh frequency I've observed.) The fix simply renders time once more once we are Paused.

src/displayapp/screens/StopWatch.cpp

mark9064

Looks great! Tested on hardware and works flawlessly

Thanks for sticking through the many rounds of feedback 😅

src/displayapp/screens/StopWatch.cpp

codingjourney · 2024-10-30T21:12:05Z

By the way, I've noticed this PR breaks InfiniSim. Does that have to be adapted before things get merged in InfiniTime? I don't mind looking into it, it's just that the build setup seems a bit more involved (I went with the Docker method for InfinTime and that's super smooth).

mark9064 · 2024-10-30T21:16:45Z

Yeah it's good practice to get an InfiniSim PR up and waiting if a PR here will break it (annoyingly the CI has given up again so I can't easily see). I haven't used the docker method so I can't comment on that but provided you're on Linux getting a build environment up and running shouldn't be too bad.

codingjourney · 2024-11-02T18:08:00Z

I've created PR #163 for InfiniSim. Necessary changes were trivial. Functionality in InfiniSim seems to work as intended.

mark9064 · 2024-11-02T22:47:40Z

Great :)

src/displayapp/screens/StopWatch.cpp

mark9064

Testing now, not been running long enough to see hours but looking good so far
I'm not sure how much I like the feel of the time being pushed right to the top? But that's probably just me being used to how it was before, so I'll see after living with it for a bit 👍

src/components/stopwatch/StopWatchController.h

src/displayapp/screens/StopWatch.cpp

src/components/stopwatch/StopWatchController.h

src/displayapp/screens/StopWatch.cpp

mark9064 · 2024-12-12T23:48:28Z

Looking superb. Just needs a rebase for CI to run (and the last few bits of feedback) and then it's all good from me

codingjourney · 2024-12-14T08:25:35Z

I'm not sure how much I like the feel of the time being pushed right to the top? But that's probably just me being used to how it was before, so I'll see after living with it for a bit 👍

Regarding vertical positioning of the time label, my thinking goes like this:

the top margin is about half as wide as the side margins - not good
on PineTime, the margin blends with the watch bezel so it's OK - good
there's too much empty room above the buttons when no laps are listed - not good
there's enough room to list 3 laps - good

It would be nice if the time was vertically centered between the top and the buttons and then floated upwards as laps get added to the list, eventually ending up where it is now. I don't find the slight improvement worth the effort, though.

mark9064

Will test this latest version on HW soon, good to go IMO

src/displayapp/screens/StopWatch.h

* more consistent function names * lapCapacity as constexpr * LastLap returns std::optional * simplified handling of TickType_t values * removed unused methods * minor fix in lap rendering

InfiniTime change InfiniTimeOrg/InfiniTime#2141

mark9064 reviewed Oct 20, 2024

View reviewed changes

mark9064 reviewed Oct 23, 2024

View reviewed changes

src/components/stopwatch/StopWatchController.h Outdated Show resolved Hide resolved

src/components/stopwatch/StopWatchController.h Outdated Show resolved Hide resolved

FintasticMan reviewed Oct 24, 2024

View reviewed changes

src/components/stopwatch/StopWatchController.cpp Outdated Show resolved Hide resolved

mark9064 reviewed Oct 24, 2024

View reviewed changes

src/components/stopwatch/StopWatchController.h Outdated Show resolved Hide resolved

src/components/stopwatch/StopWatchController.h Outdated Show resolved Hide resolved

src/components/stopwatch/StopWatchController.h Outdated Show resolved Hide resolved

mark9064 reviewed Oct 30, 2024

View reviewed changes

src/displayapp/screens/StopWatch.cpp Outdated Show resolved Hide resolved

src/displayapp/screens/StopWatch.cpp Outdated Show resolved Hide resolved

mark9064 mentioned this pull request Oct 30, 2024

Stopwatch resets when leaving the app. #303

Open

codingjourney force-pushed the stopwatch-persistence branch from 605cba9 to 5d97a2e Compare October 30, 2024 20:57

mark9064 approved these changes Oct 30, 2024

View reviewed changes

src/displayapp/screens/StopWatch.cpp Outdated Show resolved Hide resolved

codingjourney force-pushed the stopwatch-persistence branch from f045b67 to 0195a1c Compare November 6, 2024 03:30

mark9064 reviewed Nov 11, 2024

View reviewed changes

src/displayapp/screens/StopWatch.cpp Outdated Show resolved Hide resolved

mark9064 added this to the 1.16.0 milestone Nov 17, 2024

codingjourney force-pushed the stopwatch-persistence branch from ac6b39f to b5bef6c Compare November 18, 2024 17:30

mark9064 added enhancement Enhancement to an existing app/feature new feature This thread is about a new feature labels Nov 18, 2024

mark9064 reviewed Nov 20, 2024

View reviewed changes

src/displayapp/screens/StopWatch.cpp Outdated Show resolved Hide resolved

codingjourney force-pushed the stopwatch-persistence branch from 03859f0 to 42c5913 Compare December 7, 2024 07:34

mark9064 reviewed Dec 8, 2024

View reviewed changes

src/components/stopwatch/StopWatchController.h Outdated Show resolved Hide resolved

src/displayapp/screens/StopWatch.cpp Outdated Show resolved Hide resolved

mark9064 reviewed Dec 12, 2024

View reviewed changes

src/components/stopwatch/StopWatchController.h Outdated Show resolved Hide resolved

mark9064 reviewed Dec 12, 2024

View reviewed changes

src/displayapp/screens/StopWatch.cpp Outdated Show resolved Hide resolved

mark9064 mentioned this pull request Dec 27, 2024

Fix Stopwatch Side Button Behavior #2081

Open

1 task

mark9064 reviewed Dec 30, 2024

View reviewed changes

src/displayapp/screens/StopWatch.h Outdated Show resolved Hide resolved

codingjourney added 23 commits November 4, 2025 21:04

minor fixes:

3a772a3

* more consistent function names * lapCapacity as constexpr * LastLap returns std::optional * simplified handling of TickType_t values * removed unused methods * minor fix in lap rendering

lap storage as CircularBuffer, minor fixes

f867614

improved naming of lap-related fields and methods

ab51b9a

removed superfluous default values in controller

81e6272

render accurate time at pause

1218232

fixed issues found by the test-format CI job

767ed72

common method for entering the Paused state

1581196

added missing newline

3327140

fixed an integer overflow bug in time rendering

4f77163

upper bound for lap numbers

e265287

upper bound for elapsed time

fd2a112

fixed layout of lap data

bf85920

improved layout, improved re-alignment of time fields

5f85072

length of lap list adapting to available space

6431b40

tweaked some margins to improve aesthetics

fe88cad

fixed issues found by the test-format CI job

026be75

elapsedTimeBoundary as constexpr

9595b94

prevent unnecessary redrawing of the time label

da265da

tightened declarations of integer fields

5461ddb

lap times without leading zeroes

fdf0653

fixed issues found by the test-format CI job

d7d336e

fixed a type declaration

88ba670

fixed irregular pause mode blinking at clock wraparound

931723c

JF002 force-pushed the stopwatch-persistence branch from 45a9498 to 931723c Compare November 4, 2025 20:07

Fix formatting

8ef295d

JF002 merged commit aaf98a2 into InfiniTimeOrg:main Nov 4, 2025
6 of 7 checks passed

JF002 mentioned this pull request Nov 4, 2025

Update for InfiniTime PR #2141 (StopWatch: add persistence) InfiniTimeOrg/InfiniSim#163

Merged

NeroBurner pushed a commit to InfiniTimeOrg/InfiniSim that referenced this pull request Nov 4, 2025

Update for InfiniTime PR #2141 (StopWatch: add persistence) (#163)

cd7284f

InfiniTime change InfiniTimeOrg/InfiniTime#2141

This was referenced Nov 4, 2025

Stopwatch: add persistence #1410

Closed

Stopwatch Persistence #783

Closed

Uh oh!

StopWatch: add persistence #2141

StopWatch: add persistence #2141

Uh oh!

Conversation

codingjourney commented Oct 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Oct 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mark9064 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mark9064 commented Oct 26, 2024

Uh oh!

codingjourney commented Oct 27, 2024

Uh oh!

Uh oh!

Uh oh!

mark9064 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codingjourney commented Oct 30, 2024

Uh oh!

mark9064 commented Oct 30, 2024

Uh oh!

codingjourney commented Nov 2, 2024

Uh oh!

mark9064 commented Nov 2, 2024

Uh oh!

Uh oh!

Uh oh!

mark9064 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mark9064 commented Dec 12, 2024

Uh oh!

codingjourney commented Dec 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mark9064 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codingjourney commented Oct 20, 2024 •

edited

Loading

github-actions bot commented Oct 20, 2024 •

edited

Loading

codingjourney commented Dec 14, 2024 •

edited

Loading