Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
3be4b6f
Started working on SleepTracker
cyberneel Oct 2, 2024
717db5e
Began adding BPM data collection
cyberneel Oct 3, 2024
f19114d
Started on data saving
cyberneel Oct 4, 2024
0ec217d
Added basic data reading and clear data button
cyberneel Oct 4, 2024
3936aae
Added functions for sleeptracking time detection. (First night of tes…
cyberneel Oct 5, 2024
e7160ff
More changes tyo get the app on the watch
cyberneel Oct 5, 2024
3cf9921
trying to decrease flash and ram size
cyberneel Oct 6, 2024
f1f8006
Got rid of Nevigation & removed vectors and proccessing in SleepTracker
cyberneel Oct 9, 2024
4c6b068
Put Navigation back for Sim to work, decreased bpm log interval for d…
cyberneel Oct 9, 2024
4d6d3b6
Reenable user apps
liamcharger Oct 10, 2024
419dc85
Rename SleepTracker update button size
liamcharger Oct 11, 2024
e6cfc5a
Work on new Sleep Controller
cyberneel Oct 28, 2024
0472fdd
Ported Main Alarm into InfiniSleep, Need to add natural and gradual w…
cyberneel Oct 29, 2024
0087ee4
updated log messages
cyberneel Oct 29, 2024
37adfba
Started working on screen states
cyberneel Oct 29, 2024
bd5bcaa
Implemented Alarm page Function
cyberneel Oct 29, 2024
a01a991
Started Framework for settings page
cyberneel Oct 29, 2024
f605a29
Made a sleep tracker settings struct in controller and made settings …
cyberneel Oct 30, 2024
2d27608
Updated toggleEventHandler to check event type
cyberneel Oct 30, 2024
46891cf
added saving and reading of InfiniSleepSettings
cyberneel Oct 31, 2024
9508312
Started working on gradual wake, but not being triggered right now.
cyberneel Oct 31, 2024
bd34483
Fixed gradual wake triggers
cyberneel Oct 31, 2024
e0fb70b
fixed build error for always true conditions (dataType issues)
cyberneel Oct 31, 2024
cf3a6a2
Moved gradualSteps array out of settings Struct, updated motor contro…
cyberneel Nov 2, 2024
54b8427
updated gradualWakeTriggered to use the defined constant
cyberneel Nov 2, 2024
44c6834
Switched settings to checkboxes
cyberneel Nov 2, 2024
05542f7
Changed start page and made update display go to alarm if alerting
cyberneel Nov 2, 2024
30cd1dd
Removed timer on alerting so alerts indeffinately, started working on…
cyberneel Nov 2, 2024
92e4417
Made tracker toggle btn
cyberneel Nov 3, 2024
e2515d4
Updated rescheduling of wake alarm when system time changed
cyberneel Nov 4, 2024
6b7c5ff
accoutning for abnormal data
cyberneel Nov 4, 2024
4b8c4d4
removed recursive
cyberneel Nov 4, 2024
fbe5111
moved else logic
cyberneel Nov 4, 2024
21e2deb
undid stuff, works now ?? idek
cyberneel Nov 4, 2024
d3d1df6
removed swiping while alerting
cyberneel Nov 4, 2024
ac1f961
Added snoozing and made side button require 5 presses
cyberneel Nov 4, 2024
9689389
More setup for sleep tracking
cyberneel Nov 5, 2024
38f2f96
Fixed bug that doesnt restore original alarm time after multiple snooze
cyberneel Nov 5, 2024
a8c527f
Added basic HR periodic reading for sleep tracking and Fixed gradual …
cyberneel Nov 7, 2024
ba654f5
Made a define statement for file name
cyberneel Nov 7, 2024
7f9ab41
Made a new alarm for sleep in motor controller
cyberneel Nov 8, 2024
7843dfe
Added refresh task for sleep app and added to info screen
cyberneel Nov 8, 2024
3907271
Updated main.cpp and added display update when sleep tracker is updated
cyberneel Nov 8, 2024
5a65b31
Last commit didn't have the SleepTrackerUpdate message
cyberneel Nov 8, 2024
ebd97c1
Fixed bug where snoozing and closing saved the snooze time as alarm i…
cyberneel Nov 10, 2024
e9a4999
Added ability to customize gradual wake intensity at each step
cyberneel Nov 18, 2024
7c3dcd0
Added to info page and fixded total sleep display.
cyberneel Nov 19, 2024
d7b656b
Made info screen show info from last session after tracker stopped
cyberneel Nov 19, 2024
bb9e3e7
Fixed bug with gradualWakeVibration not in sync with step when schedu…
cyberneel Nov 19, 2024
a40b77a
Added suggestion alarm time based on desired sleep cycles constant
cyberneel Nov 19, 2024
a5dcba7
Fixed total sleep calculation and cycles display bugs
cyberneel Nov 20, 2024
3c462a8
Added a timeout to pushes required to stop alarm so the presses dont …
cyberneel Nov 20, 2024
931bc42
Made the watch open to the sleep app when in an active session
cyberneel Nov 20, 2024
32392a7
Restructured pushes to stop timeout
cyberneel Nov 21, 2024
3d1f745
Added saving of prev sleep session info in case watch crashes so it c…
cyberneel Nov 21, 2024
99d25d3
Reset pushes needed to stop alarm when watch sleeps
cyberneel Nov 21, 2024
85d402c
Moved pushes count reset to system task
cyberneel Nov 22, 2024
c599832
Fixed some bugs with snooze time being set weird
cyberneel Nov 22, 2024
954e52d
Code optimizations & brought back more memory
cyberneel Nov 22, 2024
e9cb001
Added buttons to set desired cycles count and duration per cycle.
cyberneel Nov 23, 2024
fe15f02
Bug fixes
cyberneel Nov 23, 2024
b03c833
Switched vibration index variable to use the gradualStep and fixed is…
cyberneel Nov 23, 2024
95e083f
Formatted with clang-format
cyberneel Nov 24, 2024
11c9aff
Updated DisplayAppRecovery
cyberneel Nov 24, 2024
54e3a86
Trying to fix error from Github Build Action
cyberneel Nov 24, 2024
39ff9f9
Undid some edits that were for testing
cyberneel Nov 24, 2024
a52a1a7
removed commented code
cyberneel Nov 24, 2024
c106914
Finally fixed errors during "make -j4 all"
cyberneel Nov 25, 2024
df24877
Removed sleep controller from recovery firmware
cyberneel Nov 25, 2024
6717b16
Fixed Alert retriggering due to Display Update.
cyberneel Nov 26, 2024
891bae9
Formatted Code
cyberneel Nov 26, 2024
651c51a
Made suggested alarm time label more descriptive
cyberneel Nov 27, 2024
16c319a
Made sure double clicking side button doesn't show notifications when…
cyberneel Nov 28, 2024
240ee6d
Added PWM to motor controller
cyberneel Nov 28, 2024
ed82380
Updated Gradual Wake Buzz values to try to match SleepTk
cyberneel Nov 28, 2024
4b94d9e
Removed periodic file logging
cyberneel Nov 29, 2024
66b31a5
UI Tweaks
cyberneel Nov 29, 2024
badef47
Removed extra data write
cyberneel Nov 29, 2024
04b5d6f
Make app go to info page when alarm is turned off and also turn of tr…
cyberneel Nov 29, 2024
5115fe7
Added PWM to Motor Controller
cyberneel Nov 29, 2024
a4ee588
Reworked UI Layout
cyberneel Nov 30, 2024
c36a0e6
Added stop button to alerting UI, goal is to more it easier to unders…
cyberneel Nov 30, 2024
aa875bb
Forgot to hide the auto icon
cyberneel Nov 30, 2024
60679a3
Added "Ramping Up" of Wake Alarm Buzz
cyberneel Nov 30, 2024
d3e6fcf
Changed UI of Alerting Alarm screen and added page inditors with scro…
cyberneel Nov 30, 2024
8ab6466
Changed motor strength to use 0-255
cyberneel Nov 30, 2024
2f77d78
Ran formatter
cyberneel Nov 30, 2024
4f1a072
more formatting
cyberneel Nov 30, 2024
8393bd6
Fixed bug where snoozing causes crash due to widget not being on screen
cyberneel Nov 30, 2024
70b073e
Fixed PWM controller number typo
cyberneel Dec 1, 2024
9637f76
Fixed make all error
cyberneel Dec 1, 2024
edb1f07
Fixed autosnooze crash
cyberneel Dec 1, 2024
c410705
Changed the Alerting UI and removed gradual wake while snooze
cyberneel Dec 1, 2024
ec69c03
Formatting
cyberneel Dec 1, 2024
22a40a9
Added Setting to decide motor strength
cyberneel Dec 3, 2024
0588710
Added Setting to select pushes required to stop alarm
cyberneel Dec 6, 2024
dea45b3
Disabled settings while alarm is active.
cyberneel Dec 6, 2024
2c1fbde
Added natural wake alarm to motor controller.
cyberneel Dec 6, 2024
b6e9dc0
Made sure to wait for sleep app to load before doing things on wake
cyberneel Dec 7, 2024
d576dd9
Updated info page to show current wake mode instead of just gradual wake
cyberneel Dec 7, 2024
d8935f3
Removed suto display refresh on alarm screen, allows for holding down…
cyberneel Dec 7, 2024
d117ed9
Fixed display not upadting on alerting screen.
cyberneel Dec 9, 2024
5385ee1
Moved Code event code for settings page into btnHandler, better conve…
cyberneel Dec 9, 2024
ff193be
Code Clean up
cyberneel Dec 9, 2024
edd89cf
Added a both option for wake mode that allows for natural wake with p…
cyberneel Dec 10, 2024
e6bb3b1
Enabling tracker sets brightness to low and resets to previous bright…
cyberneel Dec 13, 2024
604bdd3
Opening app now sets lower brightness and restores when closing only …
cyberneel Dec 13, 2024
73fb325
Fixed bug where brightness isn't low when watch turning on from sleep.
cyberneel Dec 13, 2024
db4192d
Updated SessionData struct and removed wakelock
cyberneel Dec 16, 2024
ee480d1
Added total sleep minutes to SessionData
cyberneel Dec 17, 2024
895c276
Added a variable to ignore button press during certion actions.
cyberneel Dec 17, 2024
f3b6318
Moved alerting logic, shouldn't change anything.
cyberneel Dec 19, 2024
ed5f8d1
settings: vibrate on change of motor strength
liamcharger Dec 19, 2024
f09ec24
Bug fix and Changed Off to Normal.
cyberneel Dec 19, 2024
bc09fa0
Pressing side button while alarm alerting snoozes.
cyberneel Dec 20, 2024
08a7bb5
Made changes to the SnoozeAlarmTaskCallback, it uses the existing cod…
cyberneel Dec 20, 2024
9e2b541
Added startTimeStamp to SessionData
cyberneel Dec 20, 2024
cec1bcf
Added more checks in code
cyberneel Dec 22, 2024
830f136
Showing wake mode on info screen only when alarm is active.
cyberneel Dec 22, 2024
2cacaf0
removed unhandled charging message
cyberneel Jul 12, 2025
db8049e
Added IsAvailable to app header
cyberneel Jul 13, 2025
c3f7c48
Updated auto alarm time calculation
cyberneel Jul 13, 2025
afa8bff
removed unused variables
cyberneel Jul 13, 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
6 changes: 6 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ set(SDK_SOURCE_FILES
"${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_gpiote.c"
"${NRF5_SDK_PATH}/modules/nrfx/soc/nrfx_atomic.c"
"${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_saadc.c"
"${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_pwm.c"

# FreeRTOS
${NRF5_SDK_PATH}/external/freertos/source/croutine.c
Expand Down Expand Up @@ -396,6 +397,7 @@ list(APPEND SOURCE_FILES
displayapp/screens/PassKey.cpp
displayapp/screens/Error.cpp
displayapp/screens/Alarm.cpp
displayapp/screens/Sleep.cpp
displayapp/screens/Styles.cpp
displayapp/screens/WeatherSymbols.cpp
displayapp/Colors.cpp
Expand Down Expand Up @@ -469,6 +471,7 @@ list(APPEND SOURCE_FILES
components/settings/Settings.cpp
components/timer/Timer.cpp
components/alarm/AlarmController.cpp
components/infinisleep/InfiniSleepController.cpp
components/fs/FS.cpp
drivers/Cst816s.cpp
FreeRTOS/port.c
Expand Down Expand Up @@ -538,6 +541,7 @@ list(APPEND RECOVERY_SOURCE_FILES
components/settings/Settings.cpp
components/timer/Timer.cpp
components/alarm/AlarmController.cpp
components/infinisleep/InfiniSleepController.cpp
drivers/Cst816s.cpp
FreeRTOS/port.c
FreeRTOS/port_cmsis_systick.c
Expand Down Expand Up @@ -615,6 +619,7 @@ set(INCLUDE_FILES
displayapp/screens/Timer.h
displayapp/screens/Dice.h
displayapp/screens/Alarm.h
displayapp/screens/Sleep.h
displayapp/Colors.h
displayapp/widgets/Counter.h
displayapp/widgets/PageIndicator.h
Expand Down Expand Up @@ -657,6 +662,7 @@ set(INCLUDE_FILES
components/settings/Settings.h
components/timer/Timer.h
components/alarm/AlarmController.h
components/infinisleep/InfiniSleepController.h
drivers/Cst816s.h
FreeRTOS/portmacro.h
FreeRTOS/portmacro_cmsis.h
Expand Down
1 change: 1 addition & 0 deletions src/FreeRTOSConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
#define configTICK_RATE_HZ 1024
#define configMAX_PRIORITIES (3)
#define configMINIMAL_STACK_SIZE (120)
#define configTOTAL_HEAP_SIZE (1024 * 39)
#define configMAX_TASK_NAME_LEN (4)
#define configUSE_16_BIT_TICKS 0
#define configIDLE_SHOULD_YIELD 1
Expand Down
Loading
Loading