Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

InfiniSleep: SleepTk Port (ReOpen) #2174

Open
wants to merge 110 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
07d2599
Started working on SleepTracker
cyberneel Oct 2, 2024
be0dca5
Began adding BPM data collection
cyberneel Oct 3, 2024
6297c7e
Started on data saving
cyberneel Oct 4, 2024
0eadfe3
Added basic data reading and clear data button
cyberneel Oct 4, 2024
f1921ee
Added functions for sleeptracking time detection. (First night of tes…
cyberneel Oct 5, 2024
bbfb05a
More changes tyo get the app on the watch
cyberneel Oct 5, 2024
3289107
trying to decrease flash and ram size
cyberneel Oct 6, 2024
298d92e
Got rid of Nevigation & removed vectors and proccessing in SleepTracker
cyberneel Oct 9, 2024
144e476
Put Navigation back for Sim to work, decreased bpm log interval for d…
cyberneel Oct 9, 2024
0b7a081
Reenable user apps
liamcharger Oct 10, 2024
636f1f2
Rename SleepTracker update button size
liamcharger Oct 11, 2024
d8f0246
Work on new Sleep Controller
cyberneel Oct 28, 2024
a84fa93
Ported Main Alarm into InfiniSleep, Need to add natural and gradual w…
cyberneel Oct 29, 2024
a14ced0
updated log messages
cyberneel Oct 29, 2024
b5dfc6c
Started working on screen states
cyberneel Oct 29, 2024
69611ae
Implemented Alarm page Function
cyberneel Oct 29, 2024
65750b5
Started Framework for settings page
cyberneel Oct 29, 2024
8325fdc
Made a sleep tracker settings struct in controller and made settings …
cyberneel Oct 30, 2024
703a6a5
Updated toggleEventHandler to check event type
cyberneel Oct 30, 2024
6981d77
added saving and reading of InfiniSleepSettings
cyberneel Oct 31, 2024
d4a1661
Started working on gradual wake, but not being triggered right now.
cyberneel Oct 31, 2024
4dd520e
Fixed gradual wake triggers
cyberneel Oct 31, 2024
eb7775b
fixed build error for always true conditions (dataType issues)
cyberneel Oct 31, 2024
33706aa
Moved gradualSteps array out of settings Struct, updated motor contro…
cyberneel Nov 2, 2024
fa52821
updated gradualWakeTriggered to use the defined constant
cyberneel Nov 2, 2024
97e788a
Switched settings to checkboxes
cyberneel Nov 2, 2024
a90791d
Changed start page and made update display go to alarm if alerting
cyberneel Nov 2, 2024
c5c5727
Removed timer on alerting so alerts indeffinately, started working on…
cyberneel Nov 2, 2024
b705a09
Made tracker toggle btn
cyberneel Nov 3, 2024
41032a0
Updated rescheduling of wake alarm when system time changed
cyberneel Nov 4, 2024
835f5cf
accoutning for abnormal data
cyberneel Nov 4, 2024
c6bff43
removed recursive
cyberneel Nov 4, 2024
0902e3e
moved else logic
cyberneel Nov 4, 2024
41b3e92
undid stuff, works now ?? idek
cyberneel Nov 4, 2024
62292e8
removed swiping while alerting
cyberneel Nov 4, 2024
388aa99
Added snoozing and made side button require 5 presses
cyberneel Nov 4, 2024
f177a81
More setup for sleep tracking
cyberneel Nov 5, 2024
9eabb40
Fixed bug that doesnt restore original alarm time after multiple snooze
cyberneel Nov 5, 2024
ff44385
Added basic HR periodic reading for sleep tracking and Fixed gradual …
cyberneel Nov 7, 2024
629d958
Made a define statement for file name
cyberneel Nov 7, 2024
6ca4cdc
Made a new alarm for sleep in motor controller
cyberneel Nov 8, 2024
1cbb9cb
Added refresh task for sleep app and added to info screen
cyberneel Nov 8, 2024
ced2ee2
Updated main.cpp and added display update when sleep tracker is updated
cyberneel Nov 8, 2024
7d8c8d9
Last commit didn't have the SleepTrackerUpdate message
cyberneel Nov 8, 2024
593bdd5
Fixed bug where snoozing and closing saved the snooze time as alarm i…
cyberneel Nov 10, 2024
8147ffa
Added ability to customize gradual wake intensity at each step
cyberneel Nov 18, 2024
d76144e
Added to info page and fixded total sleep display.
cyberneel Nov 19, 2024
1c18390
Made info screen show info from last session after tracker stopped
cyberneel Nov 19, 2024
2ad5dd9
Fixed bug with gradualWakeVibration not in sync with step when schedu…
cyberneel Nov 19, 2024
18a4d4e
Added suggestion alarm time based on desired sleep cycles constant
cyberneel Nov 19, 2024
1354a19
Fixed total sleep calculation and cycles display bugs
cyberneel Nov 20, 2024
e896e6a
Added a timeout to pushes required to stop alarm so the presses dont …
cyberneel Nov 20, 2024
c2b77d3
Made the watch open to the sleep app when in an active session
cyberneel Nov 20, 2024
8e56830
Restructured pushes to stop timeout
cyberneel Nov 21, 2024
797dc58
Added saving of prev sleep session info in case watch crashes so it c…
cyberneel Nov 21, 2024
19b51e8
Reset pushes needed to stop alarm when watch sleeps
cyberneel Nov 21, 2024
344f5b0
Moved pushes count reset to system task
cyberneel Nov 22, 2024
95e868b
Fixed some bugs with snooze time being set weird
cyberneel Nov 22, 2024
99c43fb
Code optimizations & brought back more memory
cyberneel Nov 22, 2024
38666de
Added buttons to set desired cycles count and duration per cycle.
cyberneel Nov 23, 2024
44a0ee2
Bug fixes
cyberneel Nov 23, 2024
3f06850
Switched vibration index variable to use the gradualStep and fixed is…
cyberneel Nov 23, 2024
3a35bd9
Formatted with clang-format
cyberneel Nov 24, 2024
4426c22
Updated DisplayAppRecovery
cyberneel Nov 24, 2024
245ebed
Trying to fix error from Github Build Action
cyberneel Nov 24, 2024
2773f28
Undid some edits that were for testing
cyberneel Nov 24, 2024
2583059
removed commented code
cyberneel Nov 24, 2024
4773274
Finally fixed errors during "make -j4 all"
cyberneel Nov 25, 2024
466bdbe
Removed sleep controller from recovery firmware
cyberneel Nov 25, 2024
fca1c48
Fixed Alert retriggering due to Display Update.
cyberneel Nov 26, 2024
50a9bf4
Formatted Code
cyberneel Nov 26, 2024
8ffc94f
Made suggested alarm time label more descriptive
cyberneel Nov 27, 2024
7f0a7c2
Made sure double clicking side button doesn't show notifications when…
cyberneel Nov 28, 2024
673873e
Added PWM to motor controller
cyberneel Nov 28, 2024
8b96598
Updated Gradual Wake Buzz values to try to match SleepTk
cyberneel Nov 28, 2024
be88829
Removed periodic file logging
cyberneel Nov 29, 2024
522315a
UI Tweaks
cyberneel Nov 29, 2024
c2f356f
Removed extra data write
cyberneel Nov 29, 2024
2b3bf38
Make app go to info page when alarm is turned off and also turn of tr…
cyberneel Nov 29, 2024
015808b
Added PWM to Motor Controller
cyberneel Nov 29, 2024
44fad6a
Reworked UI Layout
cyberneel Nov 30, 2024
db2febc
Added stop button to alerting UI, goal is to more it easier to unders…
cyberneel Nov 30, 2024
d736f03
Forgot to hide the auto icon
cyberneel Nov 30, 2024
a2de434
Added "Ramping Up" of Wake Alarm Buzz
cyberneel Nov 30, 2024
701d08b
Changed UI of Alerting Alarm screen and added page inditors with scro…
cyberneel Nov 30, 2024
560b118
Changed motor strength to use 0-255
cyberneel Nov 30, 2024
d51c319
Ran formatter
cyberneel Nov 30, 2024
dc9bc32
more formatting
cyberneel Nov 30, 2024
59db249
Fixed bug where snoozing causes crash due to widget not being on screen
cyberneel Nov 30, 2024
0e719b5
Fixed PWM controller number typo
cyberneel Dec 1, 2024
49b5955
Fixed make all error
cyberneel Dec 1, 2024
b0f8998
Fixed autosnooze crash
cyberneel Dec 1, 2024
27b5634
Changed the Alerting UI and removed gradual wake while snooze
cyberneel Dec 1, 2024
0608e0f
Formatting
cyberneel Dec 1, 2024
2fc156b
Added Setting to decide motor strength
cyberneel Dec 3, 2024
b8d27b9
Added Setting to select pushes required to stop alarm
cyberneel Dec 6, 2024
8d2e5f5
Disabled settings while alarm is active.
cyberneel Dec 6, 2024
073599e
Added natural wake alarm to motor controller.
cyberneel Dec 6, 2024
fe9f176
Made sure to wait for sleep app to load before doing things on wake
cyberneel Dec 7, 2024
01b3255
Updated info page to show current wake mode instead of just gradual wake
cyberneel Dec 7, 2024
aff5c7e
Removed suto display refresh on alarm screen, allows for holding down…
cyberneel Dec 7, 2024
3c7a205
Merge branch 'InfiniTimeOrg:main' into infinisleep
cyberneel Dec 7, 2024
101c0c9
Fixed display not upadting on alerting screen.
cyberneel Dec 9, 2024
8cfabea
Moved Code event code for settings page into btnHandler, better conve…
cyberneel Dec 9, 2024
860fcb6
Code Clean up
cyberneel Dec 9, 2024
37f81ba
Added a both option for wake mode that allows for natural wake with p…
cyberneel Dec 10, 2024
707eba8
Merge branch 'main' of https://github.com/InfiniTimeOrg/InfiniTime in…
cyberneel Dec 10, 2024
66aaaae
Enabling tracker sets brightness to low and resets to previous bright…
cyberneel Dec 13, 2024
14d173f
Opening app now sets lower brightness and restores when closing only …
cyberneel Dec 13, 2024
152f028
Fixed bug where brightness isn't low when watch turning on from sleep.
cyberneel Dec 13, 2024
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 @@ -395,6 +396,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 @@ -467,6 +469,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 @@ -536,6 +539,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 @@ -613,6 +617,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 @@ -655,6 +660,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
Loading
Loading