Merge pull request nasa#1839 from nasa/integration-candidate

cFE Integration candidate: 2021-08-24

README.md

@@ -10,6 +10,36 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob
 
 ## Version History
 
+### Development Build: v6.8.0-rc1+dev933
+
+- Add software bus tests 
+- Separate variable for OSAL status 
+- Increase SB pool max size bucket 
+- Add Null check for CFE_ResourceId_FindNext 
+- Improve tbl coverage tests 
+- Add missing cases for msg id func tests 
+- Consolidate msg get/set doxygen group 
+- Adding coverage tests to cFE TIME 
+- Enable strict resource id w/OMIT_DEPRECATED
+- Hotfix for strict resource IDs. 
+- HOTFIX IC-20210819, type correction TBL coverage test
+- Consolidate msg get/set doxygen group
+- Add test for ES BackgroundWakeup
+- Success Test for CFE_ES_RestartApp
+- Success Test for CFE_ES_GetMemPoolStats
+- Subscribe to Message Limit Greater Than CFE_PLATFORM_SB_DEFAULT_MSG_LIMIT
+- Group MSG APIs documentation by header type
+- Add retroactive CFE status asserts
+- Correct syslog message in pool create
+- Check error ctr to TransmitMsg test
+- End Child Task requirement remove error code
+- Add functional tests for resource misc
+- Remove unused CFE_TBL_ERR_BAD_APP_ID
+- Remove unused CFE_ES_POOL_BOUNDS_ERROR
+- Remove unused CFE_TBL_ERR_FILE_NOT_FOUND
+- Remove comment referencing CFE_TBL_ERR_FILE_NOT_FOUND
+- See <https://github.com/nasa/cFE/pull/1839> and <https://github.com/nasa/cFS/pull/340> 
+
 ### Development Build: v6.8.0-rc1+dev873
 
 - Add CFE assert macros to functional test
@@ -22,7 +52,7 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob
 - Partial #1724, update in/out status and nonnull/nonzero tags
 - Add External Time Source Functional Tests
 - Add Perf API functional tests 
-See <https://github.com/nasa/cFE/pull/1808> and <https://github.com/nasa/cFS/pull/337> 
+- See <https://github.com/nasa/cFE/pull/1808> and <https://github.com/nasa/cFS/pull/337> 
 
 ### Development Build: v6.8.0-rc1+dev844
 

cmake/sample_defs/cpu1_msgids.h

@@ -86,8 +86,8 @@
 /*
 ** cFE Command Message Id's
 */
-#define CFE_EVS_CMD_MID CFE_PLATFORM_CMD_MID_BASE + CFE_MISSION_EVS_CMD_MSG   /* 0x1801 */
-                                                                              /* Message ID 0x1802 is available  */
+#define CFE_EVS_CMD_MID  CFE_PLATFORM_CMD_MID_BASE + CFE_MISSION_EVS_CMD_MSG  /* 0x1801 */
+#define CFE_TEST_CMD_MID CFE_PLATFORM_CMD_MID_BASE + CFE_MISSION_TEST_CMD_MSG /* 0x1802 */
 #define CFE_SB_CMD_MID   CFE_PLATFORM_CMD_MID_BASE + CFE_MISSION_SB_CMD_MSG   /* 0x1803 */
 #define CFE_TBL_CMD_MID  CFE_PLATFORM_CMD_MID_BASE + CFE_MISSION_TBL_CMD_MSG  /* 0x1804 */
 #define CFE_TIME_CMD_MID CFE_PLATFORM_CMD_MID_BASE + CFE_MISSION_TIME_CMD_MSG /* 0x1805 */
@@ -114,9 +114,9 @@
 /*
 ** CFE Telemetry Message Id's
 */
