Merge pull request #2001 from astrogeco/integration-candidate

cFE Integration Candidate, Caelum+dev1
nasa · Dec 6, 2021 · c161cf0 · c161cf0
2 parents b66661c + 5a1d138
commit c161cf0
Show file tree

Hide file tree

Showing 109 changed files with 2,901 additions and 1,165 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,25 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob
 
 ## Version History
 
+### Development Build: v7.0.0-rc4+dev39
+
+- Use cfe time clock state enum t in cmd/tlm and handling
+- EVS functional test add for different event types
+- Patch for recursive event loop
+- CFE_ES_MemAddOff structure to associated CFE_ES_MemAddress_t and CFE_ES_MemOffset_t
+- Avoid aliasing warnings
+- Message ID type improvements
+- CFE_SB_ValueToMsgId/MsgIdToValue wrappers
+- Use CFE_TIME_ClockState_Enum_t in cmd/tlm and handling
+- Consolidate repeated MSG stub setup in sb_UT
+- Return type conversions in CFE_ES_GetTaskName
+- Better message type pointer conversion
+- Replacing hardcoded message limit in TIME services
+- Use macro in CFE_ResourceId_IsDefined
+- Checking against IsNewOffset only
+- Set new build baseline for cFS-Caelum-rc4: v7.0.0-rc4
+- See <https://github.com/nasa/cFE/pull/2001> and <https://github.com/nasa/cFS/pull/390>
+
 ### Development Build: v6.8.0-rc1+dev1030
 
 - Grammatical cleanup of requirements

diff --git a/cmake/mission_defaults.cmake b/cmake/mission_defaults.cmake
@@ -35,6 +35,7 @@ set(MISSION_CORE_MODULES
     "msg"
     "sbr"
     "resourceid"
+    "config"
 )
 
 # The "MISSION_GLOBAL_APPLIST" is a set of apps/libs that will be built
@@ -75,4 +76,3 @@ list(APPEND MISSION_GLOBAL_APPLIST cfe_assert)
 if (ENABLE_UNIT_TESTS)
     list(APPEND MISSION_GLOBAL_APPLIST cfe_testcase)
 endif (ENABLE_UNIT_TESTS)
-
diff --git a/docs/src/mnem_maps/cfe_es_tlm_mnem_map b/docs/src/mnem_maps/cfe_es_tlm_mnem_map
@@ -68,12 +68,6 @@ ES_APPFILENAME=$sc_$cpu_ES_AppFilename[OS_MAX_PATH_LEN] \
 ES_STACKSIZE=$sc_$cpu_ES_StackSize \
 ES_MODULEID=$sc_$cpu_ES_ModuleID \
 ES_ADDRVALID=$sc_$cpu_ES_AddrsValid \
-ES_CODEADDR=$sc_$cpu_ES_CodeAddress \
-ES_CODESIZE=$sc_$cpu_ES_CodeSize \
-ES_DATAADDR=$sc_$cpu_ES_DataAddress \
-ES_DATASIZE=$sc_$cpu_ES_DataSize \
-ES_BSSADDR=$sc_$cpu_ES_BSSAddress \
-ES_BSSSIZE=$sc_$cpu_ES_BSSSize \
 ES_STARTADDR=$sc_$cpu_ES_StartAddr \
 ES_EXCEPTNACTN=$sc_$cpu_ES_ExceptnActn \
 ES_PRIORITY=$sc_$cpu_ES_Priority \

