Skip to content

Commit

Permalink
Merge pull request #356 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
PSP Integration Candidate: Caelum-rc4+dev16
  • Loading branch information
dzbaker authored Aug 5, 2022
2 parents 6264752 + e1f4286 commit de5ed1e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ This is a collection of APIs abstracting platform specific functionality to be l

## Changelog

### Development Build: v1.6.0-rc4+dev47
- correct PSP module IDs and lookups
- See <https://github.com/nasa/PSP/pull/354>

### Development Build: v1.6.0-rc4+dev43

- remove commented out code
Expand Down
2 changes: 1 addition & 1 deletion fsw/mcp750-vxworks/inc/psp_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 43
#define CFE_PSP_IMPL_BUILD_NUMBER 47
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-linux/inc/psp_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 43
#define CFE_PSP_IMPL_BUILD_NUMBER 47
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-rtems/inc/psp_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 43
#define CFE_PSP_IMPL_BUILD_NUMBER 47
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
Expand Down

0 comments on commit de5ed1e

Please sign in to comment.