aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp
Commit message (Collapse)AuthorAgeFilesLines
* Notifications: use motorController object instead of class functionReinhold Gschweicher2022-02-192-10/+19
| | | | We get the motoroController object, so store and use it.
* Improved alarm alert handlingRiku Isokoski2022-02-133-10/+41
|
* Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime ↵Jean-François Milants2022-02-132-4/+4
|\ | | | | | | | | | | | | into mruss77-statusBarTimeFormat # Conflicts: # src/components/datetime/DateTimeController.cpp
| * Status bar displays time in 12 or 24 hour format based on settingsMark Russell2021-11-102-4/+4
| |
* | Make switch disabled state slightly dimmerRiku Isokoski2022-02-121-1/+2
| |
* | Fix switch default stateRiku Isokoski2022-02-121-0/+2
| |
* | Alarm: Fix missing stop button. Revert alert layoutRiku Isokoski2022-02-121-4/+6
| |
* | Alarm: Change checkable button for a switchRiku Isokoski2022-02-124-33/+51
| |
* | Added alarm 12 hour interfaceEli Weiss2022-01-313-8/+39
| |
* | Corrected capitalizationEli Weiss2022-01-312-5/+5
| |
* | Corrected code formattingEli Weiss2022-01-312-28/+30
| | | | | | | | Corrected formatting and removed unnecessary variable time24H
* | Changed setHourLabels function to handle 24H tooEli Weiss2022-01-312-36/+28
| | | | | | | | Changed setHourLabels function to handle 24 hour time labeling, changed to private
* | Consolidated label changes, optimizationsEli Weiss2022-01-311-36/+15
| | | | | | | | Consolidated 12 hour label changes to function. Removed use of strings, struct.
* | Consolidated time conversion logicEli Weiss2022-01-312-87/+94
| | | | | | | | Consolidated 24 hour to 12 hour time conversion logic into function, addressed formatting issues, cleaned up code.
* | Removed redundant bracketsEli Weiss2022-01-311-5/+3
| | | | | | | | Also corrected orphaned bracket
* | Cleaned up redundant if statements, spacingEli Weiss2022-01-312-47/+43
| | | | | | | | Removed redundant if statements in hour button logic. Spacing is now in line with repo guidelines.
* | Added 12 hour set timeEli Weiss2022-01-313-8/+80
| |
* | Merge pull request #954 from NeroBurner/music_initialize_lastLengthJF2022-01-261-1/+1
|\ \ | | | | | | Music: initialize totalLength to have non-random data from the start
| * | Music: initialize totalLength to have non-random data from the startReinhold Gschweicher2022-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the first `Music::Refresh` call the lastLength and totalLength are not initialized. The `lastLength` value is read first from the musicService. Naturally in the first itereation that is changed and `UpdateLength()` is called. There the variable `totalLength` is used as well, but that variable isn't initialed to a sensible value yet. This leads to sometimes the `Music.h` screen segfaulting (depending on the random uninitialized data in the `lastLength` variable)
* | | Merge pull request #959 from NeroBurner/stopwatch_include_cleanupJF2022-01-262-7/+4
|\ \ \ | | | | | | | | StopWatch: cleanup unused includes and use relative to src includes
| * | | StopWatch: cleanup unused includes and use relative to src includesReinhold Gschweicher2022-01-262-7/+4
| |/ /
* | | Merge pull request #903 from Riksu9000/improved_notif_timeoutJF2022-01-263-18/+48
|\ \ \ | | | | | | | | Improved notification timeout
| * | | Improved notification timeoutRiku Isokoski2022-01-013-18/+48
| | | |
* | | | PTS and digital watchface code cleanupsRiku Isokoski2022-01-204-118/+79
| |/ / |/| |
* | | Update shakewake menu optionRiku Isokoski2022-01-061-1/+1
| | |
* | | Merge pull request #912 from SteveAmor/chimesradioJF2022-01-051-0/+4
|\ \ \ | | | | | | | | Updates radio button style for Chimes Option
| * | | Updates radio button styleSteveAmor2022-01-041-0/+4
| | | |
* | | | Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into ↵Jean-François Milants2022-01-047-11/+195
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | geekbozu-ShakeWake # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/screens/settings/Settings.cpp
| * | | Fix setting removing it self from wake settings when opening calibration ↵Tim Keller2022-01-042-3/+4
| | | | | | | | | | | | | | | | window twice.
| * | | Made calibration window enable Accel wakeups for setting and calibration ↵Tim Keller2022-01-042-1/+9
| | | | | | | | | | | | | | | | even when wake mode is inactive.
| * | | Remove "fancy" settings display and always show ShakeWakeThresholdSettingTim Keller2022-01-041-14/+10
| | | |
| * | | Fixed button color changingTim Keller2022-01-042-9/+9
| | | |
| * | | Added visual aide for shake strengthTim Keller2022-01-042-37/+60
| | | | | | | | | | | | | | | | Added delay to starting calibration
| * | | Raise calibration timeout to 7.5 secondsTim Keller2022-01-041-15/+15
| | | | | | | | | | | | | | | | Added button toggle state for cleaner user interaction
| * | | Fix crash upon leaving app.Tim Keller2022-01-042-27/+20
| | | | | | | | | | | | | | | | Code formatting
| * | | Make arc moveable, and clear previous setting on calibrateTim Keller2022-01-041-2/+5
| | | |
| * | | Actually save the thresholdTim Keller2022-01-042-7/+18
| | | | | | | | | | | | | | | | Prevent a few crashes due to an LV task being active when it shouldnt be.
| * | | Better Sensitivity UI, Calibration button addedTim Keller2022-01-043-59/+77
| | | |
| * | | Add start of settings app for senstivity.Tim Keller2022-01-045-2/+127
| | | | | | | | | | | | | | | | | | | | really just debugging. I want to make it more configurable then high med low. Position of setting needs a new location...dynamicly adding it currently at the end. Which honestly im fine with.
| * | | Added Shake to wakeTim Keller2022-01-042-1/+9
| |/ /
* | | Adds enum class for chimes optionSteveAmor2022-01-041-4/+12
| | |
* | | resolve conflictsSteveAmor2022-01-021-3/+0
| | |
* | | resolves conflictsSteveAmor2022-01-0299-741/+1104
|\| |
| * | Ran clang-formatStephanie2021-12-301-2/+1
| | |
| * | Renamed confusing variables and general cleanupStephanie2021-12-302-19/+17
| | |
| * | Changed text to left padStephanie2021-12-301-7/+9
| | |
| * | Moved trip meter update to MotionController and changed trip meter logicStephanie2021-12-301-11/+3
| | |
| * | Changed lap counter to trip meterStephanie2021-12-302-28/+38
| | |
| * | Added "lap" button to step counterStephanie2021-12-302-8/+50
| | |
| * | Add missing breakRiku Isokoski2021-12-301-0/+1
| | |