diff --git a/modules/cfe_testcase/src/es_info_test.c b/modules/cfe_testcase/src/es_info_test.c
@@ -79,19 +79,20 @@ void TestAppInfo(void)
 
     if (TestAppInfo.AddressesAreValid)
     {
-        UtAssert_True(TestAppInfo.AddressesAreValid > 0, "Test App Info -> AddrsValid?  = %d",
+        UtAssert_True(TestAppInfo.AddressesAreValid > 0, "Test App Info -> Addrs.Valid?  = %d",
                       (int)TestAppInfo.AddressesAreValid);
-        UtAssert_True(TestAppInfo.CodeAddress > 0, "Test App Info -> CodeAddress  = %ld",
-                      (unsigned long)TestAppInfo.CodeAddress);
-        UtAssert_True(TestAppInfo.CodeSize > 0, "Test App Info -> CodeSize  = %ld",
-                      (unsigned long)TestAppInfo.CodeSize);
-        UtAssert_True(TestAppInfo.DataAddress > 0, "Test App Info -> DataAddress  = %ld",
-                      (unsigned long)TestAppInfo.DataAddress);
-        UtAssert_True(TestAppInfo.DataSize > 0, "Test App Info -> DataSize  = %ld",
-                      (unsigned long)TestAppInfo.DataSize);
-        UtAssert_True(TestAppInfo.BSSAddress > 0, "Test App Info -> BSSAddress  = %ld",
-                      (unsigned long)TestAppInfo.BSSAddress);
-        UtAssert_True(TestAppInfo.BSSSize > 0, "Test App Info -> BSSSize  = %ld", (unsigned long)TestAppInfo.BSSSize);
+        UtAssert_True(TestAppInfo.Code.Address > 0, "Test App Info -> Code.Address  = %ld",
+                      (unsigned long)TestAppInfo.Code.Address);
+        UtAssert_True(TestAppInfo.Code.Size > 0, "Test App Info -> Code.Size  = %ld",
+                      (unsigned long)TestAppInfo.Code.Size);
+        UtAssert_True(TestAppInfo.Data.Address > 0, "Test App Info -> Data.Address  = %ld",
+                      (unsigned long)TestAppInfo.Data.Address);
+        UtAssert_True(TestAppInfo.Data.Size > 0, "Test App Info -> Data.Size  = %ld",
+                      (unsigned long)TestAppInfo.Data.Size);
+        UtAssert_True(TestAppInfo.BSS.Address > 0, "Test App Info -> BSS.Address  = %ld",
+                      (unsigned long)TestAppInfo.BSS.Address);
+        UtAssert_True(TestAppInfo.BSS.Size > 0, "Test App Info -> BSS.Size  = %ld",
+                      (unsigned long)TestAppInfo.BSS.Size);
     }
     else
     {
@@ -190,12 +191,12 @@ void TestLibInfo(void)
     {
         UtAssert_True(LibInfo.AddressesAreValid > 0, "Lib Info -> AddrsValid?  = %ld",
                       (unsigned long)LibInfo.AddressesAreValid);
-        UtAssert_True(LibInfo.CodeAddress > 0, "Lib Info -> CodeAddress  = %ld", (unsigned long)LibInfo.CodeAddress);
-        UtAssert_True(LibInfo.CodeSize > 0, "Lib Info -> CodeSize  = %ld", (unsigned long)LibInfo.CodeSize);
-        UtAssert_True(LibInfo.DataAddress > 0, "Lib Info -> DataAddress  = %ld", (unsigned long)LibInfo.DataAddress);
-        UtAssert_True(LibInfo.DataSize > 0, "Lib Info -> DataSize  = %ld", (unsigned long)LibInfo.DataSize);
-        UtAssert_True(LibInfo.BSSAddress > 0, "Lib Info -> BSSAddress  = %ld", (unsigned long)LibInfo.BSSAddress);
-        UtAssert_True(LibInfo.BSSSize > 0, "Lib Info -> BSSSize  = %ld", (unsigned long)LibInfo.BSSSize);
+        UtAssert_True(LibInfo.Code.Address > 0, "Lib Info -> CodeAddress  = %ld", (unsigned long)LibInfo.Code.Address);
+        UtAssert_True(LibInfo.Code.Size > 0, "Lib Info -> Code.Size  = %ld", (unsigned long)LibInfo.Code.Size);
+        UtAssert_True(LibInfo.Data.Address > 0, "Lib Info -> Data.Address  = %ld", (unsigned long)LibInfo.Data.Address);
+        UtAssert_True(LibInfo.Data.Size > 0, "Lib Info -> Data.Size  = %ld", (unsigned long)LibInfo.Data.Size);
+        UtAssert_True(LibInfo.BSS.Address > 0, "Lib Info -> BSS.Address  = %ld", (unsigned long)LibInfo.BSS.Address);
+        UtAssert_True(LibInfo.BSS.Size > 0, "Lib Info -> BSS.Size  = %ld", (unsigned long)LibInfo.BSS.Size);
     }
     else
     {

diff --git a/modules/cfe_testcase/src/es_task_test.c b/modules/cfe_testcase/src/es_task_test.c
@@ -218,7 +218,7 @@ void TestChildTaskName(void)
     UtAssert_INT32_EQ(CFE_ES_GetTaskName(TaskNameBuf, CFE_ES_TASKID_UNDEFINED, sizeof(TaskNameBuf)),
                       CFE_ES_ERR_RESOURCEID_NOT_VALID);
     UtAssert_INT32_EQ(CFE_ES_GetTaskName(TaskNameBuf, TaskId, 0), CFE_ES_BAD_ARGUMENT);
-    UtAssert_INT32_EQ(CFE_ES_GetTaskName(TaskNameBuf, TaskId, sizeof(TaskName) - 1), CFE_ES_ERR_RESOURCEID_NOT_VALID);
+    UtAssert_INT32_EQ(CFE_ES_GetTaskName(TaskNameBuf, TaskId, sizeof(TaskName) - 1), CFE_ES_BAD_ARGUMENT);
 
     UtAssert_INT32_EQ(CFE_ES_DeleteChildTask(TaskId), CFE_SUCCESS);
 }

diff --git a/modules/cfe_testcase/src/evs_send_test.c b/modules/cfe_testcase/src/evs_send_test.c
@@ -39,6 +39,15 @@ void TestSendEvent(void)
 
     UtAssert_INT32_EQ(CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "OK Send"), CFE_SUCCESS);
     UtAssert_INT32_EQ(CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, NULL), CFE_EVS_INVALID_PARAMETER);
