Skip to content

Commit de5ed1e

Browse files
authored
Merge pull request #356 from nasa/integration-candidate
PSP Integration Candidate: Caelum-rc4+dev16
2 parents 6264752 + e1f4286 commit de5ed1e

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ This is a collection of APIs abstracting platform specific functionality to be l
99

1010
## Changelog
1111

12+
### Development Build: v1.6.0-rc4+dev47
13+
- correct PSP module IDs and lookups
14+
- See <https://github.com/nasa/PSP/pull/354>
15+
1216
### Development Build: v1.6.0-rc4+dev43
1317

1418
- remove commented out code

fsw/mcp750-vxworks/inc/psp_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/*
2828
* Development Build Macro Definitions
2929
*/
30-
#define CFE_PSP_IMPL_BUILD_NUMBER 43
30+
#define CFE_PSP_IMPL_BUILD_NUMBER 47
3131
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
3232

3333
/*

fsw/pc-linux/inc/psp_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/*
2828
* Development Build Macro Definitions
2929
*/
30-
#define CFE_PSP_IMPL_BUILD_NUMBER 43
30+
#define CFE_PSP_IMPL_BUILD_NUMBER 47
3131
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
3232

3333
/*

fsw/pc-rtems/inc/psp_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/*
2828
* Development Build Macro Definitions
2929
*/
30-
#define CFE_PSP_IMPL_BUILD_NUMBER 43
30+
#define CFE_PSP_IMPL_BUILD_NUMBER 47
3131
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
3232

3333
/*

0 commit comments

Comments
 (0)