Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR moves the BlockDriver component from Drv to Ref to emphasize its role as an example rather than a production driver and updates the associated topology and test configurations. Key changes include renaming and relocating the BlockDriver component, replacing the timer ISR with Svc/LinuxTimer for cycle management, and updating the test harness and build configurations.
Reviewed Changes
Copilot reviewed 28 out of 28 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| Ref/Top/instances.fpp | Updates the BlockDriver instance path and adds the linuxTimer instance. |
| Ref/Top/RefTopologyDefs.hpp | Adjusts include paths for BlockDriver headers. |
| Ref/Top/RefTopology.cpp | Replaces the ISR-based cycle simulation with linuxTimer-based timing. |
| Ref/CMakeLists.txt | Adds subdirectory for the relocated BlockDriver code. |
| Ref/BlockDriver/* | Renames namespaces, header guards, and class names; removes ISR functions. |
| Test files under Ref/BlockDriver/test | Adjusts namespaces and tests to remove ISR invocation in favor of Sched usage. |
| Drv/BlockDriver/* | Removes obsolete BlockDriver files. |
| namespace Svc { | ||
|
|
||
| void LinuxTimerComponentImpl::startTimer(FwSizeType interval) { | ||
| void LinuxTimer::startTimer(FwSizeType interval) { |
Check notice
Code scanning / CodeQL
Long function without assertion Note
Collaborator
Author
|
@thomas-bc The intent is to update the bootstrap to match this. |
Collaborator
Author
|
BTW, see the failures, I'll work them down one by one. |
Collaborator
|
Thank you @timcanham !!!! |
Collaborator
|
Merged |
LeStarch
requested changes
Jun 4, 2025
Collaborator
|
@timcanham fixed the CI problems, and reviewed this PR! |
thomas-bc
added a commit
to fprime-community/fprime-system-reference
that referenced
this pull request
Jun 4, 2025
* Removed BlockDriver * Scrubbing references to blockDrv * Remocing block driver from defs * Correcting cycle * More fixes * signalHandler --------- Co-authored-by: Timothy Canham <timothy.canham@jpl.nasa.gov> Co-authored-by: M Starch <LeStarch@googlemail.com>
This was referenced Jun 4, 2025
thomas-bc
pushed a commit
to nasa/fprime-tools
that referenced
this pull request
Jun 4, 2025
* Removed BlockDriver * Removed BlockDrv channel/packet * Added linux to spelling expect
thomas-bc
added a commit
to fprime-community/fprime-tutorial-hello-world
that referenced
this pull request
Jun 4, 2025
Co-authored-by: Timothy Canham <timothy.canham@jpl.nasa.gov>
thomas-bc
added a commit
to fprime-community/fprime-workshop-led-blinker
that referenced
this pull request
Jun 4, 2025
* Remove BlockDriver * Fixes for linuxTimer --------- Co-authored-by: Timothy Canham <timothy.canham@jpl.nasa.gov>
thomas-bc
added a commit
to fprime-community/fprime-tutorial-math-component
that referenced
this pull request
Jun 4, 2025
* Update for new BlockDriver location * Fully removed BlockDrive * More linuxTimer updates * Removed blockDrv from ping entries --------- Co-authored-by: Timothy Canham <timothy.canham@jpl.nasa.gov>
thomas-bc
added a commit
to nasa/fprime-examples
that referenced
this pull request
Jun 5, 2025
* Removed BlockDriver * Fixed ReceiveTask .start() arguments * Use project-builder option to checkout devel --------- Co-authored-by: Timothy Canham <timothy.canham@jpl.nasa.gov>
Collaborator
Breaking Change
|
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
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.
Change Description
This PR moves
Drv/BlockDrivertoRef/BlockDriverto make the point thatBlockDriveris not a real driver, but a demonstration.The PR also removes the timer ISR and substitutes
Svc/LinuxTimerto drive the cycle.Rationale
Svc/BlockDriveris causing a lot of confusion for adapter since many feel that they need to use or modifyBlockDriverto run F Prime cycles.Testing/Review Recommendations
Unit tests have been updated and pass.
Future Work
#3693
#3694