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.

Sign up for GitHub

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

Fix #711, Separate secondary header access functions #726

Merged
merged 4 commits into from
Aug 20, 2020
Merged

Fix #711, Separate secondary header access functions #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3a073e
Fix #711, Add message header module
skliper Aug 14, 2020
8563679
Fix #711, Update SB/CCSDS FSW for msg module
skliper Aug 14, 2020
97682b8
Fix #711, SB unit test updates for msg module
skliper Aug 14, 2020
164c75e
Fix #711, Add msg module unit test
skliper Aug 14, 2020
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ script:
# Check versions
- cppcheck --version

#cppcheck flight software cfe/fsw/cfe-core/src
- cppcheck --force --inline-suppr --std=c99 --language=c --error-exitcode=1 --enable=warning,performance,portability,style --suppress=variableScope --inconclusive fsw/cfe-core/src 2>cppcheck_flight_cfe.txt
#cppcheck flight software fsw/cfe-core/src and modules
- cppcheck --force --inline-suppr --std=c99 --language=c --error-exitcode=1 --enable=warning,performance,portability,style --suppress=variableScope --inconclusive fsw/cfe-core/src modules 2>cppcheck_flight_cfe.txt
- |
if [[ -s cppcheck_flight_cfe.txt ]]; then
echo "You must fix cppcheck errors before submitting a pull request"
Expand Down
1 change: 1 addition & 0 deletions cmake/mission_defaults.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ set(MISSION_CORE_MODULES
"cfe-core"
"osal"
"psp"
"msg"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have we evaluated the possibility that the single msg perhaps should actually be three:

  • ccsds spacepacket (base)
  • ccsds extended
  • cfs cmd/tlm

I reviewed the internal "extension" library and noted that it is effectively replacing the entire msg module with a different one, but then selectively re-compiling and referring to some (but not all) source files provided by the msg module, as well as giving itself an include path to the private headers within this module.

The paradigm should be that external entities don't depend on private headers - nor should source files be compiled by a script that isn't version controlled with the said source files.

It would seem, however, that if it the "msg" module were actually three different modules, then only one would need to be replaced for modifying the secondary header, and the other two (ccsds + extended) can be used as-is.

)

# The "MISSION_GLOBAL_APPLIST" is a set of apps/libs that will be built
Expand Down
Loading