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-09-16 #196

Merged
merged 7 commits into from
Sep 22, 2020
Merged

Integration Candidate 2020-09-16 #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dfea5b3
Fix #187, Set stub spacecraft ID to historical value (0x42)
skliper Aug 21, 2020
8ad7c15
Merge pull request #191 from skliper/fix187-scid-historical-value-stub
astrogeco Sep 3, 2020
5f67e41
Fix #194, Install unit test to target directories
skliper Sep 11, 2020
fee2016
Fix #187, Set stub spacecraft ID to historical value (0x42)
skliper Aug 21, 2020
a6ff043
Merge pull request #195 from skliper/fix194-ut-install-dir
yammajamma Sep 17, 2020
babd091
Merge branch 'integration-candidate' of https://github.com/nasa/PSP i…
yammajamma Sep 17, 2020
8738991
Increase version to 1.5.0-rc1+dev14, update readme.
yammajamma Sep 21, 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
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 @@ -8,6 +8,12 @@ This is a collection of APIs abstracting platform specific functionality to be l

## Version History

### Development Build: 1.5.0-rc1+dev14

- Sets the stub config data spacecraft id to historical value 0x42, was 42.
- Installs unit test to target directories.
- See <https://github.com/nasa/PSP/pull/196>

### Development Build: 1.5.0-rc1+dev6

- Adds CFE_PSP_GetProcessorName
Expand Down
4 changes: 2 additions & 2 deletions fsw/mcp750-vxworks/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 76
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.4.0+dev"
#define CFE_PSP_IMPL_BUILD_NUMBER 14
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1"

/*
* Version Macro Definitions
Expand Down
4 changes: 2 additions & 2 deletions fsw/pc-linux/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 76
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.4.0+dev"
#define CFE_PSP_IMPL_BUILD_NUMBER 14
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1"

/*
* Version Macro Definitions
Expand Down
2 changes: 1 addition & 1 deletion fsw/pc-rtems/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/*
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 6
#define CFE_PSP_IMPL_BUILD_NUMBER 14
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1"

/*
Expand Down
2 changes: 1 addition & 1 deletion unit-test-coverage/mcp750-vxworks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ target_link_libraries(coverage-${CFE_PSP_TARGETNAME}-testrunner
add_test(coverage-${CFE_PSP_TARGETNAME} coverage-${CFE_PSP_TARGETNAME}-testrunner)

foreach(TGT ${INSTALL_TARGET_LIST})
install(TARGETS coverage-${CFE_PSP_TARGETNAME}-testrunner DESTINATION ${TGTNAME}/${UT_INSTALL_SUBDIR})
install(TARGETS coverage-${CFE_PSP_TARGETNAME}-testrunner DESTINATION ${TGT}/${UT_INSTALL_SUBDIR})
endforeach()

2 changes: 1 addition & 1 deletion ut-stubs/ut_psp_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Target_ConfigData GLOBAL_CONFIGDATA =
.User = "MissionBuildUser",
.Default_CpuName = "UnitTestCpu",
.Default_CpuId = 1,
.Default_SpacecraftId = 42,
.Default_SpacecraftId = 0x42,
.CfeConfig = &GLOBAL_CFE_CONFIGDATA,
.PspConfig = &GLOBAL_PSP_CONFIGDATA
};
Expand Down