-#define CFE_ES_HK_TLM_MID  CFE_PLATFORM_TLM_MID_BASE + CFE_MISSION_ES_HK_TLM_MSG  /* 0x0800 */
-#define CFE_EVS_HK_TLM_MID CFE_PLATFORM_TLM_MID_BASE + CFE_MISSION_EVS_HK_TLM_MSG /* 0x0801 */
-                                                                                  /* Message ID 0x0802 is available  */
+#define CFE_ES_HK_TLM_MID           CFE_PLATFORM_TLM_MID_BASE + CFE_MISSION_ES_HK_TLM_MSG           /* 0x0800 */
+#define CFE_EVS_HK_TLM_MID          CFE_PLATFORM_TLM_MID_BASE + CFE_MISSION_EVS_HK_TLM_MSG          /* 0x0801 */
+#define CFE_TEST_HK_TLM_MID         CFE_PLATFORM_TLM_MID_BASE + CFE_MISSION_TEST_HK_TLM_MSG         /* 0x0802 */
 #define CFE_SB_HK_TLM_MID           CFE_PLATFORM_TLM_MID_BASE + CFE_MISSION_SB_HK_TLM_MSG           /* 0x0803 */
 #define CFE_TBL_HK_TLM_MID          CFE_PLATFORM_TLM_MID_BASE + CFE_MISSION_TBL_HK_TLM_MSG          /* 0x0804 */
 #define CFE_TIME_HK_TLM_MID         CFE_PLATFORM_TLM_MID_BASE + CFE_MISSION_TIME_HK_TLM_MSG         /* 0x0805 */

cmake/sample_defs/cpu1_platform_cfg.h

@@ -302,7 +302,7 @@
 #define CFE_PLATFORM_SB_MEM_BLOCK_SIZE_14 8192
 #define CFE_PLATFORM_SB_MEM_BLOCK_SIZE_15 16384
 #define CFE_PLATFORM_SB_MEM_BLOCK_SIZE_16 32768
-#define CFE_PLATFORM_SB_MAX_BLOCK_SIZE    (CFE_MISSION_SB_MAX_SB_MSG_SIZE + 40)
+#define CFE_PLATFORM_SB_MAX_BLOCK_SIZE    (CFE_MISSION_SB_MAX_SB_MSG_SIZE + 128)
 
 /**
 **  \cfetimecfg Time Server or Time Client Selection

cmake/sample_defs/global_build_options.cmake

@@ -20,6 +20,8 @@ set(OMIT_DEPRECATED $ENV{OMIT_DEPRECATED} CACHE STRING "Omit deprecated elements
 if (OMIT_DEPRECATED)
   message (STATUS "OMIT_DEPRECATED=true: Not including deprecated elements in build")
   add_definitions(-DCFE_OMIT_DEPRECATED_6_8 -DCFE_OMIT_DEPRECATED_6_7 -DCFE_OMIT_DEPRECATED_6_6 -DOSAL_OMIT_DEPRECATED)
+  set(MISSION_RESOURCEID_MODE "STRICT") # more type safe, but less backward compatible
 else()
   message (STATUS "OMIT_DEPRECATED=false: Deprecated elements included in build")
+  set(MISSION_RESOURCEID_MODE "SIMPLE") # less type safe, but more backward compatible
 endif (OMIT_DEPRECATED)

cmake/sample_defs/sample_mission_cfg.h

@@ -307,8 +307,8 @@
 **  \par Limits
 **      Not Applicable
 */
-#define CFE_MISSION_EVS_CMD_MSG 1
-/* Offset 2 is available */
+#define CFE_MISSION_EVS_CMD_MSG  1
+#define CFE_MISSION_TEST_CMD_MSG 2
 #define CFE_MISSION_SB_CMD_MSG   3
 #define CFE_MISSION_TBL_CMD_MSG  4
 #define CFE_MISSION_TIME_CMD_MSG 5
@@ -351,9 +351,9 @@
 **  \par Limits
 **      Not Applicable
 */
-#define CFE_MISSION_ES_HK_TLM_MSG  0
-#define CFE_MISSION_EVS_HK_TLM_MSG 1
-/* Offset 2 is available */
+#define CFE_MISSION_ES_HK_TLM_MSG     0
+#define CFE_MISSION_EVS_HK_TLM_MSG    1
+#define CFE_MISSION_TEST_HK_TLM_MSG   2
 #define CFE_MISSION_SB_HK_TLM_MSG     3
 #define CFE_MISSION_TBL_HK_TLM_MSG    4
 #define CFE_MISSION_TIME_HK_TLM_MSG   5
