Alarm persist to flash #1367
Merged
Alarm persist to flash #1367
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 tasks
JF002
requested changes
Oct 27, 2022
ac410fa to
3969a4a
Compare
JF002
approved these changes
Oct 30, 2022
Riksu9000
reviewed
Jan 4, 2023
NeroBurner
added a commit
to InfiniTimeOrg/InfiniSim
that referenced
this pull request
Sep 19, 2024
… to file Support for InfiniTimeOrg/InfiniTime#1367 which is a rebase/improvement of InfiniTimeOrg/InfiniTime#1333 by @ght The PR adds saving and restoring alarm state to the SPI NOR flash. So the AlarmController needs the FileSystem-controller to work. To support both the current `main` branch and the "save-alarm-to-file" PR pass the Filesystem controller conditionally, only if `Controller::FS` is mentioned in the `AlarmController.h` file
NeroBurner
added a commit
to InfiniTimeOrg/InfiniSim
that referenced
this pull request
Sep 19, 2024
… to file Support for InfiniTimeOrg/InfiniTime#1367 which is a rebase/improvement of InfiniTimeOrg/InfiniTime#1333 by @ght The PR adds saving and restoring alarm state to the SPI NOR flash. So the AlarmController needs the FileSystem-controller to work. To support both the current `main` branch and the "save-alarm-to-file" PR pass the Filesystem controller conditionally, only if `Controller::FS` is mentioned in the `AlarmController.h` file
3969a4a to
9694ccd
Compare
|
Build size and comparison to main:
|
9694ccd to
89f0664
Compare
Contributor
Author
|
rebased and squashed on current |
mark9064
reviewed
Sep 19, 2024
Member
mark9064
left a comment
There was a problem hiding this comment.
Haven't tested but looks sensible to me
ght
reviewed
Sep 19, 2024
89f0664 to
299d19f
Compare
579be33 to
0d41924
Compare
Member
|
I considered opening a comment on that text you just changed but decided it was too minor LOL |
0d41924 to
ae860cc
Compare
Save the set alarm time to the SPI NOR flash, so it does not reset to the default value when the watch resets, e.g. due to watchdog timeout or reflashing of a new version of InfiniTime. Just like the `Settings.h` `LoadSettingsFromFile()` the previous alarm at boot (if available) and `SaveSettingsToFile()` the current alarm when the `Alarm.h` screen is closed (only if the settings have changed). The alarm-settings file is stored in `.system/alarm.dat`. The `.system` folder is created if it doesn't yet exist. Fixes: #1330
Contributor
Author
|
There is a segfault or freeze leading to a reboot on the second time when changing the alarm setting and exit the Alarm setting screen. Need to investigate |
Close the `lfs_dir` object for the `.system` dir after usage. Otherwise on the second changed alarm the system will lockup because the `.system` dir is already open and was never closed.
ae860cc to
b0ab1c4
Compare
Contributor
Author
|
found it, need to close the |
Member
|
Did I miss that or did you only just add .system? |
Contributor
Author
|
Second. I did add it recently, based in an old Diskussion about where to put pinetime system files and that they shouldn't be in the root for the user to be directly available. JF and Riksu9000 agreed that a subfolder .system is a goog place to put our configs. And the user can put their files at the root |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
rebase of #1333 with additional
SaveAlarm()function as described belowSave the set alarm time to the SPI NOR flash, so it does not reset to
the default value when the watch resets, e.g. due to watchdog timeout
or a firmware update
Introduce
SaveAlarm()member function which saves to file only if thealarm setting is changed.
The
alarmChangedboolean flag mimics the behavior ofsettingsChangedflag from
Settings.hAlso mark the
SaveAlarmToFile()Save()SaveSettingsToFilefunction const, as it doesn't changeanything in the
AlarmControllerobject.This PR needs InfiniTimeOrg/InfiniSim#67 to work on
InfiniSimFixes: #1330