diff --git a/CHANGELOG.md b/CHANGELOG.md index c994b4a2..6ffcc498 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## Development Build: equuleus-rc1+dev38 +- updating PSP to use new versioning system +- conditional module inclusion +- See and + ## Development Build: v1.6.0-rc4+dev117 - Align mismatched function prototype/implem. parameter names - See diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h index 44e30be1..a7f9e50a 100644 --- a/fsw/mcp750-vxworks/inc/psp_version.h +++ b/fsw/mcp750-vxworks/inc/psp_version.h @@ -27,7 +27,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 115 +#define CFE_PSP_IMPL_BUILD_NUMBER 38 #define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1" #define CFE_PSP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */ #define CFE_PSP_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */ diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index a5a3c934..a7f9e50a 100644 --- a/fsw/pc-linux/inc/psp_version.h +++ b/fsw/pc-linux/inc/psp_version.h @@ -27,7 +27,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 102 +#define CFE_PSP_IMPL_BUILD_NUMBER 38 #define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1" #define CFE_PSP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */ #define CFE_PSP_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */ diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h index 44e30be1..a7f9e50a 100644 --- a/fsw/pc-rtems/inc/psp_version.h +++ b/fsw/pc-rtems/inc/psp_version.h @@ -27,7 +27,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 115 +#define CFE_PSP_IMPL_BUILD_NUMBER 38 #define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1" #define CFE_PSP_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */ #define CFE_PSP_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */