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.
NOTE: This PR includes changes in the feature/cfdp branch.
TL;DR – We can revert all apps to the NASA repos with the exception of CF[DP] (bugfixes that should be cleaned up and fed back), and a trivial CMakeListst.txt bugfix to TO_LAB and SCH_LAB. All changes below pushed to CFS repo branch oss_repo_cleanup, which includes the CF[DP] additions but does not include migrating cfe/psp/osal to upstream.
• CFE Tables can be overridden from sample_defs/tables
o This is a standard feature of the cfe build system
• Include files can be overridden by placing alternate versions in sample_defs/config which will be copied to build/inc (which is first in the include paths)
o NOTE: This is not a part of the standard cfe build system. I would assume that there is a standard way of doing this, but I’ve been unable to find it.
o This new copy rule is defined in sample_defs/mission_build_custom.cmake
• Status of repos (ignoring upstream changes since our last merge)
o Cfs repo on branch feature/repo_cleanup
o Cfe and psp can be moved directly to the upstream repo
o Osal – The only change is the patch that Steve pushed the other day for fixing the pipeline build. We should submit this upstream as a bug report and hope we can reconcile later.
o Ci_lab moved to latest upstream
o Cf
On a fork of the upstream repository
Reverted the last commit and created new “sbn_compatibility” branch.
Brash-specific changes are found in sample_defs/tables and sample_defs/config folders
The only changes within our fork are bugfixes for compatibility with SBN (allow non-local subscriptions) and fixing some error handling that was causing cfe to crash in certain cases. And a change to the build settings to disable doxygen generation because that step is breaking our build for unknown reasons.
o Sample_app and sample_lib
These are demo applications. Recommend we remove them from our repository
o SBN – migrated to upstream
Wireshark plugin – We do have a more updated version of the plugin that we wrote and have stored in https://bitbucket.org/traclabs/cfe_sbn_bridge_plugin/src/devel/tools/
• Ours is a different implementation than NASA’s. They probably wouldn’t take it as-is, but we may want to share it on the NASA SBN github once our repos are available open-source in case somebody wants to try merging them
• Note: It appears that we also committed an early version of our plugin over the NASA one in our fork at some point.
Modules/filter/remap/fsw/tables/sbn_remap_tbl.c – We added curly braces for some reason.
Sbn_msgids.h, sbn_platform_cfg.h – Override in sample_defs/config instead
Sbn_conf_table.c – We changed from POLL to RECV mode. Override in sample_defs/table instead.
o Sch_lab and to_lab
Brash-specific changes limited to table and msgids.h, both moved to override folder for both applications
A simple one-line change to CMakeLists.txt made on top of upstream repository.
• Note: The same change applies to both repositories and replaces a hard-coded list of applications in CMakeLists.txt with a variable.
• I created a ticket in the upstream to_lab so hopefully they will fix this one.
NEW Branch: new_main contains my change on top of the latest upstream. DO NOT merge with our existing forked changes
o Robot_sim, ros_app
Branch oss_repo_cleanup created to add missing definition to CMakeLists.txt that allows the sch_lab and to_lab magic above to work
o