@@ -418,6 +418,7 @@
 **       anticipated to be reasonably small (i.e. tens, not hundreds).  Large
 **       values have not been tested.
 **
+**
 */
 #define CFE_MISSION_ES_POOL_MAX_BUCKETS 17
 

docs/cFE_FunctionalRequirements.csv

@@ -99,7 +99,7 @@ ES: Report Last Reset,cES1301,"Upon receipt of a Request, the cFE shall provide
 ES: Report Last Reset - Types,cES1301.1,The reset types include: Power On Reset Processor Reset.,cFE Applications may perform processing that is specific to each reset type.
 ES: Report Application ID,cES1304,"Upon receipt of a Request, the cFE shall provide the cFE Application ID of the calling cFE Application.",A cFE Application needs to determine its own Application ID.
 ES: Get Task Information,cES1305,Upon receipt of a Request the cFE shall provide information for the requested task.,Allows query of task information for reporting or management.
-ES: Report Application ID,cES1306,"Upon receipt of a Request, the cFE shall provide the cFE Application ID which corresponds to the specified cFE Application Name.",The Executive Services will assign an Application ID. The Application Name is specified when the cFE Application is created.  This Request will provide a way to determine the cFE Application ID when the pre-determined Application Name is passed in.
+ES: Report Application ID By Name,cES1306,"Upon receipt of a Request, the cFE shall provide the cFE Application ID which corresponds to the specified cFE Application Name.",The Executive Services will assign an Application ID. The Application Name is specified when the cFE Application is created.  This Request will provide a way to determine the cFE Application ID when the pre-determined Application Name is passed in.
 ES: Report Application Name,cES1307,"Upon receipt of a Request, the cFE shall provide the cFE Application Name which corresponds to the specified cFE Application ID.",The Executive Services will assign an Application ID. This Request will provide a way to determine an Application's name from its Application ID.
 ES: Delete Application,cES1309,"Upon receipt of a Request, the cFE shall delete the specified Application including all child tasks.",Need to be able to stop the execution of an Application and remove its System Resources.  The delete will clean-up the application's main task and all of its child tasks.  Note: other cFE components are required to have cleanup routines that ES calls.
 ES: Delete Application - Reject Undefined,cES1309.1,"If the specified Application is undefined then the cFE shall record the error in the System Log, and return an error code.",Can't delete an undefined application.
@@ -113,7 +113,7 @@ ES: Create Child Task - Invalid From Child Task,cES1311.2,"In the event a child
 ES: Delete Child Task,cES1312,"Upon receipt of a Request, the cFE shall delete the specified cFE Child Task within the cFE Application that owns the task.","As part of a cFE Application cleanup, the Application needs to be able to delete each child task."
 ES: Delete Child Task - Error If Application Main Task,cES1312.1,"If the specified task is the cFE Application Main Task, the request shall record the error in the System Log, and return an error code.",Cannot use Child Task Exit or Delete on the cFE Application Main Task.
 ES: End Child Task,cES1314,"Upon receipt of a Request, the cFE shall end execution of the calling cFE Child Task.", cFE Child Task needs to be able to exit and end execution.
-ES: End Child Task - Error If Application Main Task,cES1314.1,"If the calling task is the cFE Application Main Task, the cFE shall record the error in the System Log, and return an error code.",Cannot use Child Task Exit or Delete on the cFE Application Main Task.
+ES: End Child Task - Reject If Application Main Task,cES1314.1,"If the calling task is the cFE Application Main Task, the cFE shall record the error in the System Log and reject the request.",Cannot use Child Task Exit or Delete on the cFE Application Main Task.
 ES: Reserve Critical Data Store,cES1315,"Upon receipt of a Request, the cFE shall reserve the Request specified amount of memory in the Critical Data Store for the cFE Application using the Request specified name.",The Critical Data Store will be used by Applications to store critical parameters that will be preserved after an application or processor restart. ES will allocate the memory for the application.  A pointer or memory address will be provided to the alloc.
 ES: Reserve Critical Data Store - Size Change,cES1315.1,"If a Critical Data Store exists for the Request specified name but has a different size than what is specified in the Request, the cFE shall remove the existing Critical Data Store and create a new one using the Request specified name and size.",Assumes that if the sizes don't match then something has changed and the CDS can't be trusted.
 ES: Reserve Critical Data Store - Invalid Data Integrity,cES1315.2,"If a Critical Data Store exists for the Request specified name but the Data Integrity value is invalid, the cFE shall remove the existing Critical Data Store and create a new one using the Request specified name and size.",Assumes that if the CRC is invalid then the CDS can't be trusted.

