From 27cc7df54a33da0a5d2b3996e10e3d0a533208c9 Mon Sep 17 00:00:00 2001 From: astrogeco <59618057+astrogeco@users.noreply.github.com> Date: Tue, 13 Oct 2020 19:13:06 -0400 Subject: [PATCH] Bump to v6.7.0+dev298 and update ReadMe --- README.md | 9 +++++++-- fsw/cfe-core/src/inc/cfe_version.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index df22dc40d..03a3f197c 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ The detailed cFE user's guide can be viewed at + ### Development Build: 6.7.0+dev292 - Add missing include path to the target/h and wrn/coreip directory. @@ -27,7 +32,7 @@ Remove unrelated comment about CEXP (remnant from RTEMS). No more errors about m - All parameters to the stub function are registered in the context object, so the values will be available to hook functions. - The names of all parameters match the prototype/documentation, so hook functions that use name-based argument value retrieval will work. - Adds to table search path in `arch_build.cmake` -- Calls to OS_open() now use the OSAL-defined symbol, not the POSIX symbol. +- Calls to OS_open() now use the OSAL-defined symbol, not the POSIX symbol. - Defines new macros to report the build number and build baseline and new strings containing the version number of cFE and a combined string with the version number for OSAL, PSP, and CFE. - Allow explicitly setting of the processor ID in `targets.cmake`. The `TGTx_PROCESSOR_ID` setting will be passed to the final build/link of CFE core as the CPU ID. If unspecified, then the CMake index value is used instead (backward compatible). - `cmake` now detects conditions where no files were present to fulfill an config include file requirement and reports an error during `make prep` lists the files it checked for rather than generating an empty file. @@ -39,7 +44,7 @@ Remove unrelated comment about CEXP (remnant from RTEMS). No more errors about m - Added cFE User's Guide Reference to README.md - Removes old license - See - + ### Development Build: 6.7.20 - SB Unit use of the UT assert framework is closer to original design intent diff --git a/fsw/cfe-core/src/inc/cfe_version.h b/fsw/cfe-core/src/inc/cfe_version.h index 0629a5513..bf60dc94c 100644 --- a/fsw/cfe-core/src/inc/cfe_version.h +++ b/fsw/cfe-core/src/inc/cfe_version.h @@ -35,7 +35,7 @@ /* Development Build Macro Definitions */ -#define CFE_BUILD_NUMBER 292 /*!< Development Build: Number of commits since baseline */ +#define CFE_BUILD_NUMBER 298 /*!< Development Build: Number of commits since baseline */ #define CFE_BUILD_BASELINE "v6.7.0" /*!< Development Build: git tag that is the base for the current development */ /* Version Macro Definitions */