CCF_100
/
InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,642 Commits
1 Branch
0 Tags
45 MiB
Commit Graph

1642 Commits (831f93cd92e91a974f03cf0a739982103246e275)
 

Author SHA1 Message Date
Eli Weiss 1813399959 Removed redundant brackets 
Also corrected orphaned bracket
 2022-01-31 20:42:18 +07: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 +07:00
Eli Weiss 698288d822 Added 12 hour set time 2022-01-31 20:42:18 +07:00
JF e73a92c29b
Merge pull request #949 from Riksu9000/fix_alarm 
Fix alarm on time change
 2022-01-26 22:03:14 +07: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 +07: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 +07:00
JF 71c895dc71
Merge pull request #531 from hatmajster/heart-rate-gain-setting 
Heart rate sensor - HRS gain changed to x8
 2022-01-26 21:44:23 +07:00
JF 9e9010c725
Merge pull request #876 from yehoshuapw/hrs-driver-changes 
Hrs driver changes
 2022-01-26 21:39:58 +07:00
JF 458f5b8eb8
Merge pull request #903 from Riksu9000/improved_notif_timeout 
Improved notification timeout
 2022-01-26 21:38:07 +07:00
JF bbb823b170
Merge pull request #939 from NeroBurner/buttonHandler_relative_include 
ButtonHandler: includes relative to src dir
 2022-01-26 21:35:03 +07:00
JF a1880ca3b8
Merge pull request #940 from NeroBurner/systemTask_queue_include 
SystemTask: add missing queue.h include for QueueHandle_t
 2022-01-26 21:34:25 +07:00
JF a354650a9c
Merge pull request #944 from NeroBurner/no_generated_files_in_source_dir 
Create Version.h in binary dir instead of src dir
 2022-01-26 21:33:57 +07:00
JF cc01d6ca17
Merge pull request #948 from Riksu9000/watchfacecleanup 
PTS and digital watchface code cleanups
 2022-01-26 21:25:59 +07:00
Reinhold Gschweicher 67f546fa33 StopWatch: cleanup unused includes and use relative to src includes 2022-01-26 08:31:14 +07:00
hatmajster b4e956227e Hrs3300: changed default gain to x8 2022-01-25 17:44:11 +07: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 +07:00
Riku Isokoski 470db4ab99 Fix alarm on time change 2022-01-22 12:47:23 +07:00
Riku Isokoski 6bf6bb7e2a PTS and digital watchface code cleanups 2022-01-20 16:04:26 +07:00
Reinhold Gschweicher 688dc2fed7 Create Version.h in binary dir instead of src dir 
Don't use source directory for generated files. Use the binary (build)
directory instead.
 2022-01-17 21:26:40 +07:00
Reinhold Gschweicher bbc5af078d SystemTask: add missing queue.h include for QueueHandle_t 2022-01-16 22:47:16 +07:00
Reinhold Gschweicher 48e9458301 ButtonHandler: includes relative to src dir 2022-01-16 20:59:49 +07:00
Jean-François Milants 26ae828e39 Set version to 1.8.0 2022-01-07 17:27:43 +07:00
JF f711f0f794
Merge pull request #916 from Riksu9000/shake_menuoption 
Update shakewake menu option
 2022-01-07 16:53:21 +07:00
Riku Isokoski 97cbe34963 Update shakewake menu option 2022-01-06 15:44:39 +07:00
JF e8fc46ba20
Merge pull request #912 from SteveAmor/chimesradio 
Updates radio button style for Chimes Option
 2022-01-05 10:42:25 +07:00
SteveAmor b1b9937ff7 Updates radio button style 2022-01-04 21:28:37 +07:00
Jean-François Milants dc8be2244c Merge branch 'geekbozu-ShakeWake' into develop 2022-01-04 21:48:20 +07: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 +07:00
JF b8b54f47a2
Merge pull request #813 from SteveAmor/chimes 
Chimes option
 2022-01-04 21:44:36 +07:00
SteveAmor 15c3807a76 Adds enum class for chimes option 2022-01-04 19:32:29 +07:00
Tim Keller e82469bffa Fix setting removing it self from wake settings when opening calibration window twice. 2022-01-04 02:06:16 +07: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 +07:00
Tim Keller 92b1e83e3e Remove "fancy" settings display and always show ShakeWakeThresholdSetting 2022-01-04 02:01:31 +07:00
Tim Keller 98ac447bdb Fixed button color changing 2022-01-04 02:00:03 +07:00
Tim Keller b9c40100f6 Added visual aide for shake strength 
Added delay to starting calibration
 2022-01-04 02:00:03 +07: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 +07:00
Tim Keller 5c13200238 Fix crash upon leaving app. 
Code formatting
 2022-01-04 02:00:03 +07:00
Tim Keller d6b22645e3 Make arc moveable, and clear previous setting on calibrate 2022-01-04 02:00:02 +07: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 +07:00
Tim Keller d2510d7926 Better Sensitivity UI, Calibration button added 2022-01-04 02:00:02 +07:00
Tim Keller 6d74820698 Add averaging to wake threshold. Makes it take more then just a "flick" to turn on 2022-01-04 01:59:01 +07: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 +07:00
Tim Keller ad42cdf120 Cleanup 2022-01-04 01:57:18 +07:00
Tim Keller d270275bd2 Added Shake to wake 2022-01-04 01:57:18 +07:00
SteveAmor 7a0f72ed8b resolve conflicts 2022-01-02 22:33:23 +07:00
SteveAmor cc259b6a4a resolves conflicts 2022-01-02 22:27:43 +07:00
SteveAmor 94561b2331 resolves conflicts 2022-01-02 21:49:18 +07:00
Riku Isokoski 5e6868d9eb Improved notification timeout 2022-01-01 16:22:35 +07:00
Stephanie e0013e7304 Ran clang-format 2021-12-30 21:51:43 +07:00
Stephanie a65f173e3c Renamed confusing variables and general cleanup 2021-12-30 21:51:43 +07:00