diff --git a/README.md b/README.md
index 87aa0a1a0..09962d7cf 100644
--- a/README.md
+++ b/README.md
@@ -8,33 +8,48 @@ This is a collection of services and associated framework to be located in the `
## Version History
+#### Development Build: 6.7.15
+
+- Upon power on reset, default system log mode set to overwrite. Upon processor reset, default system log mode set to discard.
+- No longer locks while locked (no issue observed on linux/posix, but user reported issue on FreeRTOS 10)
+- Internal `CFE_TBL_LoadFromFile()` API changed slightly to add AppName as a parameter. Return value from `LoadFromFile()` no longer relevant for event generation.
+- Updates `CFE_TBL_CleanUpApp` such that it now checks the 'used flag' prior to calling `CFE_TBL_RemoveAccessLink` for a given TblHandle. Also sets the AppId to `CFE_TBL_NOT_OWNED` after removing the access descriptor link from linked list.
+- Removed `OS_FS_SUCCESS, OS_FS_ERROR , OS_FS_ERR_INVALID_POINTER, OS_FS_ERR_NO_FREE_FDS , OS_FS_ERR_INVALID_FD, and OS_FS_UNIMPLEMENTED` from `osapi-os-filesys.h`
+- See https://github.com/nasa/cFE/pull/649 for more details
+
#### Development Build: 6.7.14
+
- Exposes the `CFE_SB_IsValidMsgId()` for application usage.
- `CFE_SB_GetLastSenderID` will now detect if it is being called prior to a message being sent on a given pipe.
- Mismatches between PSP/BSP/OS are now detected and warned about during make prep. Only the `CFE_SYSTEM_PSPNAME` is actually required to be specified for a CFE build now. Others can be omitted.
- See https://github.com/nasa/cFE/pull/635 for more details
#### Development Build: 6.7.13
+
- RTEMS builds without error.
- Use the INTERFACE_COMPILE_DEFINITIONS and INTERFACE_INCLUDE_DIRECTORIES properties from the osal target and apply them to the entire CFE build as a directory-scope property. No impact until these are set in OSAL.
- Minor other updates (see https://github.com/nasa/cFE/pull/615)
#### Development Build: 6.7.12
+
- Cmd code (and checksum) are always in the same place (matches GSFC spec for command secondary header)
- No impact to behavior. Previously the perf log dump file frequently contained errors due to out of order or otherwise corrupted entries, which is now fixed.
- Minor other updates (see https://github.com/nasa/cFE/pull/586)
#### Development Build: 6.7.11
+
- Improve documentation
- Update makefile to report branch coverage
- Minor other updates (see https://github.com/nasa/cFE/pull/566)
#### Development Build: 6.7.10
+
- Fix potential unit test problems with name collisions
- Improve documentation
- Minor other updates (see https://github.com/nasa/cFE/pull/563)
#### Development Build: 6.7.9
+
- No longer requires sed "hack" to change the setting in default_config.h
- Minor other updates (see https://github.com/nasa/cFE/pull/544)
@@ -45,41 +60,50 @@ This is a collection of services and associated framework to be located in the `
- Minor other updates (see https://github.com/nasa/cFE/pull/530)
#### Development Build: 6.7.7
+
- Adds a new function, CFE_SB_GetPipeIdByName, which retrieves the pipe ID given a name of a pipe.
- Improvement in error reporting when using a pipe name that is already in use, or when the queue limit has been reached.
- Added userguide and osalguide to the local target list to avoid makefile warning
- Minor other updates (see https://github.com/nasa/cFE/pull/511)
#### Development Build: 6.7.6
+
- Adds OMIT_DEPRECATED prep flag
- Adds and enforces strict warnings
- Software Bus now increments sequence counter even if there are no subscribers
- Warning, comment, and code coverage cleanup (see https://github.com/nasa/cFE/pull/490)
#### Development Build: 6.7.5
+
- Added CI static analysis check
- Resolved static analysis warnings
- Minor other updates (see https://github.com/nasa/cFE/pull/479)
#### Development Build: 6.7.4
+
- Minor updates (see https://github.com/nasa/cFE/pull/448)
#### Development Build: 6.7.3
+
- Minor updates (see https://github.com/nasa/cFE/pull/413)
#### Development Build: 6.7.2
+
- Minor bugs and enhancements (see https://github.com/nasa/cFE/pull/388)
#### Development Build: 6.7.1
+
- Fix strlen in CFE_ES_TaskInit https://github.com/nasa/cFE/pull/23
- Minor bug fixes (see https://github.com/nasa/cFE/pull/378)
### ***OFFICIAL RELEASE: 6.7.0***
+
- This is a point release from an internal repository
- Changes are detailed in [cFS repo](https://github.com/nasa/cFS) release documentation
- Apache 2.0
### ***OFFICIAL RELEASE: 6.6.0a***
+
- This is a point release from an internal repository
- Apache 2.0
- Additional release notes are found in [release notes](https://github.com/nasa/cFE/blob/v6.6.0a/docs/cFE_release_notes.md)
diff --git a/fsw/cfe-core/src/inc/cfe_tbl_events.h b/fsw/cfe-core/src/inc/cfe_tbl_events.h
index bbcd3d8c3..4f4a5f8d6 100644
--- a/fsw/cfe-core/src/inc/cfe_tbl_events.h
+++ b/fsw/cfe-core/src/inc/cfe_tbl_events.h
@@ -940,7 +940,7 @@
**/
#define CFE_TBL_UNREGISTER_ERR_EID 92
-/** TODO: document */
+/* TODO: document see https://github.com/nasa/cFE/issues/661 */
#define CFE_TBL_LOAD_VAL_ERR_EID 93
/** \brief '\%s Failed to Load '\%s' (Invalid Source Type)"
@@ -970,8 +970,8 @@
**/
#define CFE_TBL_UPDATE_ERR_EID 95
-/** \brief '\%s validation failed for Inactive '\%s', Status=0x\%08X"
-** \event '\%s validation failed for Inactive '\%s', Status=0x\%08X"
+/** \brief '\%s validation failed for Inactive '\%s', Status=0x\%08X'
+** \event '\%s validation failed for Inactive '\%s', Status=0x\%08X'
**
** \par Type: ERROR
**
@@ -1064,19 +1064,19 @@
**/
#define CFE_TBL_LOAD_IN_PROGRESS_ERR_EID 100
-/** TODO: document */
+/* TODO: document see https://github.com/nasa/cFE/issues/661 */
#define CFE_TBL_LOAD_SRC_TYPE_ERR_EID 101
-/** TODO: document */
+/* TODO: document see https://github.com/nasa/cFE/issues/661 */
#define CFE_TBL_LOAD_FILENAME_LONG_ERR_EID 102
-/** TODO: document */
+/* TODO: document see https://github.com/nasa/cFE/issues/661 */
#define CFE_TBL_LOAD_SHORT_FILE_ERR_EID 103
-/** TODO: document */
+/* TODO: document see https://github.com/nasa/cFE/issues/661 */
#define CFE_TBL_LOAD_TBLNAME_MISMATCH_ERR_EID 104
-/** TODO: document */
+/* TODO: document see https://github.com/nasa/cFE/issues/661 */
#define CFE_TBL_HANDLE_ACCESS_ERR_EID 105
/** \} */
diff --git a/fsw/cfe-core/src/inc/cfe_version.h b/fsw/cfe-core/src/inc/cfe_version.h
index a505c7129..d4aed9d13 100644
--- a/fsw/cfe-core/src/inc/cfe_version.h
+++ b/fsw/cfe-core/src/inc/cfe_version.h
@@ -95,7 +95,7 @@
*/
#define CFE_MAJOR_VERSION 6
#define CFE_MINOR_VERSION 7
-#define CFE_REVISION 14
+#define CFE_REVISION 15
#endif /* _cfe_version_ */
diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_api.c b/fsw/cfe-core/src/tbl/cfe_tbl_api.c
index bae0b3ede..29709871e 100644
--- a/fsw/cfe-core/src/tbl/cfe_tbl_api.c
+++ b/fsw/cfe-core/src/tbl/cfe_tbl_api.c
@@ -683,15 +683,15 @@ int32 CFE_TBL_Load( CFE_TBL_Handle_t TblHandle,
char AppName[OS_MAX_API_NAME]={"UNKNOWN"};
bool FirstTime = false;
+ /* Verify access rights and get a valid Application ID for calling App */
+ Status = CFE_TBL_ValidateAccess(TblHandle, &ThisAppId);
+
/* Translate AppID of caller into App Name */
CFE_ES_GetAppName(AppName, ThisAppId, OS_MAX_API_NAME);
/* Initialize return pointer to NULL */
WorkingBufferPtr = NULL;
- /* Verify access rights and get a valid Application ID for calling App */
- Status = CFE_TBL_ValidateAccess(TblHandle, &ThisAppId);
-
if (Status != CFE_SUCCESS)
{
CFE_EVS_SendEventWithAppID(CFE_TBL_HANDLE_ACCESS_ERR_EID, CFE_EVS_EventType_ERROR,
diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_internal.c b/fsw/cfe-core/src/tbl/cfe_tbl_internal.c
index 88f18f5b7..e7a00a065 100644
--- a/fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+++ b/fsw/cfe-core/src/tbl/cfe_tbl_internal.c
@@ -941,7 +941,7 @@ int32 CFE_TBL_LoadFromFile(const char *AppName, CFE_TBL_LoadBuff_t *WorkingBuffe
CFE_EVS_SendEventWithAppID(CFE_TBL_FILE_ACCESS_ERR_EID,
CFE_EVS_EventType_ERROR, CFE_TBL_TaskData.TableTaskAppId,
"%s: Unable to open file (FileDescriptor=%d)",
- AppName, FileDescriptor);
+ AppName, (int)FileDescriptor);
return CFE_TBL_ERR_ACCESS;
}
@@ -1398,7 +1398,7 @@ int32 CFE_TBL_CleanUpApp(uint32 AppId)
for (i=0; i