Commit graph

529 commits

Author SHA1 Message Date
Jean-François Milants 87d882b151 Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime into mruss77-statusBarTimeFormat
# Conflicts:
#	src/components/datetime/DateTimeController.cpp
2022-02-13 11:23:05 +01:00
Riku Isokoski 32fe7b660c Make switch disabled state slightly dimmer 2022-02-12 18:36:11 +01:00
Riku Isokoski 76f63ed76a Fix switch default state 2022-02-12 18:36:11 +01:00
Riku Isokoski 0930a79041 Alarm: Fix missing stop button. Revert alert layout 2022-02-12 18:36:11 +01:00
Riku Isokoski a9b77ae0d4 Alarm: Change checkable button for a switch 2022-02-12 18:36:11 +01:00
Eli Weiss 2daa5dcbee Added alarm 12 hour interface 2022-01-31 20:42:48 +01:00
Eli Weiss ae0724c28c Corrected capitalization 2022-01-31 20:42:18 +01:00
Eli Weiss 02e94acf18 Corrected code formatting
Corrected formatting and removed unnecessary variable time24H
2022-01-31 20:42:18 +01:00
Eli Weiss d86f81b9ad Changed setHourLabels function to handle 24H too
Changed setHourLabels function to handle 24 hour time labeling, changed to private
2022-01-31 20:42:18 +01:00
Eli Weiss c8d998e82c Consolidated label changes, optimizations
Consolidated 12 hour label changes to function. Removed use of strings, struct.
2022-01-31 20:42:18 +01:00
Eli Weiss 5be2f57a78 Consolidated time conversion logic
Consolidated 24 hour to 12 hour time conversion logic into function, addressed formatting issues, cleaned up code.
2022-01-31 20:42:18 +01:00
Eli Weiss 1813399959 Removed redundant brackets
Also corrected orphaned bracket
2022-01-31 20:42:18 +01:00
Eli Weiss 2bc338ceed Cleaned up redundant if statements, spacing
Removed redundant if statements in hour button logic. Spacing is now in line with repo guidelines.
2022-01-31 20:42:18 +01:00
Eli Weiss 698288d822 Added 12 hour set time 2022-01-31 20:42:18 +01:00
JF f38c559089
Merge pull request #954 from NeroBurner/music_initialize_lastLength
Music: initialize totalLength to have non-random data from the start
2022-01-26 22:01:07 +01:00
JF b12603448c
Merge pull request #959 from NeroBurner/stopwatch_include_cleanup
StopWatch: cleanup unused includes and use relative to src includes
2022-01-26 22:00:33 +01:00
JF 458f5b8eb8
Merge pull request #903 from Riksu9000/improved_notif_timeout
Improved notification timeout
2022-01-26 21:38:07 +01:00
Reinhold Gschweicher 67f546fa33 StopWatch: cleanup unused includes and use relative to src includes 2022-01-26 08:31:14 +01:00
Reinhold Gschweicher 314c02194a Music: initialize totalLength to have non-random data from the start
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)
2022-01-23 23:39:38 +01:00
Riku Isokoski 6bf6bb7e2a PTS and digital watchface code cleanups 2022-01-20 16:04:26 +02:00
Riku Isokoski 97cbe34963 Update shakewake menu option 2022-01-06 15:44:39 +02:00
JF e8fc46ba20
Merge pull request #912 from SteveAmor/chimesradio
Updates radio button style for Chimes Option
2022-01-05 10:42:25 +01:00
SteveAmor b1b9937ff7 Updates radio button style 2022-01-04 21:28:37 +00:00
Jean-François Milants bef3e708f6 Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake
# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/screens/settings/Settings.cpp
2022-01-04 21:48:08 +01:00
SteveAmor 15c3807a76 Adds enum class for chimes option 2022-01-04 19:32:29 +00:00
Tim Keller e82469bffa Fix setting removing it self from wake settings when opening calibration window twice. 2022-01-04 02:06:16 +00:00
Tim Keller f86c71b2bb Made calibration window enable Accel wakeups for setting and calibration even when wake mode is inactive. 2022-01-04 02:02:01 +00:00
Tim Keller 92b1e83e3e Remove "fancy" settings display and always show ShakeWakeThresholdSetting 2022-01-04 02:01:31 +00:00
Tim Keller 98ac447bdb Fixed button color changing 2022-01-04 02:00:03 +00:00
Tim Keller b9c40100f6 Added visual aide for shake strength
Added delay to starting calibration
2022-01-04 02:00:03 +00:00
Tim Keller 8f38bd911b Raise calibration timeout to 7.5 seconds
Added button toggle state for cleaner user interaction
2022-01-04 02:00:03 +00:00
Tim Keller 5c13200238 Fix crash upon leaving app.
Code formatting
2022-01-04 02:00:03 +00:00
Tim Keller d6b22645e3 Make arc moveable, and clear previous setting on calibrate 2022-01-04 02:00:02 +00:00
Tim Keller f780ac999a Actually save the threshold
Prevent a few crashes due to an LV task being active when it shouldnt be.
2022-01-04 02:00:02 +00:00
Tim Keller d2510d7926 Better Sensitivity UI, Calibration button added 2022-01-04 02:00:02 +00:00
Tim Keller 3ebf002f9d Add start of settings app for senstivity.
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.
2022-01-04 01:59:01 +00:00
Tim Keller d270275bd2 Added Shake to wake 2022-01-04 01:57:18 +00:00
SteveAmor 7a0f72ed8b resolve conflicts 2022-01-02 22:33:23 +00:00
SteveAmor cc259b6a4a resolves conflicts 2022-01-02 22:27:43 +00:00
SteveAmor 94561b2331 resolves conflicts 2022-01-02 21:49:18 +00:00
Riku Isokoski 5e6868d9eb Improved notification timeout 2022-01-01 16:22:35 +02:00
Stephanie e0013e7304 Ran clang-format 2021-12-30 21:51:43 +01:00
Stephanie a65f173e3c Renamed confusing variables and general cleanup 2021-12-30 21:51:43 +01:00
Stephanie 7eff1dbcc6 Changed text to left pad 2021-12-30 21:51:43 +01:00
Stephanie f7d1b3f368 Moved trip meter update to MotionController and changed trip meter logic 2021-12-30 21:51:43 +01:00
Stephanie fb87fdb2d9 Changed lap counter to trip meter 2021-12-30 21:51:43 +01:00
Stephanie d034bd131e Added "lap" button to step counter 2021-12-30 21:51:43 +01:00
Riku Isokoski 54f588ce63 Add missing break 2021-12-30 21:41:17 +01:00
Riku Isokoski 86d180a855 Improve gesture consistency across the firmware 2021-12-30 21:41:17 +01:00
JF 395590d2d8
Merge pull request #718 from kieranc/pts-settings
Integrate color picker into PineTimeStyle watchface
2021-12-30 21:36:43 +01:00