+
+    UtAssert_INT32_EQ(CFE_EVS_SendEvent(0, CFE_EVS_EventType_DEBUG, "OK (Debug) Send"), CFE_SUCCESS);
+    UtAssert_INT32_EQ(CFE_EVS_SendEvent(0, CFE_EVS_EventType_DEBUG, NULL), CFE_EVS_INVALID_PARAMETER);
+
+    UtAssert_INT32_EQ(CFE_EVS_SendEvent(0, CFE_EVS_EventType_ERROR, "OK (Error) Send"), CFE_SUCCESS);
+    UtAssert_INT32_EQ(CFE_EVS_SendEvent(0, CFE_EVS_EventType_ERROR, NULL), CFE_EVS_INVALID_PARAMETER);
+
+    UtAssert_INT32_EQ(CFE_EVS_SendEvent(0, CFE_EVS_EventType_CRITICAL, "OK (Critical) Send"), CFE_SUCCESS);
+    UtAssert_INT32_EQ(CFE_EVS_SendEvent(0, CFE_EVS_EventType_CRITICAL, NULL), CFE_EVS_INVALID_PARAMETER);
 }
 
 void TestSendEventAppID(void)
@@ -55,6 +64,24 @@ void TestSendEventAppID(void)
                       CFE_EVS_INVALID_PARAMETER);
     UtAssert_INT32_EQ(CFE_EVS_SendEventWithAppID(0, CFE_EVS_EventType_INFORMATION, CFE_ES_APPID_UNDEFINED, "OK"),
                       CFE_EVS_APP_ILLEGAL_APP_ID);
