Skip to content
Open
Changes from 1 commit
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
d756e91
Started working on SleepTracker
cyberneel Oct 2, 2024
a94bb99
Began adding BPM data collection
cyberneel Oct 3, 2024
c856642
Started on data saving
cyberneel Oct 4, 2024
9b80270
Added basic data reading and clear data button
cyberneel Oct 4, 2024
44dd6ea
Added functions for sleeptracking time detection. (First night of tes…
cyberneel Oct 5, 2024
9892364
More changes tyo get the app on the watch
cyberneel Oct 5, 2024
51f2a2c
trying to decrease flash and ram size
cyberneel Oct 6, 2024
dab5b9d
Got rid of Nevigation & removed vectors and proccessing in SleepTracker
cyberneel Oct 9, 2024
26d10c3
Put Navigation back for Sim to work, decreased bpm log interval for d…
cyberneel Oct 9, 2024
36301a8
Reenable user apps
liamcharger Oct 10, 2024
b74f4c8
Rename SleepTracker update button size
liamcharger Oct 11, 2024
5000fe4
Work on new Sleep Controller
cyberneel Oct 28, 2024
0341e53
Ported Main Alarm into InfiniSleep, Need to add natural and gradual w…
cyberneel Oct 29, 2024
ed48ba5
updated log messages
cyberneel Oct 29, 2024
a3f2202
Started working on screen states
cyberneel Oct 29, 2024
6611f5d
Implemented Alarm page Function
cyberneel Oct 29, 2024
8dd6628
Started Framework for settings page
cyberneel Oct 29, 2024
c419741
Made a sleep tracker settings struct in controller and made settings …
cyberneel Oct 30, 2024
2697598
Updated toggleEventHandler to check event type
cyberneel Oct 30, 2024
7096ed9
added saving and reading of InfiniSleepSettings
cyberneel Oct 31, 2024
34edbe3
Started working on gradual wake, but not being triggered right now.
cyberneel Oct 31, 2024
598f9bf
Fixed gradual wake triggers
cyberneel Oct 31, 2024
17306ba
fixed build error for always true conditions (dataType issues)
cyberneel Oct 31, 2024
6083660
Moved gradualSteps array out of settings Struct, updated motor contro…
cyberneel Nov 2, 2024
1b00dfa
updated gradualWakeTriggered to use the defined constant
cyberneel Nov 2, 2024
b4e5eda
Switched settings to checkboxes
cyberneel Nov 2, 2024
7608723
Changed start page and made update display go to alarm if alerting
cyberneel Nov 2, 2024
7adc02e
Removed timer on alerting so alerts indeffinately, started working on…
cyberneel Nov 2, 2024
604cd66
Made tracker toggle btn
cyberneel Nov 3, 2024
74b969b
Updated rescheduling of wake alarm when system time changed
cyberneel Nov 4, 2024
0a39931
accoutning for abnormal data
cyberneel Nov 4, 2024
ddde246
removed recursive
cyberneel Nov 4, 2024
5a414ad
moved else logic
cyberneel Nov 4, 2024
3f0f843
undid stuff, works now ?? idek
cyberneel Nov 4, 2024
c6fcabd
removed swiping while alerting
cyberneel Nov 4, 2024
38fa50d
Added snoozing and made side button require 5 presses
cyberneel Nov 4, 2024
52eb558
More setup for sleep tracking
cyberneel Nov 5, 2024
bbaa0b5
Fixed bug that doesnt restore original alarm time after multiple snooze
cyberneel Nov 5, 2024
b373b36
Added basic HR periodic reading for sleep tracking and Fixed gradual …
cyberneel Nov 7, 2024
0fe62f6
Made a define statement for file name
cyberneel Nov 7, 2024
aaeeeaa
Made a new alarm for sleep in motor controller
cyberneel Nov 8, 2024
aa09ce6
Added refresh task for sleep app and added to info screen
cyberneel Nov 8, 2024
941f7a6
Updated main.cpp and added display update when sleep tracker is updated
cyberneel Nov 8, 2024
4aedcb6
Last commit didn't have the SleepTrackerUpdate message
cyberneel Nov 8, 2024
d3c7ef7
Fixed bug where snoozing and closing saved the snooze time as alarm i…
cyberneel Nov 10, 2024
712cc97
Added ability to customize gradual wake intensity at each step
cyberneel Nov 18, 2024
d463f72
Added to info page and fixded total sleep display.
cyberneel Nov 19, 2024
1ed2d53
Made info screen show info from last session after tracker stopped
cyberneel Nov 19, 2024
36f7cc6
Fixed bug with gradualWakeVibration not in sync with step when schedu…
cyberneel Nov 19, 2024
e2dbaa5
Added suggestion alarm time based on desired sleep cycles constant
cyberneel Nov 19, 2024
22eb68d
Fixed total sleep calculation and cycles display bugs
cyberneel Nov 20, 2024
63f4868
Added a timeout to pushes required to stop alarm so the presses dont …
cyberneel Nov 20, 2024
83698fb
Made the watch open to the sleep app when in an active session
cyberneel Nov 20, 2024
db9e140
Restructured pushes to stop timeout
cyberneel Nov 21, 2024
33c2b69
Added saving of prev sleep session info in case watch crashes so it c…
cyberneel Nov 21, 2024
d193cba
Reset pushes needed to stop alarm when watch sleeps
cyberneel Nov 21, 2024
5b7010e
Moved pushes count reset to system task
cyberneel Nov 22, 2024
130c126
Fixed some bugs with snooze time being set weird
cyberneel Nov 22, 2024
c7dbd42
Code optimizations & brought back more memory
cyberneel Nov 22, 2024
9efc8c7
Added buttons to set desired cycles count and duration per cycle.
cyberneel Nov 23, 2024
e94c5ac
Bug fixes
cyberneel Nov 23, 2024
3872d91
Switched vibration index variable to use the gradualStep and fixed is…
cyberneel Nov 23, 2024
22bad14
Formatted with clang-format
cyberneel Nov 24, 2024
d0b7939
Updated DisplayAppRecovery
cyberneel Nov 24, 2024
fb1c98c
Trying to fix error from Github Build Action
cyberneel Nov 24, 2024
6c98e7c
Undid some edits that were for testing
cyberneel Nov 24, 2024
217a3f2
removed commented code
cyberneel Nov 24, 2024
e26bc2f
Finally fixed errors during "make -j4 all"
cyberneel Nov 25, 2024
1d940c4
Removed sleep controller from recovery firmware
cyberneel Nov 25, 2024
cbfc620
Fixed Alert retriggering due to Display Update.
cyberneel Nov 26, 2024
bc6111b
Formatted Code
cyberneel Nov 26, 2024
d558ba6
Made suggested alarm time label more descriptive
cyberneel Nov 27, 2024
ebe0789
Made sure double clicking side button doesn't show notifications when…
cyberneel Nov 28, 2024
67b9626
Added PWM to motor controller
cyberneel Nov 28, 2024
bdff6b2
Updated Gradual Wake Buzz values to try to match SleepTk
cyberneel Nov 28, 2024
0056765
Removed periodic file logging
cyberneel Nov 29, 2024
443e515
UI Tweaks
cyberneel Nov 29, 2024
fe64c51
Removed extra data write
cyberneel Nov 29, 2024
592b6a9
Make app go to info page when alarm is turned off and also turn of tr…
cyberneel Nov 29, 2024
c363068
Added PWM to Motor Controller
cyberneel Nov 29, 2024
721cbce
Reworked UI Layout
cyberneel Nov 30, 2024
92b9d42
Added stop button to alerting UI, goal is to more it easier to unders…
cyberneel Nov 30, 2024
b155149
Forgot to hide the auto icon
cyberneel Nov 30, 2024
00fdf38
Added "Ramping Up" of Wake Alarm Buzz
cyberneel Nov 30, 2024
147828a
Changed UI of Alerting Alarm screen and added page inditors with scro…
cyberneel Nov 30, 2024
f1f7f96
Changed motor strength to use 0-255
cyberneel Nov 30, 2024
f064fcf
Ran formatter
cyberneel Nov 30, 2024
363653b
more formatting
cyberneel Nov 30, 2024
209409f
Fixed bug where snoozing causes crash due to widget not being on screen
cyberneel Nov 30, 2024
d791032
Fixed PWM controller number typo
cyberneel Dec 1, 2024
c31711c
Fixed make all error
cyberneel Dec 1, 2024
ba01b63
Fixed autosnooze crash
cyberneel Dec 1, 2024
032b348
Changed the Alerting UI and removed gradual wake while snooze
cyberneel Dec 1, 2024
8a6ede8
Formatting
cyberneel Dec 1, 2024
72971e1
Added Setting to decide motor strength
cyberneel Dec 3, 2024
fdf2c36
Added Setting to select pushes required to stop alarm
cyberneel Dec 6, 2024
eb23cee
Disabled settings while alarm is active.
cyberneel Dec 6, 2024
1566753
Added natural wake alarm to motor controller.
cyberneel Dec 6, 2024
4e47d5c
Made sure to wait for sleep app to load before doing things on wake
cyberneel Dec 7, 2024
4947c3c
Updated info page to show current wake mode instead of just gradual wake
cyberneel Dec 7, 2024
e844df4
Removed suto display refresh on alarm screen, allows for holding down…
cyberneel Dec 7, 2024
859d655
Fixed display not upadting on alerting screen.
cyberneel Dec 9, 2024
bc04168
Moved Code event code for settings page into btnHandler, better conve…
cyberneel Dec 9, 2024
15c0324
Code Clean up
cyberneel Dec 9, 2024
9a11466
Added a both option for wake mode that allows for natural wake with p…
cyberneel Dec 10, 2024
7717341
Enabling tracker sets brightness to low and resets to previous bright…
cyberneel Dec 13, 2024
614a16d
Opening app now sets lower brightness and restores when closing only …
cyberneel Dec 13, 2024
36741ef
Fixed bug where brightness isn't low when watch turning on from sleep.
cyberneel Dec 13, 2024
8bb5a56
Updated SessionData struct and removed wakelock
cyberneel Dec 16, 2024
ad269df
Added total sleep minutes to SessionData
cyberneel Dec 17, 2024
d44bf2c
Added a variable to ignore button press during certion actions.
cyberneel Dec 17, 2024
f649dad
Moved alerting logic, shouldn't change anything.
cyberneel Dec 19, 2024
ac5a84c
settings: vibrate on change of motor strength
liamcharger Dec 19, 2024
760204d
Bug fix and Changed Off to Normal.
cyberneel Dec 19, 2024
ab2c5f3
Pressing side button while alarm alerting snoozes.
cyberneel Dec 20, 2024
87b06d1
Made changes to the SnoozeAlarmTaskCallback, it uses the existing cod…
cyberneel Dec 20, 2024
9e0a623
Added startTimeStamp to SessionData
cyberneel Dec 20, 2024
eac2b89
Added more checks in code
cyberneel Dec 22, 2024
28d74b0
Showing wake mode on info screen only when alarm is active.
cyberneel Dec 22, 2024
83712f5
Increase version to 1.16
dariusarnold Mar 3, 2025
6f183aa
Format code
dariusarnold Mar 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Made sure to wait for sleep app to load before doing things on wake
I think this fixed some things
  • Loading branch information
cyberneel authored and dariusarnold committed Mar 2, 2025
commit 4e47d5c4dcea3279772c9ee4bf5ccd98d34818d0
3 changes: 3 additions & 0 deletions src/displayapp/DisplayApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,9 @@ void DisplayApp::Refresh() {
if (infiniSleepController.IsEnabled()) {
if (currentApp != Apps::Sleep) {
LoadNewScreen(Apps::Sleep, DisplayApp::FullRefreshDirections::Up);
// Wait for the sleep app to load before moving on.
while (!lv_task_handler()) {
};
}
}
}
Expand Down