From dfea5b384563b6912c68d35a39bb0c6a91e33d0b Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 21 Aug 2020 13:50:42 -0400 Subject: [PATCH 1/4] Fix #187, Set stub spacecraft ID to historical value (0x42) --- ut-stubs/ut_psp_stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ut-stubs/ut_psp_stubs.c b/ut-stubs/ut_psp_stubs.c index eb6e1d53..96684fa2 100644 --- a/ut-stubs/ut_psp_stubs.c +++ b/ut-stubs/ut_psp_stubs.c @@ -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 }; From 5f67e412453922f80fe4b32fccc043b469469255 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 11 Sep 2020 12:49:38 -0400 Subject: [PATCH 2/4] Fix #194, Install unit test to target directories --- unit-test-coverage/mcp750-vxworks/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit-test-coverage/mcp750-vxworks/CMakeLists.txt b/unit-test-coverage/mcp750-vxworks/CMakeLists.txt index 4e359b8c..cbf826da 100644 --- a/unit-test-coverage/mcp750-vxworks/CMakeLists.txt +++ b/unit-test-coverage/mcp750-vxworks/CMakeLists.txt @@ -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() From fee201684e64a014f27e414bcbedbedbf5c1c902 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 21 Aug 2020 13:50:42 -0400 Subject: [PATCH 3/4] Fix #187, Set stub spacecraft ID to historical value (0x42) --- ut-stubs/ut_psp_stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ut-stubs/ut_psp_stubs.c b/ut-stubs/ut_psp_stubs.c index 9687417f..336269ef 100644 --- a/ut-stubs/ut_psp_stubs.c +++ b/ut-stubs/ut_psp_stubs.c @@ -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 }; From 8738991ed013872a6a5a032721ab20813808e06f Mon Sep 17 00:00:00 2001 From: Yasir Khan Date: Mon, 21 Sep 2020 15:41:20 -0400 Subject: [PATCH 4/4] Increase version to 1.5.0-rc1+dev14, update readme. --- README.md | 6 ++++++ fsw/mcp750-vxworks/inc/psp_version.h | 4 ++-- fsw/pc-linux/inc/psp_version.h | 4 ++-- fsw/pc-rtems/inc/psp_version.h | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a440c1a3..fc9b9d34 100644 --- a/README.md +++ b/README.md @@ -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 + ### Development Build: 1.5.0-rc1+dev6 - Adds CFE_PSP_GetProcessorName diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h index d8decb74..69de0e1f 100644 --- a/fsw/mcp750-vxworks/inc/psp_version.h +++ b/fsw/mcp750-vxworks/inc/psp_version.h @@ -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 diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index c5ed2451..8e1fb48f 100644 --- a/fsw/pc-linux/inc/psp_version.h +++ b/fsw/pc-linux/inc/psp_version.h @@ -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 diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h index 39f683df..ee13282c 100644 --- a/fsw/pc-rtems/inc/psp_version.h +++ b/fsw/pc-rtems/inc/psp_version.h @@ -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" /*