+
+    UtAssert_INT32_EQ(CFE_EVS_SendEventWithAppID(0, CFE_EVS_EventType_DEBUG, AppId, " OK (Debug) App ID"), CFE_SUCCESS);
+    UtAssert_INT32_EQ(CFE_EVS_SendEventWithAppID(0, CFE_EVS_EventType_DEBUG, AppId, NULL), CFE_EVS_INVALID_PARAMETER);
+    UtAssert_INT32_EQ(CFE_EVS_SendEventWithAppID(0, CFE_EVS_EventType_DEBUG, CFE_ES_APPID_UNDEFINED, "OK (Debug)"),
+                      CFE_EVS_APP_ILLEGAL_APP_ID);
+
+    UtAssert_INT32_EQ(CFE_EVS_SendEventWithAppID(0, CFE_EVS_EventType_ERROR, AppId, "OK (Error) App ID"), CFE_SUCCESS);
+    UtAssert_INT32_EQ(CFE_EVS_SendEventWithAppID(0, CFE_EVS_EventType_ERROR, AppId, NULL), CFE_EVS_INVALID_PARAMETER);
+    UtAssert_INT32_EQ(CFE_EVS_SendEventWithAppID(0, CFE_EVS_EventType_ERROR, CFE_ES_APPID_UNDEFINED, "OK (Error)"),
+                      CFE_EVS_APP_ILLEGAL_APP_ID);
+
+    UtAssert_INT32_EQ(CFE_EVS_SendEventWithAppID(0, CFE_EVS_EventType_CRITICAL, AppId, "OK (Critical) App ID"),
+                      CFE_SUCCESS);
+    UtAssert_INT32_EQ(CFE_EVS_SendEventWithAppID(0, CFE_EVS_EventType_CRITICAL, AppId, NULL),
+                      CFE_EVS_INVALID_PARAMETER);
+    UtAssert_INT32_EQ(
+        CFE_EVS_SendEventWithAppID(0, CFE_EVS_EventType_CRITICAL, CFE_ES_APPID_UNDEFINED, "OK (Critical)"),
+        CFE_EVS_APP_ILLEGAL_APP_ID);
 }
 
 void TestSendTimedEvent(void)
@@ -64,6 +91,15 @@ void TestSendTimedEvent(void)
 
     UtAssert_INT32_EQ(CFE_EVS_SendTimedEvent(Time, 0, CFE_EVS_EventType_INFORMATION, "OK Time"), CFE_SUCCESS);
     UtAssert_INT32_EQ(CFE_EVS_SendTimedEvent(Time, 0, CFE_EVS_EventType_INFORMATION, NULL), CFE_EVS_INVALID_PARAMETER);
+
+    UtAssert_INT32_EQ(CFE_EVS_SendTimedEvent(Time, 0, CFE_EVS_EventType_DEBUG, "Ok (Debug) Time"), CFE_SUCCESS);
+    UtAssert_INT32_EQ(CFE_EVS_SendTimedEvent(Time, 0, CFE_EVS_EventType_DEBUG, NULL), CFE_EVS_INVALID_PARAMETER);
+
+    UtAssert_INT32_EQ(CFE_EVS_SendTimedEvent(Time, 0, CFE_EVS_EventType_ERROR, "Ok (Error) Time"), CFE_SUCCESS);
+    UtAssert_INT32_EQ(CFE_EVS_SendTimedEvent(Time, 0, CFE_EVS_EventType_ERROR, NULL), CFE_EVS_INVALID_PARAMETER);
+
+    UtAssert_INT32_EQ(CFE_EVS_SendTimedEvent(Time, 0, CFE_EVS_EventType_CRITICAL, "Ok (Critical) Time"), CFE_SUCCESS);
+    UtAssert_INT32_EQ(CFE_EVS_SendTimedEvent(Time, 0, CFE_EVS_EventType_CRITICAL, NULL), CFE_EVS_INVALID_PARAMETER);
 }
 
 void EVSSendTestSetup(void)

diff --git a/modules/cfe_testcase/src/message_id_test.c b/modules/cfe_testcase/src/message_id_test.c
@@ -42,7 +42,7 @@ void TestMsgId(void)
 
     UtAssert_INT32_EQ(CFE_MSG_SetMsgId(&msg, expectedmsgid), CFE_SUCCESS);
     UtAssert_INT32_EQ(CFE_MSG_GetMsgId(&msg, &msgid), CFE_SUCCESS);
-    UtAssert_UINT32_EQ(msgid, expectedmsgid);
+    CFE_Assert_MSGID_EQ(msgid, expectedmsgid);
 
     UtAssert_INT32_EQ(CFE_MSG_SetMsgId(NULL, msgid), CFE_MSG_BAD_ARGUMENT);
 
@@ -93,4 +93,4 @@ void MessageIdTestSetup(void)
 {
     UtTest_Add(TestMsgId, NULL, NULL, "Test Set/Get Message ID");
     UtTest_Add(TestGetTypeFromMsgId, NULL, NULL, "Test Get Type From Message ID");
-}
+}