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

Conditionally pass Controllers::FS to AlarmController to support save to file #67

Merged
merged 1 commit into from
Sep 19, 2024

Conversation

NeroBurner
Copy link
Collaborator

@NeroBurner NeroBurner commented Sep 19, 2022

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 NeroBurner force-pushed the support_alarm_persist_to_flash branch from cef9648 to f46dcc9 Compare October 12, 2022 20:17
@NeroBurner NeroBurner added the needs-InfiniTime-change PR blocked until InfiniTime upstream change is merged label Oct 27, 2022
… 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 NeroBurner force-pushed the support_alarm_persist_to_flash branch from f46dcc9 to 26395a4 Compare September 19, 2024 19:30
@NeroBurner NeroBurner changed the title Pass Controllers::FS to AlarmController to support save to file Conditionally pass Controllers::FS to AlarmController to support save to file Sep 19, 2024
@NeroBurner NeroBurner merged commit 7ade442 into main Sep 19, 2024
2 checks passed
@NeroBurner NeroBurner deleted the support_alarm_persist_to_flash branch September 19, 2024 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-InfiniTime-change PR blocked until InfiniTime upstream change is merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant