Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge next -- new watch faces before the freeze #469

Merged
merged 189 commits into from
Sep 17, 2024
Merged

Merge next -- new watch faces before the freeze #469

merged 189 commits into from
Sep 17, 2024

Conversation

matheusmoreira
Copy link
Collaborator

@matheusmoreira matheusmoreira commented Sep 8, 2024

Merging in as many new features as possible before the feature freeze for the movement 2.0 refactor. Lots of new faces!

Included

Reverted

Testing

@CarpeNoctem

Tested

  • simple_clock_face
  • world_clock_face
  • world_clock2_face
  • french_revolutionary_face
  • alarm_face
  • timer_face
  • stock_stopwatch_face
  • tachymeter_face
  • sunrise_sunset_face
    • Haven't tried preset selection
    • Location no longer getting lost as of commit be969c4
  • moon_phase_face
  • minimal_clock_face
  • close_enough_clock_face
    • Feature suggestion
      • Blink the colon when in LE mode?
  • countdown_face
  • alarm_thermometer_face
  • beeps_face
  • higher_lower_game_face
    • Tested
    • I can't really tell if the game logic is working correctly
    • But it's not causing any issues with other faces or the OS, so approved.
  • tally_face
    • Thought part of this wasn't working
      • but found that it was actually that the code didn't work the way the PR description said
      • The latter says that the presets are 0, 20, and 40
  • thermistor_readout_face
  • voltage_face
  • preferences_face
  • set_time_face
    • Default of DST=True really threw me.
      • Made me set the wrong TZ at first.
  • finetune_face
    • Have tested these for a few days now, without issue.
  • nanosec_face
    • Have tested these for a few days now, without issue.
  • LED instant duration
  • Keep light on if interacting
  • 24hr display
  • the DST functionality
    • not fully tested yet, but works so far
    • Is it intended to update the hour when changing?

Not tested

  • Deadlines face
  • Simon game face
  • Endless runner face
  • Wordle face
  • Simple calculator face
@voloved

Tested

  • Endless runner face
    • Watch freeze
      • Presumed to be caused by debouncing
        • Already reverted
  • Wordle face

Chris-E-J-Ellis and others added 30 commits July 23, 2023 15:51
You can enter and monitor up to four different deadlines by providing their respective date and time. The watch face displays the remaining time at matching granularity, ranging from years to seconds.
Uses a simplistic set of jump tables to toggle daylight savings on and off.
This illuminates the LED only for the time that the button is pressed,
and turns it off as soon as it's released, which is the behaviour of the
original watch.

I chose a led_duration of zero to represent "instant" and all bits set
to represent "no LED", which is arbitrary but seemed more sensible to
me.
This is a matter of personal preference, but "instant" is the behaviour
of the original watch, and seems like the thing more people would
expect. Feel free not to take this commit if you disagree, though.
Toggle between default behavior and leading zero with long-press of alarm
button on page with 24h setting.
* origin/main: (119 commits)
  add an openocd.cfg for openocd 0.12.0
  Fix compile errors and warnings in movement.c and shell.c
  faces/totp: avoid displaying when key is invalid
  faces/totp: fix error message not displayed bug
  faces/totp: remove dynamic memory allocation
  faces/totp: improve memory usage
  faces: restore simple_clock_face
  uf2conv: argument to `re.split` should be a rawstring
  movement: fix unintended timeout short circuiting
  movement: convert can_sleep an automatic variable
  faces/pulsometer: remember pulsometer measurement
  faces/pulsometer: remember pulsometer calibration
  faces/totp: update copyrights
  faces/totp: allow moving backwards through codes
  faces/clock: add 24h only feature
  faces/clock: update copyrights and credits
  faces/totp: delete leading underscores
  faces/totp: rename initializer macro to credential
  faces/totp: improve TOTP initializer labeling
  faces/totp: decode secrets when setting up
  ...
