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

Jump to bottom

Integration Candidate 2020-10-13 #944

Merged
merged 6 commits into from
Oct 13, 2020
Merged

Integration Candidate 2020-10-13 #944

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
daf6c04
Fix #56, Refactor CDS to use generic pool implementation
jphickey Oct 6, 2020
043b608
Fix #940, Add module suffix and core name to configdata
jphickey Oct 7, 2020
655a66c
Update #940, add ifndef values for new fields
jphickey Oct 8, 2020
85469ce
Merge pull request #939 from jphickey/fix-56-cds-mempool-consolidate
astrogeco Oct 13, 2020
b5ada30
Merge pull request #941 from jphickey/fix-940-filename-configdata
astrogeco Oct 13, 2020
2686e50
Bump to v6.8.0-rc1+dev129 and update Readme
astrogeco Oct 13, 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
Prev Previous commit
Next Next commit
Update #940, add ifndef values for new fields 
Adds an #ifndef empty string for the two new fields, which
at the very least prevents IDEs (e.g. Eclipse) from redlining
the value as an undefined symbol.

(It is always passed in on command line when building via CMake)
  • Loading branch information
@jphickey
jphickey committed Oct 8, 2020
commit 655a66c05f250c97db5c1ca022dd4a14e967f40a
7 changes: 7 additions & 0 deletions cmake/target/src/target_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@
#define CFE_SPACECRAFT_ID_VALUE 0x42
#endif

#ifndef CFE_DEFAULT_MODULE_EXTENSION
#define CFE_DEFAULT_MODULE_EXTENSION ""
#endif

#ifndef CFE_DEFAULT_CORE_FILENAME
#define CFE_DEFAULT_CORE_FILENAME ""
#endif

Target_CfeConfigData GLOBAL_CFE_CONFIGDATA =
{
Expand Down