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

Show file tree
Hide file tree
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
Bump to v6.8.0-rc1+dev129 and update Readme
  • Loading branch information
@astrogeco
astrogeco committed Oct 13, 2020
commit 2686e50e3f966a1d6f7785402c372f060a4eda18
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob

## Version History

### Development Build: 6.8.0-rc1+dev129

- Rather than having a second pool implementation only for CDS, use the generic pool implementation. This also uses the abstract resource identifiers to identify CDS blocks, rather than a direct reference.
- Add the system-specific module suffix (.o, .so, .obj, etc) and the default CFE core executable name to the configdata structure.
- See <https://github.com/nasa/cFE/pull/944>

### Development Build: 6.8.0-rc1+dev122

- Adds the field `UnregAppID` to track whether an "unregistered" event was generated, un-overloading the EventCount field to serve its primary purpose of counting actual events generated from a valid/registered AppID.
Expand Down
2 changes: 1 addition & 1 deletion fsw/cfe-core/src/inc/cfe_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@


/* Development Build Macro Definitions */
#define CFE_BUILD_NUMBER 122 /*!< Development Build: Number of commits since baseline */
#define CFE_BUILD_NUMBER 129 /*!< Development Build: Number of commits since baseline */
#define CFE_BUILD_BASELINE "v6.8.0-rc1" /*!< Development Build: git tag that is the base for the current development */

/* Version Macro Definitions */
Expand Down