…ode. (#1)

* Check that color is valid

Instead of merely checking that COLOR is set, check that it is one of
RED, BLUE or GREEN

* Added ability to turn off sound and timer with modes

* Added enum for mode

---------

Co-authored-by: Wesley Ellis <[email protected]>
This makes it possible to do a bunch of things without
having to keep touching the light button.

I don't really see any downside with this. If you want
the light to go off, just stop touching buttons.
…ling (#1)

* Added subscreens to periodic table face; added title and faster scrolling

* Resized buf for element display

* Fixed scrolling to work on actual hardware

* Added delay before _loop_text at title and bugfix on elements shorter than 6 char

* Title screen displays when le_mode starts

* Added documentation on usage and removed unneeded variable
* Holding light button on a non-element screen will turn on the light.

* The alarm and led button press moves back to the currently-selected element symbol page rather than the next and previous one

* Usage update
voloved and others added 6 commits September 8, 2024 18:09
Implements automatic DST data to the sunrise/sunset presets,
making the whole system more automatic and therefore more reliable.

Reviewed-by: Matheus Afonso Martins Moreira <[email protected]>
GitHub-Pull-Request: #471
Adds the ability to tally negative counts, tally quickly by holding down
the buttons as well as the ability to enable and cycle through multiple
preset initial values for numerous contexts such as card games.

Reviewed-by: Matheus Afonso Martins Moreira <[email protected]>
GitHub-Pull-Request: #430
PR #386 did not add the C file to the makefile,
causing the build to fail at the link stage
due to the missing object file and the symbols
that were supposed to be provided by it.

Adding the file to the build fixes #472.

Reported-by: CarpeNoctem <[email protected]>
Fixed-by: CarpeNoctem <[email protected]>
Reviewed-by: Matheus Afonso Martins Moreira <[email protected]>
GitHub-Issue: #472
This commit caused state restored from backup registers
to be overwritten. It is thereby reverted until a better
solution is found or movement is refactored.

This reverts commit 524098b.

Reviewed-by: Matheus Afonso Martins Moreira <[email protected]>
References: #474
voloved and others added 3 commits September 15, 2024 19:13
The new DST changes caused problems in one specific face - world_clock2.
An incorrect variable was used due to a confusing name.
It has been revised to fix the problems that were caused.

Closes #475.

Reported-by: CarpeNoctem <[email protected]>
Fixed-by: David Volovskiy <[email protected]>
Tested-by: CarpeNoctem <[email protected]>
Tested-on-hardware-by: CarpeNoctem <[email protected]>
GitHub-Pull-Request: #470
GitHub-Issue: #475
This reverts commit a715265, reversing
changes made to 9c093f9.

Insidious issues were found in the course of long term testing
by the community, and further reviews of the code were not enough
to pinpoint the issue and fix it. So for now the appropriate action
is to revert these changes while development continues, and possibly
merge them back in once they have been stabilized.

Tested-on-hardware-by: David Volovskiy <[email protected]>
Tested-on-hardware-by: CarpeNoctem <[email protected]>
Tested-on-hardware-by: Krzysztof Gałka <@kshysztof@Discord>
@matheusmoreira matheusmoreira linked an issue Sep 16, 2024 that may be closed by this pull request
The watch was not indicating to the user that it was in 24h mode
when set to the leading zero 024h time format. This could lead
to ambiguity and confusion, so make sure to indicate 24h mode.

Closes #476.

Reported-by: CarpeNoctem <[email protected]>
GitHub-Issue: #476
This ensures that the display is always in a consistent state.

Reported-by: CarpeNoctem <[email protected]>
GitHub-Issue: #476
@matheusmoreira matheusmoreira linked an issue Sep 16, 2024 that may be closed by this pull request
There was an issue where the simple clock's display would remain in
024h mode even after switching back to 12h/24h mode because it only
took into account the leading zero bit, whose value is meaningless
unless the 24h mode bit is also set.

The issue is fixed by taking both bits into account.

Closes #476.

Reported-by: CarpeNoctem <[email protected]>
GitHub-Issue: #476
There was an issue where the clock's display would remain in 024h mode
even after switching back to 12h/24h mode because it only took into
account the leading zero bit, whose value is meaningless unless the
24h mode bit is also set.

The issue is fixed by taking both bits into account.

Closes #476.

Reported-by: CarpeNoctem <[email protected]>
GitHub-Issue: #476
The DST code has not yet been fully tested, the upcoming movement
refactor is upon us and it will integrate with the micro timezone
library anyway. Revert it so that next can be merged into main.

This reverts commit 0cc28b9, reversing
changes made to 337864e.
The DST code has not yet been fully tested, the upcoming movement
refactor is upon us and it will integrate with the micro timezone
library anyway. Revert it so that next can be merged into main.

This reverts commit ac5bf8c, reversing
changes made to 5a8a49a.
The DST code has not yet been fully tested, the upcoming movement
refactor is upon us and it will integrate with the micro timezone
library anyway. Revert it so that next can be merged into main.

This reverts commit 3c86a42, reversing
changes made to be969c4.
The DST code has not yet been fully tested, the upcoming movement
refactor is upon us and it will integrate with the micro timezone
library anyway. Revert it so that next can be merged into main.

This reverts commit 5a8a49a, reversing
changes made to bfadb81.
@matheusmoreira matheusmoreira merged commit bf4d461 into main Sep 17, 2024
4 checks passed
@matheusmoreira matheusmoreira added main This feature or pull request is present in the main branch tested-on-hw This feature or pull request has been tested on a physical watch labels Sep 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request main This feature or pull request is present in the main branch next This feature or pull request is present in the next branch tested-on-hw This feature or pull request has been tested on a physical watch watch-face Related to a new or existing watch face
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Leading-Zero 24hr Bugs world_clock2_face Broken in next branch beep_face causes build failure