docs/src/cfe_api.dox

@@ -139,6 +139,9 @@
     <LI> \ref CFEAPIMSGHeader
     <UL>
       <LI> #CFE_MSG_Init - \copybrief CFE_MSG_Init
+    </UL>
+    <LI> \ref CFEAPIMSGHeaderPri
+    <UL>
       <LI> #CFE_MSG_GetSize - \copybrief CFE_MSG_GetSize
       <LI> #CFE_MSG_SetSize - \copybrief CFE_MSG_SetSize
       <LI> #CFE_MSG_GetType - \copybrief CFE_MSG_GetType
@@ -154,6 +157,9 @@
       <LI> #CFE_MSG_GetSequenceCount - \copybrief CFE_MSG_GetSequenceCount
       <LI> #CFE_MSG_SetSequenceCount - \copybrief CFE_MSG_SetSequenceCount
       <LI> #CFE_MSG_GetNextSequenceCount - \copybrief CFE_MSG_GetNextSequenceCount
+    </UL>
+    <LI> \ref CFEAPIMSGHeaderExt
+    <UL>
       <LI> #CFE_MSG_GetEDSVersion - \copybrief CFE_MSG_GetEDSVersion
       <LI> #CFE_MSG_SetEDSVersion - \copybrief CFE_MSG_SetEDSVersion
       <LI> #CFE_MSG_GetEndian - \copybrief CFE_MSG_GetEndian
@@ -164,6 +170,9 @@
       <LI> #CFE_MSG_SetSubsystem - \copybrief CFE_MSG_SetSubsystem
       <LI> #CFE_MSG_GetSystem - \copybrief CFE_MSG_GetSystem
       <LI> #CFE_MSG_SetSystem - \copybrief CFE_MSG_SetSystem
+    </UL>
+    <LI> \ref CFEAPIMSGHeaderSec
+    <UL>
       <LI> #CFE_MSG_GenerateChecksum - \copybrief CFE_MSG_GenerateChecksum
       <LI> #CFE_MSG_ValidateChecksum - \copybrief CFE_MSG_ValidateChecksum
       <LI> #CFE_MSG_SetFcnCode - \copybrief CFE_MSG_SetFcnCode
@@ -225,14 +234,11 @@
       <LI> #CFE_SB_ReleaseMessageBuffer - \copybrief CFE_SB_ReleaseMessageBuffer
       <LI> #CFE_SB_TransmitBuffer - \copybrief CFE_SB_TransmitBuffer
     </UL>
-    <LI> \ref CFEAPISBSetMessage
+    <LI> \ref CFEAPISBMessageCharacteristics
     <UL>
       <LI> #CFE_SB_SetUserDataLength - \copybrief CFE_SB_SetUserDataLength
       <LI> #CFE_SB_TimeStampMsg - \copybrief CFE_SB_TimeStampMsg
       <LI> #CFE_SB_MessageStringSet - \copybrief CFE_SB_MessageStringSet
-    </UL>
-    <LI> \ref CFEAPIGetMessage
-    <UL>
       <LI> #CFE_SB_GetUserData - \copybrief CFE_SB_GetUserData
       <LI> #CFE_SB_GetUserDataLength - \copybrief CFE_SB_GetUserDataLength
       <LI> #CFE_SB_MessageStringGet - \copybrief CFE_SB_MessageStringGet