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

Alarm status on infineat #2068

Open
wants to merge 116 commits into
base: main
Choose a base branch
from

Conversation

Eve1374
Copy link

@Eve1374 Eve1374 commented May 29, 2024

This branch modifies WatchFaceInfineat to have the possibility via the settings to show the alarm status. The settings screen of the watchface was modified accordingly. It handles 24hrs and 12hrs time format, though the screen is a bit crowded in 12hrs format. The idea came because I find it convenient to quickly verify that I set up the alarm for the next morning without going to the menu.
Screenshots are displayed in doc/alarmStatusOnInfineat/alarmStatusOnInfineat.md

JustScott and others added 10 commits March 15, 2024 01:16
A basic calendar app that shows all the days dates in the current month along
with the correlating week days, highlights the current day, and allows swiping
left and right to increase and decrease the current month by one.

Co-authored-by: thnikk <[email protected]>
Co-authored-by: Boteium <[email protected]>
license copyright notice to the source and header calendar files.
…isable alarm status, and make it work on 12hrs format
… be displayed. TODO : clean comments related to this, and add am/pm format for alarm
Copy link

Build checks have not completed. Possible reasons for this are:

  1. The checks need to be approved by a maintainer
  2. The branch has conflicts
  3. The firmware build has failed

ecarlett added 19 commits May 29, 2024 12:58
…ce meow, changed steps to paw. Need to align everythign nicely and find where to change release number

	modified:   make_pine_mcu.sh
	modified:   src/CMakeLists.txt
	modified:   src/components/settings/Settings.h
	modified:   src/displayapp/UserApps.h
	modified:   src/displayapp/apps/Apps.h.in
	modified:   src/displayapp/apps/CMakeLists.txt
	modified:   src/displayapp/fonts/fonts.json
	modified:   src/displayapp/screens/AlarmIcon.cpp
	new file:   src/displayapp/screens/README.md
	modified:   src/displayapp/screens/Symbols.h
	modified:   src/displayapp/screens/WatchFaceInfineatColors.cpp
	modified:   src/displayapp/screens/WatchFaceInfineatColors.h
	new file:   src/displayapp/screens/WatchFaceMeow.cpp
	new file:   src/displayapp/screens/WatchFaceMeow.h
	modified:   src/displayapp/screens/settings/SettingWatchFace.h
… other watchfaces are disabled from compilation to save memory space, in case. The WatchFaceMeow, named Meow in the interface, displays the status of the alarm on the screen
 interactive rebase in progress; onto b7a353c
 Last command done (1 command done):
    pick 504f5774 copy :( files from gitlab repo
 Next commands to do (2 remaining commands):
    pick 9d04c32f recovering manually changes to original Infineat
    pick 70f9025f now I have the Meow Watchface AND the Infineat Watchface with alarm display
 You are currently rebasing branch 'my-custom-infinitime' on 'b7a353cf'.

 Changes to be committed:
	modified:   src/CMakeLists.txt
	modified:   src/displayapp/apps/Apps.h.in
	modified:   src/displayapp/apps/CMakeLists.txt
	modified:   src/displayapp/screens/Symbols.h
…isplay

 interactive rebase in progress; onto b7a353c
 Last commands done (3 commands done):
    pick 9d04c32f recovering manually changes to original Infineat
    pick 70f9025f now I have the Meow Watchface AND the Infineat Watchface with alarm display
 No commands remaining.
 You are currently rebasing branch 'my-custom-infinitime' on 'b7a353cf'.

 Changes to be committed:
	modified:   src/components/settings/Settings.h
after merge mess
Eve1374 added 6 commits July 10, 2024 11:48
	modified:   package-lock.json : ???
	modified:   package.json : ???
	modified:   src/displayapp/screens/AlarmIcon.cpp : put bell /
not bell in this file to keep infineat as in the PR I submit
	modified:   src/displayapp/screens/WatchFaceMeow.cpp : don't
refer to alarmIcon.cpp to change the icon, instead do it in this file
directly to have different icons
	modified:   src/libs/QCBOR  : reverted to match original repo's
version (git submodule status : compare commit id in this repo and a
freshly cloned repo)
	modified:   src/libs/arduinoFFT : reverted
	modified:   src/libs/littlefs : reverted
	modified:   src/displayapp/screens/Calendar.cpp
	modified:   src/libs/lv_conf.h
week start on monday with LV_CALENDAR_WEEK_STARTS_MONDAY
 Changes not staged for commit:
	modified:   src/libs/lvgl (modified content)
	modified:   src/displayapp/apps/CMakeLists.txt uncomment wome watchfaces
	modified:   src/displayapp/screens/WatchFaceCasioStyleG7710.cpp add alarm, overlaps with heartbeat
	modified:   src/displayapp/screens/WatchFaceCasioStyleG7710.h
	new file:   todo.log
 Your branch and 'github_orig/main' have diverged,
 and have 3 and 21 different commits each, respectively.
 Changes to be committed:
	modified:   README.md
@rnwgnr
Copy link

rnwgnr commented Aug 30, 2024

been using this for some days now, works fine so far 👍

@Eve1374
Copy link
Author

Eve1374 commented Sep 3, 2024

@rnwgnr

been using this for some days now, works fine so far 👍

I'm glad to read that.
I started trying to replace the alarm time displayed by the timer remaining time when a timer is ongoing, but it wasn't as straightforward as I hoped. Will work on it when I have time

Copy link
Contributor

@NeroBurner NeroBurner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please cleanup unrelated changes from this PR

.gitignore Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
src/displayapp/screens/WatchFaceInfineat.cpp Outdated Show resolved Hide resolved
src/displayapp/screens/WatchFaceInfineat.h Outdated Show resolved Hide resolved
src/displayapp/screens/WatchFaceInfineat.h Outdated Show resolved Hide resolved
@NeroBurner NeroBurner added enhancement Enhancement to an existing app/feature UI/UX User interface/User experience labels Sep 18, 2024
@Eve1374
Copy link
Author

Eve1374 commented Oct 16, 2024

Hi @NeroBurner ; thank you for your remarks.
I applied your recommended changes. I also merged the latest changes from main into this branch. In the process I had a merge incident but worked it out.
Eve

@Eve1374 Eve1374 requested a review from NeroBurner December 5, 2024 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Enhancement to an existing app/feature UI/UX User interface/User experience
Projects
None yet
Development

Successfully merging this pull request may close these issues.